Migrate tests to Swift Testing

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.6
+// swift-tools-version: 6.0
 
 import PackageDescription
 

Plugins/SelectiveTestingPlugin/SelectiveTestingPlugin.swift

@@ -7,11 +7,10 @@ import PackagePlugin
 
 @main
 struct SelectiveTestingPlugin: CommandPlugin {
-    private func run(_ executable: String, arguments: [String] = []) throws {
-        let executableURL = URL(fileURLWithPath: executable)
+    private func run(_ executable: URL, arguments: [String] = []) throws {
 
         let process = Process()
-        process.executableURL = executableURL
+        process.executableURL = executable
         process.arguments = arguments
 
         try process.run()
@@ -24,10 +23,10 @@ struct SelectiveTestingPlugin: CommandPlugin {
     }
 
     func performCommand(context: PluginContext, arguments: [String]) async throws {
-        FileManager().changeCurrentDirectoryPath(context.package.directory.string)
+        FileManager.default.changeCurrentDirectoryPath(context.package.directoryURL.path)
         let tool = try context.tool(named: "xcode-selective-test")
 
-        try run(tool.path.string, arguments: arguments)
+        try run(tool.url, arguments: arguments)
     }
 }
 
@@ -36,7 +35,7 @@ struct SelectiveTestingPlugin: CommandPlugin {
 
     extension SelectiveTestingPlugin: XcodeCommandPlugin {
         func performCommand(context: XcodePluginContext, arguments: [String]) throws {
-            FileManager().changeCurrentDirectoryPath(context.xcodeProject.directory.string)
+            FileManager.default.changeCurrentDirectoryPath(context.xcodeProject.directoryURL.path)
 
             let tool = try context.tool(named: "xcode-selective-test")
 
@@ -66,7 +65,7 @@ struct SelectiveTestingPlugin: CommandPlugin {
                 }
             }
 
-            try run(tool.path.string, arguments: toolArguments)
+            try run(tool.url, arguments: toolArguments)
         }
     }
 #endif

Sources/DependencyCalculator/DependencyGraph.swift

@@ -152,15 +152,22 @@ extension WorkspaceInfo {
                                           dependencyStructure: resultDependencies,
                                           candidateTestPlans: candidateTestPlans)
         if let config {
+            let additionalBasePath: Path
+            if path.extension == "xcworkspace" || path.extension == "xcodeproj" {
+                additionalBasePath = path.parent()
+            } else {
+                additionalBasePath = path
+            }
             // Process additional config
-            return processAdditional(config: config, workspaceInfo: workspaceInfo)
+            return processAdditional(config: config, workspaceInfo: workspaceInfo, basePath: additionalBasePath)
         } else {
             return workspaceInfo
         }
     }
 
     static func processAdditional(config: WorkspaceInfo.AdditionalConfig,
-                                  workspaceInfo: WorkspaceInfo) -> WorkspaceInfo
+                                  workspaceInfo: WorkspaceInfo,
+                                  basePath: Path) -> WorkspaceInfo
     {
         var files = workspaceInfo.files
         var folders = workspaceInfo.folders
@@ -191,7 +198,7 @@ extension WorkspaceInfo {
             }
 
             for filePath in filesToAdd {
-                let path = Path(filePath).absolute()
+                let path = (basePath + filePath).absolute()
 
                 guard path.exists else {
                     Logger.error("Config: Path \(path) does not exist")

Sources/DependencyCalculator/PackageMetadata.swift

@@ -25,7 +25,7 @@ struct PackageTargetMetadata {
             flags.append("--ignore-lock")
         }
 
-        let manifest = try Shell.execOrFail("cd \(path) && swift package dump-package \(flags.joined(separator: " "))")
+        let manifest = try Shell.execOrFail("(cd \(path) && swift package dump-package \(flags.joined(separator: " ")))")
             .trimmingCharacters(in: .newlines)
         guard let manifestData = manifest.data(using: .utf8),
               let manifestJson = try JSONSerialization.jsonObject(with: manifestData, options: []) as? [String: Any],

Sources/Git/Git+Changeset.swift

@@ -11,7 +11,7 @@ public extension Git {
     func changeset(baseBranch: String, verbose: Bool = false) throws -> Set<Path> {
         let gitRoot = try repoRoot()
 
-        var currentBranch = try Shell.execOrFail("cd \(gitRoot) && git branch --show-current").trimmingCharacters(in: .newlines)
+        var currentBranch = try Shell.execOrFail("(cd \(gitRoot) && git branch --show-current)").trimmingCharacters(in: .newlines)
         if verbose {
             Logger.message("Current branch: \(currentBranch)")
             Logger.message("Base branch: \(baseBranch)")
@@ -23,7 +23,7 @@ public extension Git {
             currentBranch = "HEAD"
         }
 
-        let changes = try Shell.execOrFail("cd \(gitRoot) && git diff '\(baseBranch)'..'\(currentBranch)' --name-only")
+        let changes = try Shell.execOrFail("(cd \(gitRoot) && git diff '\(baseBranch)'..'\(currentBranch)' --name-only)")
         let changesTrimmed = changes.trimmingCharacters(in: .whitespacesAndNewlines)
 
         guard !changesTrimmed.isEmpty else {
@@ -36,7 +36,7 @@ public extension Git {
     func localChangeset() throws -> Set<Path> {
         let gitRoot = try repoRoot()
 
-        let changes = try Shell.execOrFail("cd \(gitRoot) && git diff HEAD --name-only")
+        let changes = try Shell.execOrFail("(cd \(gitRoot) && git diff HEAD --name-only)")
 
         let changesTrimmed = changes.trimmingCharacters(in: .whitespacesAndNewlines)
 

Sources/Git/Git.swift

@@ -14,15 +14,15 @@ public struct Git {
     }
 
     public func repoRoot() throws -> Path {
-        let gitPath = try Shell.execOrFail("cd \(path) && git rev-parse --show-toplevel").trimmingCharacters(in: .newlines)
+        let gitPath = try Shell.execOrFail("(cd \(path) && git rev-parse --show-toplevel)").trimmingCharacters(in: .newlines)
 
         return Path(gitPath).absolute()
     }
 
     public func find(pattern: String) throws -> Set<Path> {
         let gitRoot = try repoRoot()
 
-        let result = try Shell.exec("cd \(gitRoot) && git ls-files | grep \(pattern)").0.trimmingCharacters(in: .newlines)
+        let result = try Shell.exec("(cd \(gitRoot) && git ls-files | grep \(pattern))").0.trimmingCharacters(in: .newlines)
 
         guard !result.isEmpty else {
             return Set()

Sources/SelectiveTestLogger/Logger.swift

@@ -9,18 +9,21 @@ public struct StandardErrorOutputStream: TextOutputStream {
     public mutating func write(_ string: String) { fputs(string, stderr) }
 }
 
-public var errStream = StandardErrorOutputStream()
-
 public enum Logger {
+    private static func write(_ message: String) {
+        var stream = StandardErrorOutputStream()
+        print(message, to: &stream)
+    }
+
     public static func message(_ message: String) {
-        print(message, to: &errStream)
+        write(message)
     }
 
     public static func warning(_ message: String) {
-        print("[WARN]: \(message)".yellow, to: &errStream)
+        write("[WARN]: \(message)".yellow)
     }
 
     public static func error(_ message: String) {
-        print("[ERROR]: \(message)".red, to: &errStream)
+        write("[ERROR]: \(message)".red)
     }
 }

Sources/SelectiveTestingCore/SelectiveTestingTool.swift

@@ -35,21 +35,40 @@ public final class SelectiveTestingTool {
                 dryRun: Bool = false,
                 verbose: Bool = false) throws
     {
-        if let configData = try? (Path.current + Config.defaultConfigName).read(),
-           let config = try Config.load(from: configData)
-        {
-            self.config = config
+        let suppliedBasePath = basePath.map { Path($0) }
+        var configCandidates: [Path] = []
+        if let suppliedBasePath {
+            let baseDirectory: Path
+            if let ext = suppliedBasePath.extension,
+               ext == "xcworkspace" || ext == "xcodeproj" {
+                baseDirectory = suppliedBasePath.parent()
+            } else if suppliedBasePath.isDirectory {
+                baseDirectory = suppliedBasePath
+            } else {
+                baseDirectory = suppliedBasePath.parent()
+            }
+            configCandidates.append(baseDirectory + Config.defaultConfigName)
+        }
+        configCandidates.append(Path.current + Config.defaultConfigName)
+
+        if let configPath = configCandidates.first(where: { $0.exists }),
+           let configData = try? configPath.read(),
+           let loadedConfig = try Config.load(from: configData) {
+            self.config = loadedConfig
+            if verbose {
+                Logger.message("Loaded config from \(configPath)")
+            }
         } else {
             config = nil
         }
 
-        let finalBasePath = basePath ??
+        let finalBasePath = Path(basePath ??
             config?.basePath ??
             Path().glob("*.xcworkspace").first?.string ??
-            Path().glob("*.xcodeproj").first?.string ?? "."
+            Path().glob("*.xcodeproj").first?.string ?? ".")
 
         self.baseBranch = baseBranch
-        self.basePath = Path(finalBasePath)
+        self.basePath = finalBasePath
         self.changedFiles = changedFiles
         self.printJSON = printJSON
         self.renderDependencyGraph = renderDependencyGraph
@@ -59,12 +78,21 @@ public final class SelectiveTestingTool {
         self.verbose = verbose
 
         // Merge CLI test plans with config test plans
-        var allTestPlans = config?.allTestPlans ?? []
+        var allTestPlans: [String] = config?.allTestPlans ?? []
         allTestPlans.append(contentsOf: testPlans)
         self.testPlans = allTestPlans
     }
 
     public func run() async throws -> Set<TargetIdentity> {
+        let workingDirectory: Path
+        if let ext = basePath.extension,
+           ext == "xcworkspace" || ext == "xcodeproj" {
+            workingDirectory = basePath.parent()
+        } else if basePath.isDirectory {
+            workingDirectory = basePath
+        } else {
+            workingDirectory = basePath.parent()
+        }
         // 1. Identify changed files
         let changeset: Set<Path>
 
@@ -136,7 +164,13 @@ public final class SelectiveTestingTool {
 
         if !dryRun {
             // 4. Configure workspace to test given targets
-            let plansToUpdate = testPlans.isEmpty ? workspaceInfo.candidateTestPlans : testPlans
+            let plansToUpdate = testPlans.isEmpty ?
+            workspaceInfo.candidateTestPlans :
+            testPlans.map { plan in
+                let planPath = Path(plan)
+                let resolved = planPath.isAbsolute ? planPath : workingDirectory + planPath
+                return resolved.absolute().string
+            }
 
             if !plansToUpdate.isEmpty {
                 for testPlan in plansToUpdate {

Sources/xcode-selective-test/SelectiveTesting.swift

@@ -2,7 +2,7 @@
 //  Created by Mike Gerasymenko <mike@gera.cx>
 //
 
-import ArgumentParser
+@preconcurrency import ArgumentParser
 import SelectiveTestingCore
 import SelectiveTestLogger
 

Tests/DependencyCalculatorTests/DependencyCalculatorTests.swift

@@ -6,10 +6,11 @@
 import Foundation
 import PathKit
 import SelectiveTestingCore
+import Testing
 import Workspace
-import XCTest
 
-final class DependencyCalculatorTests: XCTestCase {
+@Suite
+struct DependencyCalculatorTests {
     func depStructure() -> (DependencyGraph, TargetIdentity, TargetIdentity, TargetIdentity, TargetIdentity, TargetIdentity, TargetIdentity) {
         let mainApp = TargetIdentity.project(path: "/folder/Project.xcodepoj", targetName: "MainApp", testTarget: false)
         let mainAppTests = TargetIdentity.project(path: "/folder/Project.xcodepoj", targetName: "MainAppTests", testTarget: true)
@@ -35,8 +36,8 @@ final class DependencyCalculatorTests: XCTestCase {
         return (depsGraph, mainApp, module, submodule, mainAppTests, moduleTests, submoduleTests)
     }
 
-    func testGraphIntegrity_submodule() async throws {
-        // given
+    @Test
+    func graphIntegrity_submodule() async throws {
         let (depsGraph, mainApp, module, submodule, mainAppTests, moduleTests, submoduleTests) = depStructure()
 
         let files = Set([Path("/folder/submodule/file.swift")])
@@ -45,16 +46,14 @@ final class DependencyCalculatorTests: XCTestCase {
                                   folders: [:],
                                   dependencyStructure: depsGraph,
                                   candidateTestPlan: nil)
-        // when
 
         let affected = graph.affectedTargets(changedFiles: files)
 
-        // then
-        XCTAssertEqual(affected, Set([mainApp, mainAppTests, module, moduleTests, submodule, submoduleTests]))
+        #expect(affected == Set([mainApp, mainAppTests, module, moduleTests, submodule, submoduleTests]))
     }
 
-    func testGraphIntegrity_mainApp() async throws {
-        // given
+    @Test
+    func graphIntegrity_mainApp() async throws {
         let (depsGraph, mainApp, _, _, mainAppTests, _, _) = depStructure()
 
         let files = Set([Path("/folder/submodule/file.swift")])
@@ -63,16 +62,14 @@ final class DependencyCalculatorTests: XCTestCase {
                                   folders: [:],
                                   dependencyStructure: depsGraph,
                                   candidateTestPlan: nil)
-        // when
 
         let affected = graph.affectedTargets(changedFiles: files)
 
-        // then
-        XCTAssertEqual(affected, Set([mainApp, mainAppTests]))
+        #expect(affected == Set([mainApp, mainAppTests]))
     }
 
-    func testGraphIntegrity_module() async throws {
-        // given
+    @Test
+    func graphIntegrity_module() async throws {
         let (depsGraph, mainApp, module, _, mainAppTests, moduleTests, _) = depStructure()
 
         let files = Set([Path("/folder/submodule/file.swift")])
@@ -81,11 +78,9 @@ final class DependencyCalculatorTests: XCTestCase {
                                   folders: [:],
                                   dependencyStructure: depsGraph,
                                   candidateTestPlan: nil)
-        // when
 
         let affected = graph.affectedTargets(changedFiles: files)
 
-        // then
-        XCTAssertEqual(affected, Set([module, moduleTests, mainApp, mainAppTests]))
+        #expect(affected == Set([module, moduleTests, mainApp, mainAppTests]))
     }
 }