Skip to content

feat(65): Allow project in subfolder #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikeger merged 1 commit into from
Nov 2, 2025
Merged

feat(65): Allow project in subfolder #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/DependencyCalculator/DependencyGraph.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ extension WorkspaceInfo {
var dependsOn: [TargetIdentity: Set<TargetIdentity>] = [:]
var files: [TargetIdentity: Set<Path>] = [:]
var folders: [Path: TargetIdentity] = [:]
var candidateTestPlan: String? = nil
var candidateTestPlan: Path? = nil

var packagesByName: [String: PackageTargetMetadata] = packages.toDictionary(path: \.name)
let targetsByName = project.pbxproj.nativeTargets.toDictionary(path: \.name)
Expand Down Expand Up @@ -385,14 +385,14 @@ extension WorkspaceInfo {
// Find existing test plans
project.sharedData?.schemes.forEach { scheme in
scheme.testAction?.testPlans?.forEach { plan in
candidateTestPlan = plan.reference.replacingOccurrences(of: "container:", with: "")
candidateTestPlan = path.parent() + plan.reference.replacingOccurrences(of: "container:", with: "")
}
}

return WorkspaceInfo(files: files,
folders: folders,
dependencyStructure: DependencyGraph(dependsOn: dependsOn),
candidateTestPlan: candidateTestPlan)
candidateTestPlan: candidateTestPlan?.string)
}

private static func isSwiftVersion6Plus() throws -> Bool {
Expand Down
17 changes: 15 additions & 2 deletions Tests/SelectiveTestingTests/IntegrationTestTool.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,21 @@ import XCTest
final class IntegrationTestTool {
var projectPath: Path = ""

func setUp() throws {
func setUp(subfolder: Bool = false) throws {
let tmpPath = Path.temporary.absolute()
guard let exampleInBundle = Bundle.module.path(forResource: "ExampleProject", ofType: "") else {
fatalError("Missing ExampleProject in TestBundle")
}
projectPath = tmpPath + "ExampleProject"
try? FileManager.default.removeItem(atPath: projectPath.string)
try FileManager.default.copyItem(atPath: exampleInBundle, toPath: projectPath.string)
if subfolder {
let finalPath = (projectPath + "Subfolder").string
try FileManager.default.createDirectory(atPath: projectPath.string, withIntermediateDirectories: true)
try FileManager.default.copyItem(atPath: exampleInBundle, toPath: finalPath)
}
else {
try FileManager.default.copyItem(atPath: exampleInBundle, toPath: projectPath.string)
}
FileManager.default.changeCurrentDirectoryPath(projectPath.string)
try Shell.execOrFail("git init")
try Shell.execOrFail("git config commit.gpgsign false")
Expand All @@ -33,6 +40,12 @@ final class IntegrationTestTool {
func tearDown() throws {
try? FileManager.default.removeItem(atPath: projectPath.string)
}

func withTestTool(subfolder: Bool = false, closure: () async throws -> Void) async throws {
try setUp(subfolder: subfolder)
try await closure()
try tearDown()
}

func changeFile(at path: Path) throws {
let handle = FileHandle(forUpdatingAtPath: path.string)!
Expand Down
202 changes: 112 additions & 90 deletions Tests/SelectiveTestingTests/SelectiveTestingWorkspaceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,114 +11,136 @@ import XCTest
final class SelectiveTestingWorksapceTests: XCTestCase {
let testTool = IntegrationTestTool()

override func setUp() async throws {
try await super.setUp()

try testTool.setUp()
}

override func tearDown() async throws {
try await super.tearDown()

try testTool.tearDown()
}

func testProjectLoading_empty() async throws {
// given
let tool = try testTool.createSUT()
// when
let result = try await tool.run()
// then
XCTAssertEqual(result, Set())
try await testTool.withTestTool {
// given
let tool = try testTool.createSUT()
// when
let result = try await tool.run()
// then
XCTAssertEqual(result, Set())
}
}

func testProjectLoading_changeLibrary() async throws {
// given
let tool = try testTool.createSUT()
// when
try testTool.changeFile(at: testTool.projectPath + "ExampleLibrary/ExampleLibrary/ExampleLibrary.swift")

// then
let result = try await tool.run()
XCTAssertEqual(result, Set([testTool.mainProjectMainTarget,
testTool.mainProjectTests,
testTool.mainProjectUITests,
testTool.exampleLibrary,
testTool.exampleLibraryTests]))
try await testTool.withTestTool {
// given
let tool = try testTool.createSUT()
// when
try testTool.changeFile(at: testTool.projectPath + "ExampleLibrary/ExampleLibrary/ExampleLibrary.swift")

// then
let result = try await tool.run()
XCTAssertEqual(result, Set([testTool.mainProjectMainTarget,
testTool.mainProjectTests,
testTool.mainProjectUITests,
testTool.exampleLibrary,
testTool.exampleLibraryTests]))
}
}

func testProjectLoading_changeAsset() async throws {
// given
let tool = try testTool.createSUT()
// when
try testTool.changeFile(at: testTool.projectPath + "ExampleProject/Assets.xcassets/Contents.json")

// then
let result = try await tool.run()
XCTAssertEqual(result, Set([testTool.mainProjectMainTarget,
testTool.mainProjectTests,
testTool.mainProjectUITests]))
try await testTool.withTestTool {
// given
let tool = try testTool.createSUT()
// when
try testTool.changeFile(at: testTool.projectPath + "ExampleProject/Assets.xcassets/Contents.json")

// then
let result = try await tool.run()
XCTAssertEqual(result, Set([testTool.mainProjectMainTarget,
testTool.mainProjectTests,
testTool.mainProjectUITests]))
}
}

func testProjectLoading_testPlanChange() async throws {
// given
let tool = try testTool.createSUT()
// when
try testTool.changeFile(at: testTool.projectPath + "ExampleProject.xctestplan")

// then
let result = try await tool.run()
XCTAssertEqual(result, Set())
try await testTool.withTestTool {
// given
let tool = try testTool.createSUT()
// when
try testTool.changeFile(at: testTool.projectPath + "ExampleProject.xctestplan")

// then
let result = try await tool.run()
XCTAssertEqual(result, Set())
}
}

func testProjectLoading_testWorkspaceFileChange() async throws {
// given
let tool = try testTool.createSUT()
// when
try testTool.changeFile(at: testTool.projectPath + "ExampleWorkspace.xcworkspace/contents.xcworkspacedata")
// then
let result = try await tool.run()
XCTAssertEqual(result, Set([
testTool.mainProjectMainTarget,
testTool.mainProjectTests,
testTool.mainProjectUITests,
testTool.mainProjectLibrary,
testTool.mainProjectLibraryTests,
testTool.exampleLibraryTests,
testTool.exampleLibrary,
testTool.exampleLibraryInGroup,
]))
try await testTool.withTestTool {
// given
let tool = try testTool.createSUT()
// when
try testTool.changeFile(at: testTool.projectPath + "ExampleWorkspace.xcworkspace/contents.xcworkspacedata")
// then
let result = try await tool.run()
XCTAssertEqual(result, Set([
testTool.mainProjectMainTarget,
testTool.mainProjectTests,
testTool.mainProjectUITests,
testTool.mainProjectLibrary,
testTool.mainProjectLibraryTests,
testTool.exampleLibraryTests,
testTool.exampleLibrary,
testTool.exampleLibraryInGroup,
]))
}
}

func testProjectLoading_testProjectFileChange() async throws {
// given
let tool = try testTool.createSUT()
// when
try testTool.changeFile(at: testTool.projectPath + "ExampleProject.xcodeproj/project.pbxproj")

// then
let result = try await tool.run()
XCTAssertEqual(result, Set([
testTool.mainProjectMainTarget,
testTool.mainProjectTests,
testTool.mainProjectUITests,
testTool.mainProjectLibrary,
testTool.mainProjectLibraryTests,
]))
try await testTool.withTestTool {
// given
let tool = try testTool.createSUT()
// when
try testTool.changeFile(at: testTool.projectPath + "ExampleProject.xcodeproj/project.pbxproj")

// then
let result = try await tool.run()
XCTAssertEqual(result, Set([
testTool.mainProjectMainTarget,
testTool.mainProjectTests,
testTool.mainProjectUITests,
testTool.mainProjectLibrary,
testTool.mainProjectLibraryTests,
]))
}
}

func testInferTestPlan() async throws {
// given
let tool = try testTool.createSUT(config: nil,
testPlan: nil)
// when
try testTool.changeFile(at: testTool.projectPath + "ExampleLibrary/ExampleLibrary/ExampleLibrary.swift")

// then
let _ = try await tool.run()
try testTool.validateTestPlan(testPlanPath: testTool.projectPath + "ExampleProject.xctestplan",
expected: Set([testTool.mainProjectTests,
testTool.mainProjectUITests,
testTool.exampleLibraryTests]))
try await testTool.withTestTool {
// given
let tool = try testTool.createSUT(config: nil,
testPlan: nil)
// when
try testTool.changeFile(at: testTool.projectPath + "ExampleLibrary/ExampleLibrary/ExampleLibrary.swift")

// then
let _ = try await tool.run()
try testTool.validateTestPlan(testPlanPath: testTool.projectPath + "ExampleProject.xctestplan",
expected: Set([testTool.mainProjectTests,
testTool.mainProjectUITests,
testTool.exampleLibraryTests]))
}
}

func testInferTestPlanInSubfolder() async throws {
try await testTool.withTestTool(subfolder: true) {
// given
let tool = try testTool.createSUT(
config: nil,
basePath: testTool.projectPath + "Subfolder",
testPlan: nil)

// when
try testTool.changeFile(at: testTool.projectPath + "Subfolder/ExampleLibrary/ExampleLibrary/ExampleLibrary.swift")

// then
let _ = try await tool.run()
try testTool.validateTestPlan(testPlanPath: testTool.projectPath + "Subfolder/ExampleProject.xctestplan",
expected: Set([testTool.mainProjectTests,
testTool.mainProjectUITests,
testTool.exampleLibraryTests]))
}
}
}