convert tests from #file to using #filePath

heckj · heckj · commit 3ea2b64519ec · 2020-10-06T17:31:05.000-07:00
diff --git a/Sources/LSPTestSupport/CheckCoding.swift b/Sources/LSPTestSupport/CheckCoding.swift
@@ -17,7 +17,7 @@ import XCTest
 ///
 /// - parameter value: The value to encode/decode.
 /// - parameter json: The expected json encoding.
-public func checkCoding<T>(_ value: T, json: String, file: StaticString = #file, line: UInt = #line) where T: Codable & Equatable {
+public func checkCoding<T>(_ value: T, json: String, file: StaticString = #filePath, line: UInt = #line) where T: Codable & Equatable {
   let encoder = JSONEncoder()
   encoder.outputFormatting.insert(.prettyPrinted)
   if #available(macOS 10.13, *) {
@@ -57,7 +57,7 @@ private struct WrapFragment<T>: Equatable, Codable where T: Equatable & Codable
 ///
 /// - parameter value: The value to encode/decode.
 /// - parameter json: The expected json encoding.
-public func checkDecoding<T>(json: String, expected value: T, file: StaticString = #file, line: UInt = #line) where T: Codable & Equatable {
+public func checkDecoding<T>(json: String, expected value: T, file: StaticString = #filePath, line: UInt = #line) where T: Codable & Equatable {
 
   let wrappedStr = "{\"value\":\(json)}"
   let data = wrappedStr.data(using: .utf8)!
@@ -67,7 +67,7 @@ public func checkDecoding<T>(json: String, expected value: T, file: StaticString
   XCTAssertEqual(value, decodedValue, file: file, line: line)
 }
 
-public func checkCoding<T>(_ value: T, json: String, userInfo: [CodingUserInfoKey: Any] = [:], file: StaticString = #file, line: UInt = #line, body: (T) -> Void) where T: Codable {
+public func checkCoding<T>(_ value: T, json: String, userInfo: [CodingUserInfoKey: Any] = [:], file: StaticString = #filePath, line: UInt = #line, body: (T) -> Void) where T: Codable {
   let encoder = JSONEncoder()
   encoder.outputFormatting.insert(.prettyPrinted)
   if #available(macOS 10.13, *) {
diff --git a/Tests/LSPLoggingTests/SupportTests.swift b/Tests/LSPLoggingTests/SupportTests.swift
@@ -25,8 +25,8 @@ final class SupportTests: XCTestCase {
 
     func check(expected: [(String, LogLevel)], file: StaticString = #file, line: UInt = #line) {
       testLogger.flush()
-      XCTAssert(messages.count == expected.count, "\(messages) does not match expected \(expected)", file: file, line: line)
-      XCTAssert(zip(messages, expected).allSatisfy({ $0.0 == $0.1 }), "\(messages) does not match expected \(expected)", file: file, line: line)
+        XCTAssert(messages.count == expected.count, "\(messages) does not match expected \(expected)", file: (file), line: line)
+        XCTAssert(zip(messages, expected).allSatisfy({ $0.0 == $0.1 }), "\(messages) does not match expected \(expected)", file: (file), line: line)
       messages.removeAll()
     }
 
diff --git a/Tests/LanguageServerProtocolJSONRPCTests/CodingTests.swift b/Tests/LanguageServerProtocolJSONRPCTests/CodingTests.swift
@@ -209,8 +209,8 @@ final class CodingTests: XCTestCase {
 
 let defaultCodingInfo: [CodingUserInfoKey: Any] = [CodingUserInfoKey.messageRegistryKey:MessageRegistry.lspProtocol]
 
-private func checkMessageCoding<Request>(_ value: Request, id: RequestID, json: String, file: StaticString = #file, line: UInt = #line) where Request: RequestType & Equatable {
-  checkCoding(JSONRPCMessage.request(value, id: id), json: json, userInfo: defaultCodingInfo, file: file, line: line) {
+private func checkMessageCoding<Request>(_ value: Request, id: RequestID, json: String, file: StaticString = #filePath, line: UInt = #line) where Request: RequestType & Equatable {
+    checkCoding(JSONRPCMessage.request(value, id: id), json: json, userInfo: defaultCodingInfo, file: (file), line: line) {
 
     guard case JSONRPCMessage.request(let decodedValueOpaque, let decodedID) = $0, let decodedValue = decodedValueOpaque as? Request else {
       XCTFail("decodedValue \($0) does not match expected \(value)", file: file, line: line)
@@ -222,8 +222,8 @@ private func checkMessageCoding<Request>(_ value: Request, id: RequestID, json:
   }
 }
 
-private func checkMessageCoding<Notification>(_ value: Notification, json: String, file: StaticString = #file, line: UInt = #line) where Notification: NotificationType & Equatable {
-  checkCoding(JSONRPCMessage.notification(value), json: json, userInfo: defaultCodingInfo, file: file, line: line) {
+private func checkMessageCoding<Notification>(_ value: Notification, json: String, file: StaticString = #filePath, line: UInt = #line) where Notification: NotificationType & Equatable {
+    checkCoding(JSONRPCMessage.notification(value), json: json, userInfo: defaultCodingInfo, file: (file), line: line) {
 
     guard case JSONRPCMessage.notification(let decodedValueOpaque) = $0, let decodedValue = decodedValueOpaque as? Notification else {
       XCTFail("decodedValue \($0) does not match expected \(value)", file: file, line: line)
@@ -234,7 +234,7 @@ private func checkMessageCoding<Notification>(_ value: Notification, json: Strin
   }
 }
 
-private func checkMessageCoding<Response>(_ value: Response, id: RequestID, json: String, file: StaticString = #file, line: UInt = #line) where Response: ResponseType & Equatable {
+private func checkMessageCoding<Response>(_ value: Response, id: RequestID, json: String, file: StaticString = #filePath, line: UInt = #line) where Response: ResponseType & Equatable {
 
   let callback: JSONRPCMessage.ResponseTypeCallback = {
     return $0 == .string("unknown") ? nil : Response.self
@@ -243,7 +243,7 @@ private func checkMessageCoding<Response>(_ value: Response, id: RequestID, json
   var codingInfo = defaultCodingInfo
   codingInfo[.responseTypeCallbackKey] = callback
 
-  checkCoding(JSONRPCMessage.response(value, id: id), json: json, userInfo: codingInfo, file: file, line: line) {
+    checkCoding(JSONRPCMessage.response(value, id: id), json: json, userInfo: codingInfo, file: (file), line: line) {
 
     guard case JSONRPCMessage.response(let decodedValueOpaque, let decodedID) = $0, let decodedValue = decodedValueOpaque as? Response else {
       XCTFail("decodedValue \($0) does not match expected \(value)", file: file, line: line)
@@ -255,8 +255,8 @@ private func checkMessageCoding<Response>(_ value: Response, id: RequestID, json
   }
 }
 
-private func checkMessageCoding(_ value: ResponseError, id: RequestID, json: String, file: StaticString = #file, line: UInt = #line) {
-  checkCoding(JSONRPCMessage.errorResponse(value, id: id), json: json, userInfo: defaultCodingInfo, file: file, line: line) {
+private func checkMessageCoding(_ value: ResponseError, id: RequestID, json: String, file: StaticString = #filePath, line: UInt = #line) {
+    checkCoding(JSONRPCMessage.errorResponse(value, id: id), json: json, userInfo: defaultCodingInfo, file: (file), line: line) {
 
     guard case JSONRPCMessage.errorResponse(let decodedValue, let decodedID) = $0 else {
       XCTFail("decodedValue \($0) does not match expected \(value)", file: file, line: line)
@@ -268,7 +268,7 @@ private func checkMessageCoding(_ value: ResponseError, id: RequestID, json: Str
   }
 }
 
-private func checkMessageDecodingError(_ expected: MessageDecodingError, json: String, userInfo: [CodingUserInfoKey: Any] = defaultCodingInfo, file: StaticString = #file, line: UInt = #line) {
+private func checkMessageDecodingError(_ expected: MessageDecodingError, json: String, userInfo: [CodingUserInfoKey: Any] = defaultCodingInfo, file: StaticString = #filePath, line: UInt = #line) {
   let data = json.data(using: .utf8)!
   let decoder = JSONDecoder()
   decoder.userInfo = userInfo
diff --git a/Tests/LanguageServerProtocolJSONRPCTests/MessageParsingTests.swift b/Tests/LanguageServerProtocolJSONRPCTests/MessageParsingTests.swift
@@ -17,7 +17,7 @@ import XCTest
 final class MessageParsingTests: XCTestCase {
 
   func testSplitMessage() {
-    func check(_ string: String, contentLen: Int? = nil, restLen: Int?, file: StaticString = #file, line: UInt = #line) {
+    func check(_ string: String, contentLen: Int? = nil, restLen: Int?, file: StaticString = #filePath, line: UInt = #line) {
       let bytes: [UInt8] = [UInt8](string.utf8)
       guard let ((content, header), rest) = try! bytes.jsonrpcSplitMessage() else {
         XCTAssert(restLen == nil, "expected non-empty field", file: file, line: line)
@@ -28,7 +28,7 @@ final class MessageParsingTests: XCTestCase {
       XCTAssertEqual(header.contentLength, contentLen, file: file, line: line)
     }
 
-    func checkError(_ string: String, _ expected: MessageDecodingError, file: StaticString = #file, line: UInt = #line) {
+    func checkError(_ string: String, _ expected: MessageDecodingError, file: StaticString = #filePath, line: UInt = #line) {
       do {
         _ = try [UInt8](string.utf8).jsonrpcSplitMessage()
         XCTFail("missing expected error", file: file, line: line)
@@ -53,7 +53,7 @@ final class MessageParsingTests: XCTestCase {
   }
 
   func testParseHeader() {
-    func check(_ string: String, header expected: JSONRPCMessageHeader? = nil, restLen: Int?, file: StaticString = #file, line: UInt = #line) {
+    func check(_ string: String, header expected: JSONRPCMessageHeader? = nil, restLen: Int?, file: StaticString = #filePath, line: UInt = #line) {
       let bytes: [UInt8] = [UInt8](string.utf8)
       guard let (header, rest) = try! bytes.jsonrcpParseHeader() else {
         XCTAssert(restLen == nil, "expected non-empty field", file: file, line: line)
@@ -63,7 +63,7 @@ final class MessageParsingTests: XCTestCase {
       XCTAssertEqual(header, expected, file: file, line: line)
     }
 
-    func checkErrorBytes(_ bytes: [UInt8], _ expected: MessageDecodingError, file: StaticString = #file, line: UInt = #line) {
+    func checkErrorBytes(_ bytes: [UInt8], _ expected: MessageDecodingError, file: StaticString = #filePath, line: UInt = #line) {
       do {
         _ = try bytes.jsonrcpParseHeader()
         XCTFail("missing expected error", file: file, line: line)
@@ -74,7 +74,7 @@ final class MessageParsingTests: XCTestCase {
       }
     }
 
-    func checkError(_ string: String, _ expected: MessageDecodingError, file: StaticString = #file, line: UInt = #line) {
+    func checkError(_ string: String, _ expected: MessageDecodingError, file: StaticString = #filePath, line: UInt = #line) {
       checkErrorBytes([UInt8](string.utf8), expected, file: file, line: line)
     }
 
@@ -95,7 +95,7 @@ final class MessageParsingTests: XCTestCase {
   }
 
   func testParseHeaderField() {
-    func check(_ string: String, keyLen: Int? = nil, valueLen: Int? = nil, restLen: Int?, file: StaticString = #file, line: UInt = #line) {
+    func check(_ string: String, keyLen: Int? = nil, valueLen: Int? = nil, restLen: Int?, file: StaticString = #filePath, line: UInt = #line) {
       let bytes: [UInt8] = [UInt8](string.utf8)
       guard let (kv, rest) = try! bytes.jsonrpcParseHeaderField() else {
         XCTAssert(restLen == nil, "expected non-empty field", file: file, line: line)
@@ -112,7 +112,7 @@ final class MessageParsingTests: XCTestCase {
       }
     }
 
-    func checkError(_ string: String, _ expected: MessageDecodingError, file: StaticString = #file, line: UInt = #line) {
+    func checkError(_ string: String, _ expected: MessageDecodingError, file: StaticString = #filePath, line: UInt = #line) {
       do {
         _ = try [UInt8](string.utf8).jsonrpcParseHeaderField()
         XCTFail("missing expected error", file: file, line: line)
diff --git a/Tests/SKCoreTests/CompilationDatabaseTests.swift b/Tests/SKCoreTests/CompilationDatabaseTests.swift
@@ -18,7 +18,7 @@ import XCTest
 
 final class CompilationDatabaseTests: XCTestCase {
   func testSplitShellEscapedCommand() {
-    func check(_ str: String, _ expected: [String], file: StaticString=#file, line: UInt=#line) {
+    func check(_ str: String, _ expected: [String], file: StaticString=#filePath, line: UInt=#line) {
       XCTAssertEqual(splitShellEscapedCommand(str), expected, file: file, line: line)
     }
 
@@ -61,7 +61,7 @@ final class CompilationDatabaseTests: XCTestCase {
   func testEncodeCompDBCommand() {
     // Requires JSONEncoder.OutputFormatting.sortedKeys
     if #available(macOS 10.13, *) {
-      func check(_ cmd: CompilationDatabase.Command, _ expected: String, file: StaticString = #file, line: UInt = #line) {
+        func check(_ cmd: CompilationDatabase.Command, _ expected: String, file: StaticString = #filePath, line: UInt = #line) {
         let encoder = JSONEncoder()
         encoder.outputFormatting.insert(.sortedKeys)
         let encodedString = try! String(data: encoder.encode(cmd), encoding: .utf8)
@@ -78,7 +78,7 @@ final class CompilationDatabaseTests: XCTestCase {
   }
 
   func testDecodeCompDBCommand() {
-    func check(_ str: String, _ expected: CompilationDatabase.Command, file: StaticString = #file, line: UInt = #line) {
+    func check(_ str: String, _ expected: CompilationDatabase.Command, file: StaticString = #filePath, line: UInt = #line) {
       let cmd = try! JSONDecoder().decode(CompilationDatabase.Command.self, from: str.data(using: .utf8)!)
       XCTAssertEqual(cmd, expected, file: file, line: line)
     }
@@ -305,7 +305,7 @@ final class CompilationDatabaseTests: XCTestCase {
   }
 }
 
-private func checkCompilationDatabaseBuildSystem(_ compdb: ByteString, file: StaticString = #file, line: UInt = #line, block: (CompilationDatabaseBuildSystem) -> ()) {
+private func checkCompilationDatabaseBuildSystem(_ compdb: ByteString, file: StaticString = #filePath, line: UInt = #line, block: (CompilationDatabaseBuildSystem) -> ()) {
   let fs = InMemoryFileSystem()
   XCTAssertNoThrow(try fs.createDirectory(AbsolutePath("/a")), file: file, line: line)
   XCTAssertNoThrow(try fs.writeFileContents(AbsolutePath("/a/compile_commands.json"), bytes: compdb), file: file, line: line)
diff --git a/Tests/SKSupportTests/SupportTests.swift b/Tests/SKSupportTests/SupportTests.swift
@@ -16,12 +16,12 @@ import XCTest
 
 final class SupportTests: XCTestCase {
 
-  func checkLines(_ string: String, _ expected: [String], file: StaticString = #file, line: UInt = #line) {
+    func checkLines(_ string: String, _ expected: [String], file: StaticString = #filePath, line: UInt = #line) {
     let table = LineTable(string)
     XCTAssertEqual(table.map { String($0) }, expected, file: file, line: line)
   }
 
-  func checkOffsets(_ string: String, _ expected: [Int], file: StaticString = #file, line: UInt = #line) {
+    func checkOffsets(_ string: String, _ expected: [Int], file: StaticString = #filePath, line: UInt = #line) {
     let table = LineTable(string)
     XCTAssertEqual(table.map { string.utf8.distance(from: string.startIndex, to: $0.startIndex) }, expected, file: file, line: line)
   }
@@ -68,7 +68,7 @@ final class SupportTests: XCTestCase {
     XCTAssertEqual(LineTable("\n")[1], "")
   }
 
-  func checkLineAndColumns(_ table: LineTable, _ utf8Offset: Int, _ expected: (line: Int, utf16Column: Int)?, file: StaticString = #file, line: UInt = #line) {
+    func checkLineAndColumns(_ table: LineTable, _ utf8Offset: Int, _ expected: (line: Int, utf16Column: Int)?, file: StaticString = #filePath, line: UInt = #line) {
     switch (table.lineAndUTF16ColumnOf(utf8Offset: utf8Offset), expected) {
     case (nil, nil):
       break
@@ -79,11 +79,11 @@ final class SupportTests: XCTestCase {
     }
   }
 
-  func checkUTF8OffsetOf(_ table: LineTable, _ query: (line: Int, utf16Column: Int), _ expected: Int?, file: StaticString = #file, line: UInt = #line) {
+    func checkUTF8OffsetOf(_ table: LineTable, _ query: (line: Int, utf16Column: Int), _ expected: Int?, file: StaticString = #filePath, line: UInt = #line) {
     XCTAssertEqual(table.utf8OffsetOf(line: query.line, utf16Column: query.utf16Column), expected, file: file, line: line)
   }
 
-  func checkUTF16ColumnAt(_ table: LineTable, _ query: (line: Int, utf8Column: Int), _ expected: Int?, file: StaticString = #file, line: UInt = #line) {
+    func checkUTF16ColumnAt(_ table: LineTable, _ query: (line: Int, utf8Column: Int), _ expected: Int?, file: StaticString = #filePath, line: UInt = #line) {
     XCTAssertEqual(table.utf16ColumnAt(line: query.line, utf8Column: query.utf8Column), expected, file: file, line: line)
   }
 
diff --git a/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift b/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift
@@ -512,7 +512,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
 private func checkNot(
   _ pattern: String...,
   arguments: [String],
-  file: StaticString = #file,
+    file: StaticString = #filePath,
   line: UInt = #line)
 {
   if let index = arguments.firstIndex(of: pattern) {
@@ -526,7 +526,7 @@ private func checkNot(
 private func check(
   _ pattern: String...,
   arguments: [String],
-  file: StaticString = #file,
+    file: StaticString = #filePath,
   line: UInt = #line)
 {
   guard let index = arguments.firstIndex(of: pattern) else {

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ final class SupportTests: XCTestCase {`
`25`	`25`
`26`	`26`	`func check(expected: [(String, LogLevel)], file: StaticString = #file, line: UInt = #line) {`
`27`	`27`	`testLogger.flush()`
`28`		`- XCTAssert(messages.count == expected.count, "\(messages) does not match expected \(expected)", file: file, line: line)`
`29`		`- XCTAssert(zip(messages, expected).allSatisfy({ $0.0 == $0.1 }), "\(messages) does not match expected \(expected)", file: file, line: line)`
	`28`	`+ XCTAssert(messages.count == expected.count, "\(messages) does not match expected \(expected)", file: (file), line: line)`
	`29`	`+ XCTAssert(zip(messages, expected).allSatisfy({ $0.0 == $0.1 }), "\(messages) does not match expected \(expected)", file: (file), line: line)`
`30`	`30`	`messages.removeAll()`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -209,8 +209,8 @@ final class CodingTests: XCTestCase {`
`209`	`209`
`210`	`210`	`let defaultCodingInfo: [CodingUserInfoKey: Any] = [CodingUserInfoKey.messageRegistryKey:MessageRegistry.lspProtocol]`
`211`	`211`
`212`		`-private func checkMessageCoding<Request>(_ value: Request, id: RequestID, json: String, file: StaticString = #file, line: UInt = #line) where Request: RequestType & Equatable {`
`213`		`- checkCoding(JSONRPCMessage.request(value, id: id), json: json, userInfo: defaultCodingInfo, file: file, line: line) {`
	`212`	`+private func checkMessageCoding<Request>(_ value: Request, id: RequestID, json: String, file: StaticString = #filePath, line: UInt = #line) where Request: RequestType & Equatable {`
	`213`	`+ checkCoding(JSONRPCMessage.request(value, id: id), json: json, userInfo: defaultCodingInfo, file: (file), line: line) {`
`214`	`214`
`215`	`215`	`guard case JSONRPCMessage.request(let decodedValueOpaque, let decodedID) = $0, let decodedValue = decodedValueOpaque as? Request else {`
`216`	`216`	`XCTFail("decodedValue \($0) does not match expected \(value)", file: file, line: line)`
`@@ -222,8 +222,8 @@ private func checkMessageCoding<Request>(_ value: Request, id: RequestID, json:`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`
`225`		`-private func checkMessageCoding<Notification>(_ value: Notification, json: String, file: StaticString = #file, line: UInt = #line) where Notification: NotificationType & Equatable {`
`226`		`- checkCoding(JSONRPCMessage.notification(value), json: json, userInfo: defaultCodingInfo, file: file, line: line) {`
	`225`	`+private func checkMessageCoding<Notification>(_ value: Notification, json: String, file: StaticString = #filePath, line: UInt = #line) where Notification: NotificationType & Equatable {`
	`226`	`+ checkCoding(JSONRPCMessage.notification(value), json: json, userInfo: defaultCodingInfo, file: (file), line: line) {`
`227`	`227`
`228`	`228`	`guard case JSONRPCMessage.notification(let decodedValueOpaque) = $0, let decodedValue = decodedValueOpaque as? Notification else {`
`229`	`229`	`XCTFail("decodedValue \($0) does not match expected \(value)", file: file, line: line)`
`@@ -234,7 +234,7 @@ private func checkMessageCoding<Notification>(_ value: Notification, json: Strin`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`
`237`		`-private func checkMessageCoding<Response>(_ value: Response, id: RequestID, json: String, file: StaticString = #file, line: UInt = #line) where Response: ResponseType & Equatable {`
	`237`	`+private func checkMessageCoding<Response>(_ value: Response, id: RequestID, json: String, file: StaticString = #filePath, line: UInt = #line) where Response: ResponseType & Equatable {`
`238`	`238`
`239`	`239`	`let callback: JSONRPCMessage.ResponseTypeCallback = {`
`240`	`240`	`return $0 == .string("unknown") ? nil : Response.self`
`@@ -243,7 +243,7 @@ private func checkMessageCoding<Response>(_ value: Response, id: RequestID, json`
`243`	`243`	`var codingInfo = defaultCodingInfo`
`244`	`244`	`codingInfo[.responseTypeCallbackKey] = callback`
`245`	`245`
`246`		`- checkCoding(JSONRPCMessage.response(value, id: id), json: json, userInfo: codingInfo, file: file, line: line) {`
	`246`	`+ checkCoding(JSONRPCMessage.response(value, id: id), json: json, userInfo: codingInfo, file: (file), line: line) {`
`247`	`247`
`248`	`248`	`guard case JSONRPCMessage.response(let decodedValueOpaque, let decodedID) = $0, let decodedValue = decodedValueOpaque as? Response else {`
`249`	`249`	`XCTFail("decodedValue \($0) does not match expected \(value)", file: file, line: line)`
`@@ -255,8 +255,8 @@ private func checkMessageCoding<Response>(_ value: Response, id: RequestID, json`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`
`258`		`-private func checkMessageCoding(_ value: ResponseError, id: RequestID, json: String, file: StaticString = #file, line: UInt = #line) {`
`259`		`- checkCoding(JSONRPCMessage.errorResponse(value, id: id), json: json, userInfo: defaultCodingInfo, file: file, line: line) {`
	`258`	`+private func checkMessageCoding(_ value: ResponseError, id: RequestID, json: String, file: StaticString = #filePath, line: UInt = #line) {`
	`259`	`+ checkCoding(JSONRPCMessage.errorResponse(value, id: id), json: json, userInfo: defaultCodingInfo, file: (file), line: line) {`
`260`	`260`
`261`	`261`	`guard case JSONRPCMessage.errorResponse(let decodedValue, let decodedID) = $0 else {`
`262`	`262`	`XCTFail("decodedValue \($0) does not match expected \(value)", file: file, line: line)`
`@@ -268,7 +268,7 @@ private func checkMessageCoding(_ value: ResponseError, id: RequestID, json: Str`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`
`271`		`-private func checkMessageDecodingError(_ expected: MessageDecodingError, json: String, userInfo: [CodingUserInfoKey: Any] = defaultCodingInfo, file: StaticString = #file, line: UInt = #line) {`
	`271`	`+private func checkMessageDecodingError(_ expected: MessageDecodingError, json: String, userInfo: [CodingUserInfoKey: Any] = defaultCodingInfo, file: StaticString = #filePath, line: UInt = #line) {`
`272`	`272`	`let data = json.data(using: .utf8)!`
`273`	`273`	`let decoder = JSONDecoder()`
`274`	`274`	`decoder.userInfo = userInfo`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import XCTest`
`17`	`17`	`final class MessageParsingTests: XCTestCase {`
`18`	`18`
`19`	`19`	`func testSplitMessage() {`
`20`		`- func check(_ string: String, contentLen: Int? = nil, restLen: Int?, file: StaticString = #file, line: UInt = #line) {`
	`20`	`+ func check(_ string: String, contentLen: Int? = nil, restLen: Int?, file: StaticString = #filePath, line: UInt = #line) {`
`21`	`21`	`let bytes: [UInt8] = [UInt8](string.utf8)`
`22`	`22`	`guard let ((content, header), rest) = try! bytes.jsonrpcSplitMessage() else {`
`23`	`23`	`XCTAssert(restLen == nil, "expected non-empty field", file: file, line: line)`
`@@ -28,7 +28,7 @@ final class MessageParsingTests: XCTestCase {`
`28`	`28`	`XCTAssertEqual(header.contentLength, contentLen, file: file, line: line)`
`29`	`29`	`}`
`30`	`30`
`31`		`- func checkError(_ string: String, _ expected: MessageDecodingError, file: StaticString = #file, line: UInt = #line) {`
	`31`	`+ func checkError(_ string: String, _ expected: MessageDecodingError, file: StaticString = #filePath, line: UInt = #line) {`
`32`	`32`	`do {`
`33`	`33`	`_ = try [UInt8](string.utf8).jsonrpcSplitMessage()`
`34`	`34`	`XCTFail("missing expected error", file: file, line: line)`
`@@ -53,7 +53,7 @@ final class MessageParsingTests: XCTestCase {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`func testParseHeader() {`
`56`		`- func check(_ string: String, header expected: JSONRPCMessageHeader? = nil, restLen: Int?, file: StaticString = #file, line: UInt = #line) {`
	`56`	`+ func check(_ string: String, header expected: JSONRPCMessageHeader? = nil, restLen: Int?, file: StaticString = #filePath, line: UInt = #line) {`
`57`	`57`	`let bytes: [UInt8] = [UInt8](string.utf8)`
`58`	`58`	`guard let (header, rest) = try! bytes.jsonrcpParseHeader() else {`
`59`	`59`	`XCTAssert(restLen == nil, "expected non-empty field", file: file, line: line)`
`@@ -63,7 +63,7 @@ final class MessageParsingTests: XCTestCase {`
`63`	`63`	`XCTAssertEqual(header, expected, file: file, line: line)`
`64`	`64`	`}`
`65`	`65`
`66`		`- func checkErrorBytes(_ bytes: [UInt8], _ expected: MessageDecodingError, file: StaticString = #file, line: UInt = #line) {`
	`66`	`+ func checkErrorBytes(_ bytes: [UInt8], _ expected: MessageDecodingError, file: StaticString = #filePath, line: UInt = #line) {`
`67`	`67`	`do {`
`68`	`68`	`_ = try bytes.jsonrcpParseHeader()`
`69`	`69`	`XCTFail("missing expected error", file: file, line: line)`
`@@ -74,7 +74,7 @@ final class MessageParsingTests: XCTestCase {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- func checkError(_ string: String, _ expected: MessageDecodingError, file: StaticString = #file, line: UInt = #line) {`
	`77`	`+ func checkError(_ string: String, _ expected: MessageDecodingError, file: StaticString = #filePath, line: UInt = #line) {`
`78`	`78`	`checkErrorBytes([UInt8](string.utf8), expected, file: file, line: line)`
`79`	`79`	`}`
`80`	`80`
`@@ -95,7 +95,7 @@ final class MessageParsingTests: XCTestCase {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`func testParseHeaderField() {`
`98`		`- func check(_ string: String, keyLen: Int? = nil, valueLen: Int? = nil, restLen: Int?, file: StaticString = #file, line: UInt = #line) {`
	`98`	`+ func check(_ string: String, keyLen: Int? = nil, valueLen: Int? = nil, restLen: Int?, file: StaticString = #filePath, line: UInt = #line) {`
`99`	`99`	`let bytes: [UInt8] = [UInt8](string.utf8)`
`100`	`100`	`guard let (kv, rest) = try! bytes.jsonrpcParseHeaderField() else {`
`101`	`101`	`XCTAssert(restLen == nil, "expected non-empty field", file: file, line: line)`
`@@ -112,7 +112,7 @@ final class MessageParsingTests: XCTestCase {`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`		`- func checkError(_ string: String, _ expected: MessageDecodingError, file: StaticString = #file, line: UInt = #line) {`
	`115`	`+ func checkError(_ string: String, _ expected: MessageDecodingError, file: StaticString = #filePath, line: UInt = #line) {`
`116`	`116`	`do {`
`117`	`117`	`_ = try [UInt8](string.utf8).jsonrpcParseHeaderField()`
`118`	`118`	`XCTFail("missing expected error", file: file, line: line)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import XCTest`
`18`	`18`
`19`	`19`	`final class CompilationDatabaseTests: XCTestCase {`
`20`	`20`	`func testSplitShellEscapedCommand() {`
`21`		`- func check(_ str: String, _ expected: [String], file: StaticString=#file, line: UInt=#line) {`
	`21`	`+ func check(_ str: String, _ expected: [String], file: StaticString=#filePath, line: UInt=#line) {`
`22`	`22`	`XCTAssertEqual(splitShellEscapedCommand(str), expected, file: file, line: line)`
`23`	`23`	`}`
`24`	`24`
`@@ -61,7 +61,7 @@ final class CompilationDatabaseTests: XCTestCase {`
`61`	`61`	`func testEncodeCompDBCommand() {`
`62`	`62`	`// Requires JSONEncoder.OutputFormatting.sortedKeys`
`63`	`63`	`if #available(macOS 10.13, *) {`
`64`		`- func check(_ cmd: CompilationDatabase.Command, _ expected: String, file: StaticString = #file, line: UInt = #line) {`
	`64`	`+ func check(_ cmd: CompilationDatabase.Command, _ expected: String, file: StaticString = #filePath, line: UInt = #line) {`
`65`	`65`	`let encoder = JSONEncoder()`
`66`	`66`	`encoder.outputFormatting.insert(.sortedKeys)`
`67`	`67`	`let encodedString = try! String(data: encoder.encode(cmd), encoding: .utf8)`
`@@ -78,7 +78,7 @@ final class CompilationDatabaseTests: XCTestCase {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`func testDecodeCompDBCommand() {`
`81`		`- func check(_ str: String, _ expected: CompilationDatabase.Command, file: StaticString = #file, line: UInt = #line) {`
	`81`	`+ func check(_ str: String, _ expected: CompilationDatabase.Command, file: StaticString = #filePath, line: UInt = #line) {`
`82`	`82`	`let cmd = try! JSONDecoder().decode(CompilationDatabase.Command.self, from: str.data(using: .utf8)!)`
`83`	`83`	`XCTAssertEqual(cmd, expected, file: file, line: line)`
`84`	`84`	`}`
`@@ -305,7 +305,7 @@ final class CompilationDatabaseTests: XCTestCase {`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`
`308`		`-private func checkCompilationDatabaseBuildSystem(_ compdb: ByteString, file: StaticString = #file, line: UInt = #line, block: (CompilationDatabaseBuildSystem) -> ()) {`
	`308`	`+private func checkCompilationDatabaseBuildSystem(_ compdb: ByteString, file: StaticString = #filePath, line: UInt = #line, block: (CompilationDatabaseBuildSystem) -> ()) {`
`309`	`309`	`let fs = InMemoryFileSystem()`
`310`	`310`	`XCTAssertNoThrow(try fs.createDirectory(AbsolutePath("/a")), file: file, line: line)`
`311`	`311`	`XCTAssertNoThrow(try fs.writeFileContents(AbsolutePath("/a/compile_commands.json"), bytes: compdb), file: file, line: line)`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ import XCTest`
`16`	`16`
`17`	`17`	`final class SupportTests: XCTestCase {`
`18`	`18`
`19`		`- func checkLines(_ string: String, _ expected: [String], file: StaticString = #file, line: UInt = #line) {`
	`19`	`+ func checkLines(_ string: String, _ expected: [String], file: StaticString = #filePath, line: UInt = #line) {`
`20`	`20`	`let table = LineTable(string)`
`21`	`21`	`XCTAssertEqual(table.map { String($0) }, expected, file: file, line: line)`
`22`	`22`	`}`
`23`	`23`
`24`		`- func checkOffsets(_ string: String, _ expected: [Int], file: StaticString = #file, line: UInt = #line) {`
	`24`	`+ func checkOffsets(_ string: String, _ expected: [Int], file: StaticString = #filePath, line: UInt = #line) {`
`25`	`25`	`let table = LineTable(string)`
`26`	`26`	`XCTAssertEqual(table.map { string.utf8.distance(from: string.startIndex, to: $0.startIndex) }, expected, file: file, line: line)`
`27`	`27`	`}`
`@@ -68,7 +68,7 @@ final class SupportTests: XCTestCase {`
`68`	`68`	`XCTAssertEqual(LineTable("\n")[1], "")`
`69`	`69`	`}`
`70`	`70`
`71`		`- func checkLineAndColumns(_ table: LineTable, _ utf8Offset: Int, _ expected: (line: Int, utf16Column: Int)?, file: StaticString = #file, line: UInt = #line) {`
	`71`	`+ func checkLineAndColumns(_ table: LineTable, _ utf8Offset: Int, _ expected: (line: Int, utf16Column: Int)?, file: StaticString = #filePath, line: UInt = #line) {`
`72`	`72`	`switch (table.lineAndUTF16ColumnOf(utf8Offset: utf8Offset), expected) {`
`73`	`73`	`case (nil, nil):`
`74`	`74`	`break`
`@@ -79,11 +79,11 @@ final class SupportTests: XCTestCase {`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`- func checkUTF8OffsetOf(_ table: LineTable, _ query: (line: Int, utf16Column: Int), _ expected: Int?, file: StaticString = #file, line: UInt = #line) {`
	`82`	`+ func checkUTF8OffsetOf(_ table: LineTable, _ query: (line: Int, utf16Column: Int), _ expected: Int?, file: StaticString = #filePath, line: UInt = #line) {`
`83`	`83`	`XCTAssertEqual(table.utf8OffsetOf(line: query.line, utf16Column: query.utf16Column), expected, file: file, line: line)`
`84`	`84`	`}`
`85`	`85`
`86`		`- func checkUTF16ColumnAt(_ table: LineTable, _ query: (line: Int, utf8Column: Int), _ expected: Int?, file: StaticString = #file, line: UInt = #line) {`
	`86`	`+ func checkUTF16ColumnAt(_ table: LineTable, _ query: (line: Int, utf8Column: Int), _ expected: Int?, file: StaticString = #filePath, line: UInt = #line) {`
`87`	`87`	`XCTAssertEqual(table.utf16ColumnAt(line: query.line, utf8Column: query.utf8Column), expected, file: file, line: line)`
`88`	`88`	`}`
`89`	`89`