DarwinCompatibility: Update tests to compile against native Foundation

Author: spevans

DarwinCompatibilityTests.xcodeproj/project.pbxproj

@@ -190,6 +190,7 @@
 		B98E33DF2136AC120044EBE9 /* TestFileWithZeros.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = TestFileWithZeros.txt; path = TestFoundation/Resources/TestFileWithZeros.txt; sourceTree = "<group>"; };
 		B99EAE6E23602FFA00C8FB46 /* TestsToSkip.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestsToSkip.txt; sourceTree = "<group>"; };
 		B99EAE6F23602FFA00C8FB46 /* xcode-build.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "xcode-build.sh"; sourceTree = "<group>"; };
+		B99EAE742360577C00C8FB46 /* TestCodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = TestCodable.swift; path = TestFoundation/TestCodable.swift; sourceTree = "<group>"; };
 		B9C1C63322607372002BBEA0 /* FixtureValues.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = FixtureValues.swift; path = TestFoundation/FixtureValues.swift; sourceTree = "<group>"; };
 		B9C89ED11F6BF67C00087AF4 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		B9C89ED71F6BF77E00087AF4 /* DarwinCompatibilityTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DarwinCompatibilityTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -326,6 +327,7 @@
 		B9C89EB81F6BF47D00087AF4 = {
 			isa = PBXGroup;
 			children = (
+				B99EAE742360577C00C8FB46 /* TestCodable.swift */,
 				B906C30322AC6E2A00FCFA2D /* FTPServer.swift */,
 				B906C2FF22AC6CE600FCFA2D /* TestNSSortDescriptor.swift */,
 				B906C30022AC6CE600FCFA2D /* TestURLSessionFTP.swift */,
@@ -610,6 +612,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B9C89F411F6BF89C00087AF4 /* TestCodable.swift in Sources */,
 				B906C30422AC6E2A00FCFA2D /* FTPServer.swift in Sources */,
 				B906C30122AC6CE700FCFA2D /* TestNSSortDescriptor.swift in Sources */,
 				B906C30222AC6CE700FCFA2D /* TestURLSessionFTP.swift in Sources */,
@@ -642,7 +645,6 @@
 				B9C89F3E1F6BF89C00087AF4 /* TestISO8601DateFormatter.swift in Sources */,
 				B9C89F3F1F6BF89C00087AF4 /* TestNSTextCheckingResult.swift in Sources */,
 				B9C89F401F6BF89C00087AF4 /* TestCharacterSet.swift in Sources */,
-				B9C89F411F6BF89C00087AF4 /* TestCodable.swift in Sources */,
 				B9C89F421F6BF89C00087AF4 /* TestIndexPath.swift in Sources */,
 				B9C89F431F6BF89C00087AF4 /* TestMassFormatter.swift in Sources */,
 				B9C89F441F6BF89C00087AF4 /* TestNSSet.swift in Sources */,

TestFoundation/TestNSString.swift

@@ -1266,12 +1266,10 @@ class TestNSString: LoopbackServerTest {
         let firstLine = string[rangeOfFirstLine]
         XCTAssertEqual(firstLine, "LINE1_67あ\n")
     }
-}
 
-func test_reflection() {
-}
+    func test_reflection() {
+    }
 
-extension TestNSString {
     func test_replacingOccurrences() {
         let testPrefix = "ab"
         let testSuffix = "cd"
@@ -1342,6 +1340,8 @@ extension TestNSString {
     }
 
     func test_replacingOccurrencesInSubclass() {
+        // NSMutableString doesnt subclasss correctly
+#if !DARWIN_COMPATIBILITY_TESTS
         class TestMutableString: NSMutableString {
             private var wrapped: NSMutableString
             var replaceCharactersCount: Int = 0
@@ -1396,6 +1396,7 @@ extension TestNSString {
         let testString = TestMutableString(stringLiteral: "ababab")
         XCTAssertEqual(testString.replacingOccurrences(of: "ab", with: "xx"), "xxxxxx")
         XCTAssertEqual(testString.replaceCharactersCount, 3)
+#endif
     }
 
 
@@ -1556,7 +1557,7 @@ extension TestNSString {
             ("test_ExternalRepresentation", test_ExternalRepresentation),
             ("test_mutableStringConstructor", test_mutableStringConstructor),
             ("test_emptyStringPrefixAndSuffix",test_emptyStringPrefixAndSuffix),
-            ("test_reflection", { _ in test_reflection }),
+            ("test_reflection", test_reflection),
             ("test_replacingOccurrences", test_replacingOccurrences),
             ("test_getLineStart", test_getLineStart),
             ("test_substringWithRange", test_substringWithRange),

TestFoundation/TestProcess.swift

@@ -84,7 +84,11 @@ class TestProcess : XCTestCase {
         try process.run()
         let msg = try XCTUnwrap("Hello, 🐶.\n".data(using: .utf8))
         do {
+#if DARWIN_COMPATIBILITY_TESTS
+            inputPipe.fileHandleForWriting.write(msg)
+#else
             try inputPipe.fileHandleForWriting.write(contentsOf: msg)
+#endif
         } catch {
             XCTFail("Cant write to pipe: \(error)")
             return

TestFoundation/TestRunLoop.swift

@@ -134,7 +134,12 @@ class TestPort: Port {
         self.sentinel = sentinel
         super.init()
     }
-    
+
+    // Required on Darwin
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
     deinit {
         invalidate()
         sentinel()

TestFoundation/Utilities.swift

@@ -560,9 +560,11 @@ func shouldAttemptAndroidXFailTests(_ reason: String) -> Bool {
     #endif
 }
 
+#if !DARWIN_COMPATIBILITY_TESTS
 func testCaseExpectedToFail<T: XCTestCase>(_ allTests: [(String, (T) -> () throws -> Void)], _ reason: String) -> XCTestCaseEntry {
     return testCase(allTests.map { ($0.0, testExpectedToFail($0.1, "This test suite is disabled: \(reason)")) })
 }
+#endif
 
 func appendTestCaseExpectedToFail<T: XCTestCase>(_ reason: String, _ allTests: [(String, (T) -> () throws -> Void)], into array: inout [XCTestCaseEntry]) {
     if shouldAttemptXFailTests(reason) {