Merge pull request #1775 from tkremenek/TestNSGeometry-swift5

Adjust code to adjust to @autoclosure change in Swift 5.

Author: tkremenek

TestFoundation/TestNSData.swift

@@ -4463,7 +4463,7 @@ extension TestNSData {
         let data = "FooBar".data(using: .ascii)!
         let slice = data[3...] // Bar
         let range = slice.range(of: "a".data(using: .ascii)!)
-        XCTAssertEqual(range, Range<Data.Index>(4..<5))
+        XCTAssertEqual(range, 4..<5)
     }
 
     func test_nskeyedarchiving() {

TestFoundation/TestNSGeometry.swift

@@ -18,15 +18,15 @@ private func assertEqual(_ rect: CGRect,
                          line: UInt = #line) {
 
     if let accuracy = accuracy {
-        XCTAssertEqual(rect.origin.x, x, accuracy: accuracy, message, file: file, line: line)
-        XCTAssertEqual(rect.origin.y, y, accuracy: accuracy, message, file: file, line: line)
-        XCTAssertEqual(rect.size.width, width, accuracy: accuracy, message, file: file, line: line)
-        XCTAssertEqual(rect.size.height, height, accuracy: accuracy, message, file: file, line: line)
+        XCTAssertEqual(rect.origin.x, x, accuracy: accuracy, message(), file: file, line: line)
+        XCTAssertEqual(rect.origin.y, y, accuracy: accuracy, message(), file: file, line: line)
+        XCTAssertEqual(rect.size.width, width, accuracy: accuracy, message(), file: file, line: line)
+        XCTAssertEqual(rect.size.height, height, accuracy: accuracy, message(), file: file, line: line)
     } else {
-        XCTAssertEqual(rect.origin.x, x, message, file: file, line: line)
-        XCTAssertEqual(rect.origin.y, y, message, file: file, line: line)
-        XCTAssertEqual(rect.size.width, width, message, file: file, line: line)
-        XCTAssertEqual(rect.size.height, height, message, file: file, line: line)
+        XCTAssertEqual(rect.origin.x, x, message(), file: file, line: line)
+        XCTAssertEqual(rect.origin.y, y, message(), file: file, line: line)
+        XCTAssertEqual(rect.size.width, width, message(), file: file, line: line)
+        XCTAssertEqual(rect.size.height, height, message(), file: file, line: line)
     }
 }