Refactor how isExplicitlyEnabled() works

Author: grynspan

Sources/Commands/PackageCommands/Init.swift

@@ -63,7 +63,7 @@ extension SwiftPackageCommand {
             if testLibraryOptions.isEnabled(.xctest) {
                 supportedTestingLibraries.insert(.xctest)
             }
-            if let explicitlyEnabled = testLibraryOptions.isExplicitlyEnabled(.swiftTesting), explicitlyEnabled {
+            if testLibraryOptions.isExplicitlyEnabled(.swiftTesting) {
                 supportedTestingLibraries.insert(.swiftTesting)
             }
 

Sources/Commands/SwiftTestCommand.swift

@@ -325,14 +325,7 @@ public struct SwiftTestCommand: AsyncSwiftCommand {
 
         // Run Swift Testing (parallel or not, it has a single entry point.)
         if options.testLibraryOptions.isEnabled(.swiftTesting) {
-            if let testEntryPointPath = testProducts.lazy.compactMap(\.testEntryPointPath).first,
-               options.testLibraryOptions.isExplicitlyEnabled(.swiftTesting) == nil {
-                // Cannot run Swift Testing because an entry point file was used, and the developer
-                // didn't explicitly enable Swift Testing.
-                swiftCommandState.observabilityScope.emit(
-                    debug: "Skipping automatic Swift Testing invocation because a test entry point path is present: \(testEntryPointPath)"
-                )
-            } else {
+            if options.testLibraryOptions.isExplicitlyEnabled(.swiftTesting) || testEntryPointPath == nil {
                 results.append(
                     try await runTestProducts(
                         testProducts,
@@ -342,6 +335,12 @@ public struct SwiftTestCommand: AsyncSwiftCommand {
                         library: .swiftTesting
                     )
                 )
+            } else if let testEntryPointPath {
+                // Cannot run Swift Testing because an entry point file was used and the developer
+                // didn't explicitly enable Swift Testing.
+                swiftCommandState.observabilityScope.emit(
+                    debug: "Skipping automatic Swift Testing invocation because a test entry point path is present: \(testEntryPointPath)"
+                )
             }
         }
 
@@ -734,14 +733,8 @@ extension SwiftTestCommand {
             }
 
             if testLibraryOptions.isEnabled(.swiftTesting) {
-                if let testEntryPointPath = testProducts.lazy.compactMap(\.testEntryPointPath).first,
-                   testLibraryOptions.isExplicitlyEnabled(.swiftTesting) == nil {
-                    // Cannot run Swift Testing because an entry point file was used, and the developer
-                    // didn't explicitly enable Swift Testing.
-                    swiftCommandState.observabilityScope.emit(
-                        debug: "Skipping automatic Swift Testing invocation (list) because a test entry point path is present: \(testEntryPointPath)"
-                    )
-                } else {
+                lazy var testEntryPointPath = testProducts.lazy.compactMap(\.testEntryPointPath).first
+                if testLibraryOptions.isExplicitlyEnabled(.swiftTesting) || testEntryPointPath == nil {
                     let additionalArguments = ["--list-tests"] + CommandLine.arguments.dropFirst()
                     let runner = TestRunner(
                         bundlePaths: testProducts.map(\.binaryPath),
@@ -762,6 +755,12 @@ extension SwiftTestCommand {
                     if result == .failure {
                         swiftCommandState.executionStatus = .failure
                     }
+                } else if let testEntryPointPath {
+                    // Cannot run Swift Testing because an entry point file was used and the developer
+                    // didn't explicitly enable Swift Testing.
+                    swiftCommandState.observabilityScope.emit(
+                        debug: "Skipping automatic Swift Testing invocation (list) because a test entry point path is present: \(testEntryPointPath)"
+                    )
                 }
             }
         }

Sources/CoreCommands/Options.swift

@@ -597,24 +597,23 @@ public struct TestLibraryOptions: ParsableArguments {
           help: .private)
     public var explicitlyEnableExperimentalSwiftTestingLibrarySupport: Bool?
 
-    /// Test whether or not a given library is enabled.
-    public func isEnabled(_ library: BuildParameters.Testing.Library) -> Bool {
+    private func isEnabled(_ library: BuildParameters.Testing.Library, `default`: Bool) -> Bool {
         switch library {
         case .xctest:
-            explicitlyEnableXCTestSupport ?? true
+            explicitlyEnableXCTestSupport ?? `default`
         case .swiftTesting:
-            explicitlyEnableSwiftTestingLibrarySupport ?? explicitlyEnableExperimentalSwiftTestingLibrarySupport ?? true
+            explicitlyEnableSwiftTestingLibrarySupport ?? explicitlyEnableExperimentalSwiftTestingLibrarySupport ?? `default`
         }
     }
 
+    /// Test whether or not a given library is enabled.
+    public func isEnabled(_ library: BuildParameters.Testing.Library) -> Bool {
+        isEnabled(library, default: true)
+    }
+
     /// Test whether or not a given library was explicitly enabled by the developer.
-    public func isExplicitlyEnabled(_ library: BuildParameters.Testing.Library) -> Bool? {
-        switch library {
-        case .xctest:
-            explicitlyEnableXCTestSupport
-        case .swiftTesting:
-            explicitlyEnableSwiftTestingLibrarySupport ?? explicitlyEnableExperimentalSwiftTestingLibrarySupport
-        }
+    public func isExplicitlyEnabled(_ library: BuildParameters.Testing.Library) -> Bool {
+        isEnabled(library, default: false)
     }
 
     /// The list of enabled testing libraries.