Skip to content

#50: Assume Package.resolved modifies underlying targets #51

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
May 12, 2025
Merged

#50: Assume Package.resolved modifies underlying targets #51

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
5 changes: 4 additions & 1 deletion Sources/DependencyCalculator/PackageMetadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ struct PackageTargetMetadata {

let type = target["type"] as? String

var affectedBy = Set<Path>([path + "Package.swift"])
var affectedBy = Set<Path>([
path + "Package.swift",
path + "Package.resolved"
])

let typePath: String

Expand Down
27 changes: 21 additions & 6 deletions Tests/DependencyCalculatorTests/PackageMetadataTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,22 @@ final class PackageMetadataTests: XCTestCase {
XCTAssertEqual(first.name, "ExampleSubpackage")
XCTAssertEqual(first.path, basePath)
XCTAssertEqual(first.dependsOn.count, 0)
XCTAssertEqual(first.affectedBy, Set([basePath + "Package.swift",
basePath + "Sources" + "ExampleSubpackage",
basePath + "Sources" + "ExampleSubpackage" + "Assets.xcassets"]))
XCTAssertEqual(first.affectedBy, Set([
basePath + "Package.swift",
basePath + "Package.resolved",
basePath + "Sources" + "ExampleSubpackage",
basePath + "Sources" + "ExampleSubpackage" + "Assets.xcassets"
]))

let second = metadata[1]
XCTAssertEqual(second.name, "ExampleSubpackageTests")
XCTAssertEqual(second.path, basePath)
XCTAssertEqual(second.dependsOn.count, 1)
XCTAssertEqual(second.affectedBy, Set([basePath + "Package.swift", basePath + "Tests" + "ExampleSubpackageTests"]))
XCTAssertEqual(second.affectedBy, Set([
basePath + "Package.swift",
basePath + "Package.resolved",
basePath + "Tests" + "ExampleSubpackageTests"
]))

let identity = try XCTUnwrap(second.dependsOn.first)

Expand All @@ -57,12 +64,20 @@ final class PackageMetadataTests: XCTestCase {
XCTAssertEqual(first.name, "SelectiveTesting")
XCTAssertEqual(first.path, basePath)
XCTAssertEqual(first.dependsOn, Set([TargetIdentity.package(path: basePath, targetName: "SelectiveTestingCore", testTarget: false)]))
XCTAssertEqual(first.affectedBy, Set([basePath + "Package.swift", basePath + "Sources" + "SelectiveTesting"]))
XCTAssertEqual(first.affectedBy, Set([
basePath + "Package.swift",
basePath + "Package.resolved",
basePath + "Sources" + "SelectiveTesting"
]))

let second = metadata[1]
XCTAssertEqual(second.name, "SelectiveTestingCore")
XCTAssertEqual(second.path, basePath)
XCTAssertEqual(second.dependsOn.count, 6)
XCTAssertEqual(second.affectedBy, Set([basePath + "Package.swift", basePath + "Sources" + "SelectiveTestingCore"]))
XCTAssertEqual(second.affectedBy, Set([
basePath + "Package.swift",
basePath + "Package.resolved",
basePath + "Sources" + "SelectiveTestingCore"
]))
}
}
18 changes: 18 additions & 0 deletions Tests/SelectiveTestingTests/SelectiveTestingConfigTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,24 @@ final class SelectiveTestingConfigTests: XCTestCase {
testTool.packageTests,
testTool.subtests]))
}

func testConfigTestplanPath_packageResolvedChanged() async throws {
// given
let tool = try testTool.createSUT(config: Config(basePath: (testTool.projectPath + "ExampleWorkspace.xcworkspace").string,
testPlan: "ExampleProject.xctestplan",
exclude: nil,
extra: nil))
// when
try testTool.addFile(at: testTool.projectPath + "ExamplePackage/Package.resolved")

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

func testAdditionalDependency() async throws {
// given
Expand Down
Loading