Testing library list simplification

Author: grynspan

Sources/Commands/PackageCommands/Init.swift

@@ -58,7 +58,7 @@ extension SwiftPackageCommand {
             let initPackage = try InitPackage(
                 name: packageName,
                 packageType: initMode,
-                supportedTestingLibraries: testLibraryOptions.enabledTestingLibraries,
+                supportedTestingLibraries: Set(testLibraryOptions.enabledTestingLibraries),
                 destinationPath: cwd,
                 installedSwiftPMConfiguration: swiftCommandState.getHostToolchain().installedSwiftPMConfiguration,
                 fileSystem: swiftCommandState.fileSystem

Sources/Commands/SwiftTestCommand.swift

@@ -243,7 +243,7 @@ public struct SwiftTestCommand: AsyncSwiftCommand {
         var ranSuccessfully = true
 
         // Run XCTest.
-        if options.testLibraryOptions.enableXCTestSupport {
+        if options.testLibraryOptions.isEnabled(.xctest) {
             if !self.options.shouldRunInParallel {
                 let xctestArgs = try xctestArgs(for: testProducts, swiftCommandState: swiftCommandState)
                 ranSuccessfully = try await runTestProducts(
@@ -287,7 +287,7 @@ public struct SwiftTestCommand: AsyncSwiftCommand {
         }
 
         // Run Swift Testing (parallel or not, it has a single entry point.)
-        if options.testLibraryOptions.enableSwiftTestingLibrarySupport {
+        if options.testLibraryOptions.isEnabled(.swiftTesting) {
             ranSuccessfully = try await runTestProducts(
                 testProducts,
                 additionalArguments: [],
@@ -575,7 +575,7 @@ public struct SwiftTestCommand: AsyncSwiftCommand {
                 throw StringError("'--num-workers' must be greater than zero")
             }
 
-            if !options.testLibraryOptions.enableXCTestSupport {
+            guard options.testLibraryOptions.isEnabled(.xctest) else {
                 throw StringError("'--num-workers' is only supported when testing with XCTest")
             }
         }
@@ -660,7 +660,7 @@ extension SwiftTestCommand {
                 sanitizers: globalOptions.build.sanitizers
             )
 
-            if testLibraryOptions.enableXCTestSupport {
+            if testLibraryOptions.isEnabled(.xctest) {
                 let testSuites = try TestingSupport.getTestSuites(
                     in: testProducts,
                     swiftCommandState: swiftCommandState,
@@ -676,7 +676,7 @@ extension SwiftTestCommand {
                 }
             }
 
-            if testLibraryOptions.enableSwiftTestingLibrarySupport {
+            if testLibraryOptions.isEnabled(.swiftTesting) {
                 let additionalArguments = ["--", "--list-tests"] + CommandLine.arguments.dropFirst()
                 let runner = TestRunner(
                     bundlePaths: testProducts.map(\.bundlePath),

Sources/CoreCommands/Options.swift

@@ -580,12 +580,6 @@ public struct TestLibraryOptions: ParsableArguments {
           help: "Enable support for XCTest")
     public var explicitlyEnableXCTestSupport: Bool?
 
-    /// Whether to enable support for XCTest.
-    public var enableXCTestSupport: Bool {
-        // Default to enabled.
-        explicitlyEnableXCTestSupport ?? true
-    }
-
     /// Whether to enable support for Swift Testing (as explicitly specified by the user.)
     ///
     /// Callers will generally want to use ``enableSwiftTestingLibrarySupport`` since it will
@@ -603,26 +597,19 @@ public struct TestLibraryOptions: ParsableArguments {
           help: .hidden)
     public var explicitlyEnableExperimentalSwiftTestingLibrarySupport: Bool?
 
-    /// Whether to enable support for swift-testing.
-    public var enableSwiftTestingLibrarySupport: Bool {
-        // Default to enabled.
-        explicitlyEnableSwiftTestingLibrarySupport ??
-            explicitlyEnableExperimentalSwiftTestingLibrarySupport ??
-            true
-    }
-
-    /// Get the set of enabled testing libraries.
-    public var enabledTestingLibraries: Set<BuildParameters.Testing.Library> {
-        var result = Set<BuildParameters.Testing.Library>()
-
-        if enableXCTestSupport {
-            result.insert(.xctest)
-        }
-        if enableSwiftTestingLibrarySupport {
-            result.insert(.swiftTesting)
+    /// Test whether or not a given library is enabled.
+    public func isEnabled(_ library: BuildParameters.Testing.Library) -> Bool {
+        switch library {
+        case .xctest:
+            explicitlyEnableXCTestSupport ?? true
+        case .swiftTesting:
+            explicitlyEnableSwiftTestingLibrarySupport ?? explicitlyEnableExperimentalSwiftTestingLibrarySupport ?? true
         }
+    }
 
-        return result
+    /// The list of enabled testing libraries.
+    public var enabledTestingLibraries: [BuildParameters.Testing.Library] {
+        [.xctest, .swiftTesting].lazy.filter(isEnabled)
     }
 }