Skip to content

refactor: reduce duplication and increase test coverage #58

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
ericodx merged 2 commits into from
Apr 8, 2026
Merged

refactor: reduce duplication and increase test coverage #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
085ddc6
refactor: extract recordResult in TestExecutionStage
ericodx Apr 8, 2026
bab1fee
test: cover external symlink fallback in TestFilesHasher
ericodx Apr 8, 2026
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
27 changes: 11 additions & 16 deletions Sources/SwiftMutationTesting/Execution/TestExecutionStage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,7 @@ struct TestExecutionStage: Sendable {
)
try? FileManager.default.removeItem(atPath: launched.xcresultPath)

let status = outcome.asExecutionStatus
let killerTestFile = resolveKillerTestFile(status: status)
let result = ExecutionResult(
descriptor: mutant, status: status, testDuration: launched.duration,
killerTestFile: killerTestFile
)
await deps.cacheStore.store(status: status, for: key, killerTestFile: killerTestFile)
let index = await deps.counter.increment()
await deps.reporter.report(
.mutantFinished(
descriptor: mutant, status: status,
index: index, total: deps.counter.total
)
)
return result
return await recordResult(mutant: mutant, key: key, outcome: outcome, duration: launched.duration)
}

private func runSPM(
Expand All @@ -105,10 +91,19 @@ struct TestExecutionStage: Sendable {

let outcome = SPMResultParser().parse(exitCode: launched.exitCode, output: launched.output)
await context.pool.release(slot)
return await recordResult(mutant: mutant, key: key, outcome: outcome, duration: launched.duration)
}

private func recordResult(
mutant: MutantDescriptor,
key: MutantCacheKey,
outcome: TestRunOutcome,
duration: Double
) async -> ExecutionResult {
let status = outcome.asExecutionStatus
let killerTestFile = resolveKillerTestFile(status: status)
let result = ExecutionResult(
descriptor: mutant, status: status, testDuration: launched.duration,
descriptor: mutant, status: status, testDuration: duration,
killerTestFile: killerTestFile
)
await deps.cacheStore.store(status: status, for: key, killerTestFile: killerTestFile)
Expand Down
23 changes: 23 additions & 0 deletions Tests/SwiftMutationTestingTests/Unit/Infrastructure/TestFilesHasherTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,29 @@ struct TestFilesHasherTests {
#expect(result.keys.contains("Tests/FooTests.swift"))
}

@Test("Given test file symlinked outside project, when hashPerFile called, then absolute path is used as key")
func hashPerFileUsesAbsolutePathForExternalSymlink() throws {
let projectDir = try FileHelpers.makeTemporaryDirectory()
defer { FileHelpers.cleanup(projectDir) }

let externalDir = try FileHelpers.makeTemporaryDirectory()
defer { FileHelpers.cleanup(externalDir) }

try FileHelpers.write("let t = 1", named: "ExternalTests.swift", in: externalDir)

let testsDir = projectDir.appendingPathComponent("Tests")
try FileManager.default.createDirectory(at: testsDir, withIntermediateDirectories: true)
let symlinkURL = testsDir.appendingPathComponent("ExternalTests.swift")
let targetURL = externalDir.appendingPathComponent("ExternalTests.swift")
try FileManager.default.createSymbolicLink(at: symlinkURL, withDestinationURL: targetURL)

let result = TestFilesHasher().hashPerFile(projectPath: projectDir.path)

#expect(result.count == 1)
let key = result.keys.first!
#expect(!key.hasPrefix("Tests/"))
}

@Test("Given non-existent path, when hashPerFile called, then empty map is returned")
func hashPerFileReturnsEmptyForNonExistentPath() {
let result = TestFilesHasher().hashPerFile(projectPath: "/nonexistent/path/xyz")
Expand Down