Improve test

David Ungar · David Ungar · commit bdc419ef8bc8 · 2020-12-04T12:46:00.000-08:00
diff --git a/Tests/SwiftDriverTests/SwiftDriverTests.swift b/Tests/SwiftDriverTests/SwiftDriverTests.swift
@@ -1475,8 +1475,10 @@ final class SwiftDriverTests: XCTestCase {
     struct MockExecutor: DriverExecutor {
       let resolver = try! ArgsResolver(fileSystem: localFileSystem)
 
+      struct ShouldNeverGetHere: LocalizedError {}
+
       func execute(job: Job, forceResponseFiles: Bool, recordedInputModificationDates: [TypedVirtualPath : Date]) throws -> ProcessResult {
-        fatalError()
+        throw ShouldNeverGetHere()
       }
       func execute(workload: DriverExecutorWorkload,
                    delegate: JobExecutionDelegate,
@@ -1486,11 +1488,11 @@ final class SwiftDriverTests: XCTestCase {
         XCTAssert(workload.continueBuildingAfterErrors)
       }
       func checkNonZeroExit(args: String..., environment: [String : String]) throws -> String {
-        fatalError()
+        throw ShouldNeverGetHere()
       }
       func description(of job: Job, forceResponseFiles: Bool) throws -> String {
-        fatalError()
-      }
+        throw ShouldNeverGetHere()
+       }
     }
 
     let driver = try Driver(args: ["swiftc", "foo1.swift", "bar1.swift", "-enable-batch-mode", "-driver-use-frontend-path", "/bin/echo"], executor: MockExecutor())

Original file line number	Diff line number	Diff line change
`@@ -1475,8 +1475,10 @@ final class SwiftDriverTests: XCTestCase {`
`1475`	`1475`	`struct MockExecutor: DriverExecutor {`
`1476`	`1476`	`let resolver = try! ArgsResolver(fileSystem: localFileSystem)`
`1477`	`1477`
	`1478`	`+ struct ShouldNeverGetHere: LocalizedError {}`
	`1479`	`+`
`1478`	`1480`	`func execute(job: Job, forceResponseFiles: Bool, recordedInputModificationDates: [TypedVirtualPath : Date]) throws -> ProcessResult {`
`1479`		`- fatalError()`
	`1481`	`+ throw ShouldNeverGetHere()`
`1480`	`1482`	`}`
`1481`	`1483`	`func execute(workload: DriverExecutorWorkload,`
`1482`	`1484`	`delegate: JobExecutionDelegate,`
`@@ -1486,11 +1488,11 @@ final class SwiftDriverTests: XCTestCase {`
`1486`	`1488`	`XCTAssert(workload.continueBuildingAfterErrors)`
`1487`	`1489`	`}`
`1488`	`1490`	`func checkNonZeroExit(args: String..., environment: [String : String]) throws -> String {`
`1489`		`- fatalError()`
	`1491`	`+ throw ShouldNeverGetHere()`
`1490`	`1492`	`}`
`1491`	`1493`	`func description(of job: Job, forceResponseFiles: Bool) throws -> String {`
`1492`		`- fatalError()`
`1493`		`- }`
	`1494`	`+ throw ShouldNeverGetHere()`
	`1495`	`+ }`
`1494`	`1496`	`}`
`1495`	`1497`
`1496`	`1498`	`let driver = try Driver(args: ["swiftc", "foo1.swift", "bar1.swift", "-enable-batch-mode", "-driver-use-frontend-path", "/bin/echo"], executor: MockExecutor())`