Skip to content

Commit 230f874

Browse files
compnerdcompnerd
committed
Tests: clean up XCTAssertTrue usage for equality checks
1 parent 0ed9ae9 commit 230f874

File tree

4 files changed

+64
-61
lines changed

4 files changed

+64
-61
lines changed

‎Tests/SwiftDriverTests/CachingBuildTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ throws {
4949
XCTAssertTrue(job.inputs.contains(typedCandidatePath))
5050
XCTAssertTrue(job.commandLine.contains(.flag(VirtualPath.lookup(candidatePath).description)))
5151
}
52-
XCTAssertTrue(job.commandLine.filter {$0 == .flag("-candidate-module-file")}.count == compiledCandidateList.count)
52+
XCTAssertEqual(job.commandLine.filter { $0 == .flag("-candidate-module-file") }.count, compiledCandidateList.count)
5353
}
5454
// make sure command-line from dep-scanner are included.
5555
let extraCommandLine = try XCTUnwrap(swiftModuleDetails.commandLine)
@@ -512,7 +512,7 @@ final class CachingBuildTests: XCTestCase {
512512
for job in jobs {
513513
if (job.outputs.count == 0) {
514514
// This is the verify module job as it should be the only job scheduled to have no output.
515-
XCTAssertTrue(job.kind == .verifyModuleInterface)
515+
XCTAssertEqual(job.kind, .verifyModuleInterface)
516516
// Check the explicit module flags exists.
517517
XCTAssertTrue(job.commandLine.contains(.flag(String("-explicit-interface-module-build"))))
518518
XCTAssertTrue(job.commandLine.contains(.flag(String("-explicit-swift-module-map-file"))))

‎Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift‎

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2309,13 +2309,13 @@ final class ExplicitModuleBuildTests: XCTestCase {
23092309
}
23102310

23112311
func getOutputName(_ job: Job) -> String {
2312-
XCTAssertTrue(job.outputs.count == 1)
2312+
XCTAssertEqual(job.outputs.count, 1)
23132313
return job.outputs[0].file.basename
23142314
}
23152315

23162316
func checkInputOutputIntegrity(_ job: Job) {
23172317
let name = job.outputs[0].file.basenameWithoutExt
2318-
XCTAssertTrue(job.outputs[0].file.extension == "swiftmodule")
2318+
XCTAssertEqual(job.outputs[0].file.extension, "swiftmodule")
23192319
job.inputs.forEach { input in
23202320
// Inputs include all the dependencies and the interface from where
23212321
// the current module can be built.
@@ -2326,7 +2326,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
23262326
if inputName.starts(with: "arm64e-") && name.starts(with: "arm64-") {
23272327
return
23282328
}
2329-
XCTAssertTrue(inputName == name)
2329+
XCTAssertEqual(inputName, name)
23302330
}
23312331
}
23322332

@@ -2352,12 +2352,12 @@ final class ExplicitModuleBuildTests: XCTestCase {
23522352
}()
23532353

23542354
// Check interface map always contain everything
2355-
XCTAssertTrue(interfaceMap["Swift"]!.count == 3)
2356-
XCTAssertTrue(interfaceMap["A"]!.count == 3)
2357-
XCTAssertTrue(interfaceMap["E"]!.count == 3)
2358-
XCTAssertTrue(interfaceMap["F"]!.count == 3)
2359-
XCTAssertTrue(interfaceMap["G"]!.count == 3)
2360-
XCTAssertTrue(interfaceMap["H"]!.count == 3)
2355+
XCTAssertEqual(interfaceMap["Swift"]?.count, 3)
2356+
XCTAssertEqual(interfaceMap["A"]?.count, 3)
2357+
XCTAssertEqual(interfaceMap["E"]?.count, 3)
2358+
XCTAssertEqual(interfaceMap["F"]?.count, 3)
2359+
XCTAssertEqual(interfaceMap["G"]?.count, 3)
2360+
XCTAssertEqual(interfaceMap["H"]?.count, 3)
23612361

23622362
try withTemporaryDirectory { path in
23632363
let main = path.appending(component: "testPrebuiltModuleGenerationJobs.swift")
@@ -2381,35 +2381,35 @@ final class ExplicitModuleBuildTests: XCTestCase {
23812381
into: path,
23822382
exhaustive: true)
23832383

2384-
XCTAssertTrue(danglingJobs.count == 2)
2384+
XCTAssertEqual(danglingJobs.count, 2)
23852385
XCTAssertTrue(danglingJobs.allSatisfy { job in
23862386
job.moduleName == "MissingKit"
23872387
})
2388-
XCTAssertTrue(jobs.count == 18)
2388+
XCTAssertEqual(jobs.count, 18)
23892389
XCTAssertTrue(jobs.allSatisfy {$0.outputs.count == 1})
23902390
XCTAssertTrue(jobs.allSatisfy {$0.kind == .compile})
23912391
XCTAssertTrue(jobs.allSatisfy {$0.commandLine.contains(.flag("-compile-module-from-interface"))})
23922392
XCTAssertTrue(jobs.allSatisfy {$0.commandLine.contains(.flag("-module-cache-path"))})
23932393
XCTAssertTrue(jobs.allSatisfy {$0.commandLine.contains(.flag("-bad-file-descriptor-retry-count"))})
23942394
XCTAssertTrue(try jobs.allSatisfy {$0.commandLine.contains(.path(try VirtualPath(path: moduleCachePath)))})
23952395
let HJobs = jobs.filter { $0.moduleName == "H"}
2396-
XCTAssertTrue(HJobs.count == 3)
2396+
XCTAssertEqual(HJobs.count, 3)
23972397
// arm64
2398-
XCTAssertTrue(getInputModules(HJobs[0]) == ["A", "A", "E", "E", "F", "F", "G", "G", "Swift", "Swift"])
2398+
XCTAssertEqual(getInputModules(HJobs[0]), ["A", "A", "E", "E", "F", "F", "G", "G", "Swift", "Swift"])
23992399
// arm64e
2400-
XCTAssertTrue(getInputModules(HJobs[1]) == ["A", "E", "F", "G", "Swift"])
2400+
XCTAssertEqual(getInputModules(HJobs[1]), ["A", "E", "F", "G", "Swift"])
24012401
// x86_64
2402-
XCTAssertTrue(getInputModules(HJobs[2]) == ["A", "E", "F", "G", "Swift"])
2402+
XCTAssertEqual(getInputModules(HJobs[2]), ["A", "E", "F", "G", "Swift"])
24032403
XCTAssertTrue(getOutputName(HJobs[0]) != getOutputName(HJobs[1]))
24042404
XCTAssertTrue(getOutputName(HJobs[1]) != getOutputName(HJobs[2]))
24052405
checkInputOutputIntegrity(HJobs[0])
24062406
checkInputOutputIntegrity(HJobs[1])
24072407
checkInputOutputIntegrity(HJobs[2])
24082408
let GJobs = jobs.filter { $0.moduleName == "G"}
2409-
XCTAssertTrue(GJobs.count == 3)
2410-
XCTAssertTrue(getInputModules(GJobs[0]) == ["E", "E", "Swift", "Swift"])
2411-
XCTAssertTrue(getInputModules(GJobs[1]) == ["E", "Swift"])
2412-
XCTAssertTrue(getInputModules(GJobs[2]) == ["E", "Swift"])
2409+
XCTAssertEqual(GJobs.count, 3)
2410+
XCTAssertEqual(getInputModules(GJobs[0]), ["E", "E", "Swift", "Swift"])
2411+
XCTAssertEqual(getInputModules(GJobs[1]), ["E", "Swift"])
2412+
XCTAssertEqual(getInputModules(GJobs[2]), ["E", "Swift"])
24132413
XCTAssertTrue(getOutputName(GJobs[0]) != getOutputName(GJobs[1]))
24142414
XCTAssertTrue(getOutputName(GJobs[1]) != getOutputName(GJobs[2]))
24152415
checkInputOutputIntegrity(GJobs[0])
@@ -2426,26 +2426,28 @@ final class ExplicitModuleBuildTests: XCTestCase {
24262426
exhaustive: false)
24272427

24282428
XCTAssertTrue(danglingJobs.isEmpty)
2429-
XCTAssertTrue(jobs.count == 18)
2429+
XCTAssertEqual(jobs.count, 18)
24302430
XCTAssertTrue(jobs.allSatisfy {$0.outputs.count == 1})
24312431
XCTAssertTrue(jobs.allSatisfy {$0.kind == .compile})
24322432
XCTAssertTrue(jobs.allSatisfy {$0.commandLine.contains(.flag("-compile-module-from-interface"))})
2433+
24332434
let HJobs = jobs.filter { $0.moduleName == "H"}
2434-
XCTAssertTrue(HJobs.count == 3)
2435+
XCTAssertEqual(HJobs.count, 3)
24352436
// arm64
2436-
XCTAssertTrue(getInputModules(HJobs[0]) == ["A", "A", "E", "E", "F", "F", "G", "G", "Swift", "Swift"])
2437+
XCTAssertEqual(getInputModules(HJobs[0]), ["A", "A", "E", "E", "F", "F", "G", "G", "Swift", "Swift"])
24372438
// arm64e
2438-
XCTAssertTrue(getInputModules(HJobs[1]) == ["A", "E", "F", "G", "Swift"])
2439+
XCTAssertEqual(getInputModules(HJobs[1]), ["A", "E", "F", "G", "Swift"])
24392440
// x86_64
2440-
XCTAssertTrue(getInputModules(HJobs[2]) == ["A", "E", "F", "G", "Swift"])
2441+
XCTAssertEqual(getInputModules(HJobs[2]), ["A", "E", "F", "G", "Swift"])
24412442
XCTAssertTrue(getOutputName(HJobs[0]) != getOutputName(HJobs[1]))
24422443
checkInputOutputIntegrity(HJobs[0])
24432444
checkInputOutputIntegrity(HJobs[1])
2445+
24442446
let GJobs = jobs.filter { $0.moduleName == "G"}
2445-
XCTAssertTrue(GJobs.count == 3)
2446-
XCTAssertTrue(getInputModules(GJobs[0]) == ["E", "E", "Swift", "Swift"])
2447-
XCTAssertTrue(getInputModules(GJobs[1]) == ["E", "Swift"])
2448-
XCTAssertTrue(getInputModules(GJobs[2]) == ["E", "Swift"])
2447+
XCTAssertEqual(GJobs.count, 3)
2448+
XCTAssertEqual(getInputModules(GJobs[0]), ["E", "E", "Swift", "Swift"])
2449+
XCTAssertEqual(getInputModules(GJobs[1]), ["E", "Swift"])
2450+
XCTAssertEqual(getInputModules(GJobs[2]), ["E", "Swift"])
24492451
XCTAssertTrue(getOutputName(GJobs[0]) != getOutputName(GJobs[1]))
24502452
XCTAssertTrue(getOutputName(GJobs[1]) != getOutputName(GJobs[2]))
24512453
checkInputOutputIntegrity(GJobs[0])
@@ -2476,7 +2478,7 @@ final class ExplicitModuleBuildTests: XCTestCase {
24762478
exhaustive: false)
24772479

24782480
XCTAssertTrue(danglingJobs.isEmpty)
2479-
XCTAssertTrue(jobs.count == 9)
2481+
XCTAssertEqual(jobs.count, 9)
24802482
jobs.forEach({ job in
24812483
// Check we don't pull in other modules than A, F and Swift
24822484
XCTAssertTrue(["A", "F", "Swift"].contains(job.moduleName))
@@ -2507,13 +2509,13 @@ final class ExplicitModuleBuildTests: XCTestCase {
25072509

25082510
func testABICheckWhileBuildingPrebuiltModule() throws {
25092511
func checkABICheckingJob(_ job: Job) throws {
2510-
XCTAssertTrue(job.kind == .compareABIBaseline)
2511-
XCTAssertTrue(job.inputs.count == 2)
2512+
XCTAssertEqual(job.kind, .compareABIBaseline)
2513+
XCTAssertEqual(job.inputs.count, 2)
25122514
let (baseline, current) = (job.inputs[0], job.inputs[1])
2513-
XCTAssertTrue(baseline.type == .jsonABIBaseline)
2514-
XCTAssertTrue(current.type == .jsonABIBaseline)
2515+
XCTAssertEqual(baseline.type, .jsonABIBaseline)
2516+
XCTAssertEqual(current.type, .jsonABIBaseline)
25152517
XCTAssertTrue(current.file != baseline.file)
2516-
XCTAssertTrue(current.file.basename == baseline.file.basename)
2518+
XCTAssertEqual(current.file.basename, baseline.file.basename)
25172519
}
25182520
let mockSDKPath: String =
25192521
try testInputsPath.appending(component: "mock-sdk.sdk").pathString

‎Tests/SwiftDriverTests/JobExecutorTests.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,8 @@ final class JobExecutorTests: XCTestCase {
353353

354354
var driver = try Driver(args: ["swift", main.pathString])
355355
let jobs = try driver.planBuild()
356-
XCTAssertTrue(jobs.count == 1 && jobs[0].requiresInPlaceExecution)
356+
XCTAssertEqual(jobs.count, 1)
357+
XCTAssertTrue(jobs[0].requiresInPlaceExecution)
357358

358359
// Change the file
359360
try localFileSystem.writeFileContents(main, bytes: "let foo = 1")

‎Tests/SwiftDriverTests/SwiftDriverTests.swift‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ final class SwiftDriverTests: XCTestCase {
269269
let plannedJobs = try driver.planBuild()
270270
XCTAssertEqual(plannedJobs.count, 1)
271271
let helpJob = plannedJobs.first!
272-
XCTAssertTrue(helpJob.kind == .help)
272+
XCTAssertEqual(helpJob.kind, .help)
273273
XCTAssertTrue(helpJob.requiresInPlaceExecution)
274274
XCTAssertTrue(helpJob.tool.name.hasSuffix("swift-help"))
275275
let expected: [Job.ArgTemplate] = [.flag("swift")]
@@ -281,7 +281,7 @@ final class SwiftDriverTests: XCTestCase {
281281
let plannedJobs = try driver.planBuild()
282282
XCTAssertEqual(plannedJobs.count, 1)
283283
let helpJob = plannedJobs.first!
284-
XCTAssertTrue(helpJob.kind == .help)
284+
XCTAssertEqual(helpJob.kind, .help)
285285
XCTAssertTrue(helpJob.requiresInPlaceExecution)
286286
XCTAssertTrue(helpJob.tool.name.hasSuffix("swift-help"))
287287
let expected: [Job.ArgTemplate] = [.flag("swiftc"), .flag("-show-hidden")]
@@ -930,9 +930,9 @@ final class SwiftDriverTests: XCTestCase {
930930
"-emit-library", "-module-name", "Test", "-serialize-diagnostics"])
931931
let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
932932
XCTAssertEqual(plannedJobs.count, 3)
933-
XCTAssertTrue(plannedJobs[0].kind == .emitModule)
934-
XCTAssertTrue(plannedJobs[1].kind == .compile)
935-
XCTAssertTrue(plannedJobs[2].kind == .link)
933+
XCTAssertEqual(plannedJobs[0].kind, .emitModule)
934+
XCTAssertEqual(plannedJobs[1].kind, .compile)
935+
XCTAssertEqual(plannedJobs[2].kind, .link)
936936
try XCTAssertJobInvocationMatches(plannedJobs[0], .flag("-serialize-diagnostics-path"), .path(.absolute(.init(validating: "/tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master.emit-module.dia"))))
937937
try XCTAssertJobInvocationMatches(plannedJobs[1], .flag("-serialize-diagnostics-path"), .path(.absolute(.init(validating: "/tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/foo.dia"))))
938938
}
@@ -944,9 +944,9 @@ final class SwiftDriverTests: XCTestCase {
944944
"-emit-library", "-module-name", "Test", "-serialize-diagnostics"])
945945
let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
946946
XCTAssertEqual(plannedJobs.count, 3)
947-
XCTAssertTrue(plannedJobs[0].kind == .compile)
948-
XCTAssertTrue(plannedJobs[1].kind == .emitModule)
949-
XCTAssertTrue(plannedJobs[2].kind == .link)
947+
XCTAssertEqual(plannedJobs[0].kind, .compile)
948+
XCTAssertEqual(plannedJobs[1].kind, .emitModule)
949+
XCTAssertEqual(plannedJobs[2].kind, .link)
950950
try XCTAssertJobInvocationMatches(plannedJobs[0], .flag("-serialize-diagnostics-path"), .path(.absolute(.init(validating: "/tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master.dia"))))
951951
try XCTAssertJobInvocationMatches(plannedJobs[1], .flag("-serialize-diagnostics-path"), .path(.absolute(.init(validating: "/tmp/foo/.build/x86_64-apple-macosx/debug/foo.build/master.emit-module.dia"))))
952952
}
@@ -1776,7 +1776,7 @@ final class SwiftDriverTests: XCTestCase {
17761776
outputs: [])
17771777
let resolver = try ArgsResolver(fileSystem: localFileSystem)
17781778
let resolvedArgs: [String] = try resolver.resolveArgumentList(for: testJob)
1779-
XCTAssertTrue(resolvedArgs.count == 3)
1779+
XCTAssertEqual(resolvedArgs.count, 3)
17801780
XCTAssertEqual(resolvedArgs[2].first, "@")
17811781
let responseFilePath = try AbsolutePath(validating: String(resolvedArgs[2].dropFirst()))
17821782
XCTAssertEqual(responseFilePath.basename, "arguments-847d15e70d97df7c18033735497ca8dcc4441f461d5a9c2b764b127004524e81.resp")
@@ -5428,7 +5428,7 @@ final class SwiftDriverTests: XCTestCase {
54285428
for arg in ["-version", "--version"] {
54295429
var driver = try Driver(args: ["swift"] + [arg])
54305430
let plannedJobs = try driver.planBuild()
5431-
XCTAssertTrue(plannedJobs.count == 1)
5431+
XCTAssertEqual(plannedJobs.count, 1)
54325432
let job = plannedJobs[0]
54335433
XCTAssertEqual(job.kind, .versionRequest)
54345434
XCTAssertEqual(job.commandLine, [.flag("--version")])
@@ -5461,7 +5461,7 @@ final class SwiftDriverTests: XCTestCase {
54615461
do {
54625462
var driver = try Driver(args: ["swift", "-print-target-info", "-target", "arm64-apple-ios12.0", "-sdk", "bar", "-resource-dir", "baz"])
54635463
let plannedJobs = try driver.planBuild()
5464-
XCTAssertTrue(plannedJobs.count == 1)
5464+
XCTAssertEqual(plannedJobs.count, 1)
54655465
let job = plannedJobs[0]
54665466
XCTAssertEqual(job.kind, .printTargetInfo)
54675467
XCTAssertJobInvocationMatches(job, .flag("-print-target-info"))
@@ -6175,12 +6175,12 @@ final class SwiftDriverTests: XCTestCase {
61756175
let verifyJob = try plannedJobs.findJob(.verifyModuleInterface)
61766176
let packageOutputs = emitJob.outputs.filter { $0.type == .packageSwiftInterface }
61776177
let publicOutputs = emitJob.outputs.filter { $0.type == .swiftInterface }
6178-
XCTAssertTrue(packageOutputs.count == 1,
6179-
"There should be one package swiftinterface output")
6180-
XCTAssertTrue(publicOutputs.count == 1,
6181-
"There should be one public swiftinterface output")
6182-
XCTAssertTrue(verifyJob.inputs.count == 1)
6183-
XCTAssertTrue(verifyJob.inputs[0] == publicOutputs[0])
6178+
XCTAssertEqual(packageOutputs.count, 1,
6179+
"There should be one package swiftinterface output")
6180+
XCTAssertEqual(publicOutputs.count, 1,
6181+
"There should be one public swiftinterface output")
6182+
XCTAssertEqual(verifyJob.inputs.count, 1)
6183+
XCTAssertEqual(verifyJob.inputs[0], publicOutputs[0])
61846184
XCTAssertTrue(verifyJob.outputs.isEmpty)
61856185
}
61866186

@@ -6212,12 +6212,12 @@ final class SwiftDriverTests: XCTestCase {
62126212
let verifyJob = try plannedJobs.findJob(.verifyModuleInterface)
62136213
let packageOutputs = emitJob.outputs.filter { $0.type == .packageSwiftInterface }
62146214
let publicOutputs = emitJob.outputs.filter { $0.type == .swiftInterface }
6215-
XCTAssertTrue(packageOutputs.count == 1,
6216-
"There should be one package swiftinterface output")
6217-
XCTAssertTrue(publicOutputs.count == 1,
6218-
"There should be one public swiftinterface output")
6219-
XCTAssertTrue(verifyJob.inputs.count == 1)
6220-
XCTAssertTrue(verifyJob.inputs[0] == publicOutputs[0])
6215+
XCTAssertEqual(packageOutputs.count, 1,
6216+
"There should be one package swiftinterface output")
6217+
XCTAssertEqual(publicOutputs.count, 1,
6218+
"There should be one public swiftinterface output")
6219+
XCTAssertEqual(verifyJob.inputs.count, 1)
6220+
XCTAssertEqual(verifyJob.inputs[0], publicOutputs[0])
62216221
XCTAssertTrue(verifyJob.outputs.isEmpty)
62226222
}
62236223
}
@@ -6241,7 +6241,7 @@ final class SwiftDriverTests: XCTestCase {
62416241
env: envVars)
62426242

62436243
let plannedJobs = try driver.planBuild()
6244-
XCTAssertTrue(plannedJobs.count == 1)
6244+
XCTAssertEqual(plannedJobs.count, 1)
62456245
XCTAssertJobInvocationMatches(plannedJobs[0], .flag("-experimental-package-interface-load"))
62466246
}
62476247
}

0 commit comments

Comments
 (0)