DarwinComptibilityTests: Add XCode Project

- Move testBundle() into TestBundle.swift because
  TestFoundation/main.swift is ignored in DCT unit tests.

- Use testBundle() instead of Bundle.main

- Add shims and minor test fixes

Author: spevans

DarwinCompatibilityTests.xcodeproj/project.pbxproj

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

DarwinCompatibilityTests/Info.plist

@@ -0,0 +1,80 @@
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+
+import Foundation
+
+public typealias unichar = UInt16
+
+extension unichar : ExpressibleByUnicodeScalarLiteral {
+    public typealias UnicodeScalarLiteralType = UnicodeScalar
+
+    public init(unicodeScalarLiteral scalar: UnicodeScalar) {
+        self.init(scalar.value)
+    }
+}
+
+extension NSURL {
+    func checkResourceIsReachable() throws -> Bool {
+        var error: NSError?
+        if checkResourceIsReachableAndReturnError(&error) {
+            return true
+        } else {
+            if let e = error {
+                throw e
+            }
+        }
+        return false
+    }
+}
+
+extension Thread {
+    class var mainThread: Thread {
+        return Thread.main
+    }
+}
+
+extension Scanner {
+    public func scanString(_ searchString: String) -> String? {
+        var result: NSString? = nil
+        if scanString(string, into: &result), let str = result {
+            return str as String
+        }
+        return nil
+    }
+}
+
+extension JSONSerialization {
+    class func writeJSONObject(_ obj: Any, toStream stream: OutputStream, options opt: WritingOptions) throws -> Int {
+        var error: NSError?
+        let ret = writeJSONObject(obj, to: stream, options: opt, error: &error)
+        guard ret != 0 else {
+            throw error!
+        }
+        return ret
+    }
+}
+
+extension NSIndexSet {
+    func _bridgeToSwift() -> NSIndexSet {
+        return self
+    }
+}
+
+extension CharacterSet {
+    func _bridgeToSwift() -> CharacterSet {
+        return self
+    }
+}
+
+extension NSCharacterSet {
+    func _bridgeToSwift() -> CharacterSet {
+        return self as CharacterSet
+    }
+}
+

DarwinShims.swift

@@ -8,7 +8,6 @@
 //
 
 
-
 #if DEPLOYMENT_RUNTIME_OBJC || os(Linux)
     import Foundation
     import XCTest
@@ -18,6 +17,19 @@
 #endif
 
 
+internal func testBundle() -> Bundle {
+#if DARWIN_COMPATIBILITY_TESTS
+    for bundle in Bundle.allBundles {
+        if let bundleId = bundle.bundleIdentifier, bundleId == "org.swift.DarwinCompatibilityTests", bundle.resourcePath != nil {
+            return bundle
+        }
+    }
+    fatalError("Cant find test bundle")
+#else
+    return Bundle.main
+#endif
+}
+
 
 class TestBundle : XCTestCase {
 
@@ -36,29 +48,35 @@ class TestBundle : XCTestCase {
     }
 
     func test_paths() {
-        let bundle = Bundle.main
-        
+        let bundle = testBundle()
+
         // bundlePath
         XCTAssert(!bundle.bundlePath.isEmpty)
         XCTAssertEqual(bundle.bundleURL.path, bundle.bundlePath)
         let path = bundle.bundlePath
-        
+
         // etc
         #if os(OSX)
         XCTAssertEqual("\(path)/Contents/Resources", bundle.resourcePath)
+#if DARWIN_COMPATIBILITY_TESTS
+        XCTAssertEqual("\(path)/Contents/MacOS/DarwinCompatibilityTests", bundle.executablePath)
+#else
         XCTAssertEqual("\(path)/Contents/MacOS/TestFoundation", bundle.executablePath)
+#endif
         XCTAssertEqual("\(path)/Contents/Frameworks", bundle.privateFrameworksPath)
         XCTAssertEqual("\(path)/Contents/SharedFrameworks", bundle.sharedFrameworksPath)
         XCTAssertEqual("\(path)/Contents/SharedSupport", bundle.sharedSupportPath)
         #endif
 
         XCTAssertNil(bundle.path(forAuxiliaryExecutable: "no_such_file"))
+#if !DARWIN_COMPATIBILITY_TESTS
         XCTAssertNil(bundle.appStoreReceiptURL)
+#endif
     }
 
     func test_resources() {
-        let bundle = Bundle.main
-        
+        let bundle = testBundle()
+
         // bad resources
         XCTAssertNil(bundle.url(forResource: nil, withExtension: nil, subdirectory: nil))
         XCTAssertNil(bundle.url(forResource: "", withExtension: "", subdirectory: nil))
@@ -77,24 +95,34 @@ class TestBundle : XCTestCase {
     }
 
     func test_infoPlist() {
-        let bundle = Bundle.main
+        let bundle = testBundle()
 
         // bundleIdentifier
+#if DARWIN_COMPATIBILITY_TESTS
+        XCTAssertEqual("org.swift.DarwinCompatibilityTests", bundle.bundleIdentifier)
+#else
         XCTAssertEqual("org.swift.TestFoundation", bundle.bundleIdentifier)
-        
+#endif
+
         // infoDictionary
         let info = bundle.infoDictionary
         XCTAssertNotNil(info)
-        XCTAssert("org.swift.TestFoundation" == info!["CFBundleIdentifier"] as! String)
+
+#if DARWIN_COMPATIBILITY_TESTS
+        XCTAssert("DarwinCompatibilityTests" == info!["CFBundleName"] as! String)
+        XCTAssert("org.swift.DarwinCompatibilityTests" == info!["CFBundleIdentifier"] as! String)
+#else
         XCTAssert("TestFoundation" == info!["CFBundleName"] as! String)
-        
+        XCTAssert("org.swift.TestFoundation" == info!["CFBundleIdentifier"] as! String)
+#endif
+
         // localizedInfoDictionary
         XCTAssertNil(bundle.localizedInfoDictionary) // FIXME: Add a localized Info.plist for testing
     }
 
     func test_localizations() {
-        let bundle = Bundle.main
-        
+        let bundle = testBundle()
+
         XCTAssertEqual(["en"], bundle.localizations)
         XCTAssertEqual(["en"], bundle.preferredLocalizations)
         XCTAssertEqual(["en"], Bundle.preferredLocalizations(from: ["en", "pl", "es"]))
@@ -196,6 +224,4 @@ class TestBundle : XCTestCase {
         XCTAssertThrowsError(try bundle!.preflight())
         _cleanupPlayground(playground)
     }
-
-
 }

TestFoundation/TestBundle.swift

@@ -1412,6 +1412,7 @@ extension TestJSONSerialization {
     }
 
     func test_jsonObjectToOutputStreamInsufficientBuffer() {
+#if !DARWIN_COMPATIBILITY_TESTS  // Hangs
         let dict = ["a":["b":1]]
         let buffer = Array<UInt8>(repeating: 0, count: 10)
         let outputStream = OutputStream(toBuffer: UnsafeMutablePointer(mutating: buffer), capacity: buffer.count)
@@ -1425,6 +1426,7 @@ extension TestJSONSerialization {
         } catch {
             XCTFail("Error occurred while writing to stream")
         }
+#endif
     }
 
     func test_booleanJSONObject() {
@@ -1468,6 +1470,7 @@ extension TestJSONSerialization {
     } 
 
     func test_serializeSortedKeys() {
+ if #available(OSX 10.13, *) {
         var dict: [String: Any]
 
         dict = ["z": 1, "y": 1, "x": 1, "w": 1, "v": 1, "u": 1, "t": 1, "s": 1, "r": 1, "q": 1, ]
@@ -1478,6 +1481,7 @@ extension TestJSONSerialization {
 
         dict = ["c": ["c":1,"b":1,"a":1],"b":["c":1,"b":1,"a":1],"a":["c":1,"b":1,"a":1]]
         XCTAssertEqual(try trySerialize(dict, options: .sortedKeys), "{\"a\":{\"a\":1,\"b\":1,\"c\":1},\"b\":{\"a\":1,\"b\":1,\"c\":1},\"c\":{\"a\":1,\"b\":1,\"c\":1}}")
+        }
     }
 
     func test_serializePrettyPrinted() {

TestFoundation/TestJSONSerialization.swift

@@ -550,18 +550,20 @@ class TestNSArray : XCTestCase {
     }
 
     func test_readWriteURL() {
-        let data = NSArray(arrayLiteral: "one", "two", "three", "four", "five")
-        do {
-            let tempDir = NSTemporaryDirectory() + "TestFoundation_Playground_" + NSUUID().uuidString
-            try FileManager.default.createDirectory(atPath: tempDir, withIntermediateDirectories: false, attributes: nil)
-            let testFile = tempDir + "/readWriteURL.txt"
-            let url = URL(fileURLWithPath: testFile)
-            try data.write(to: url)
-            let data2 = try NSArray(contentsOf: url, error: ())
-            XCTAssertEqual(data, data2)
-            removeTestFile(testFile)
-        } catch let e {
-            XCTFail("Failed to write to file: \(e)")
+        if #available(OSX 10.13, *) {
+            let data = NSArray(arrayLiteral: "one", "two", "three", "four", "five")
+            do {
+                let tempDir = NSTemporaryDirectory() + "TestFoundation_Playground_" + NSUUID().uuidString
+                try FileManager.default.createDirectory(atPath: tempDir, withIntermediateDirectories: false, attributes: nil)
+                let testFile = tempDir + "/readWriteURL.txt"
+                let url = URL(fileURLWithPath: testFile)
+                try data.write(to: url)
+                let data2 = try NSArray(contentsOf: url, error: ())
+                XCTAssertEqual(data, data2)
+                removeTestFile(testFile)
+            } catch let e {
+                XCTFail("Failed to write to file: \(e)")
+            }
         }
     }
 

TestFoundation/TestNSArray.swift

@@ -513,7 +513,7 @@ class TestNSData: XCTestCase {
     }
 
     func test_writeToURLOptions() {
-        let saveData = try! Data(contentsOf: Bundle.main.url(forResource: "Test", withExtension: "plist")!)
+        let saveData = try! Data(contentsOf: testBundle().url(forResource: "Test", withExtension: "plist")!)
         let savePath = URL(fileURLWithPath: NSTemporaryDirectory() + "Test1.plist")
         do {
             try saveData.write(to: savePath, options: .atomic)

TestFoundation/TestNSData.swift

@@ -295,8 +295,10 @@ class TestNSKeyedArchiver : XCTestCase {
     }
 
     func test_archive_user_class() {
+#if !DARWIN_COMPATIBILITY_TESTS  // Causes SIGABRT
         let userClass = UserClass(1234)
         test_archive(userClass)
+#endif
     }
 
     func test_archive_ns_user_class() {

TestFoundation/TestNSKeyedArchiver.swift

@@ -15,6 +15,7 @@ import SwiftFoundation
 import SwiftXCTest
 #endif
 
+#if !DARWIN_COMPATIBILITY_TESTS
 class TestProgressFraction : XCTestCase {
     static var allTests: [(String, (TestProgressFraction) -> () throws -> Void)] {
         return [
@@ -159,4 +160,5 @@ class TestProgressFraction : XCTestCase {
         XCTAssertFalse(r.overflowed)
     }
 }
+#endif
 

TestFoundation/TestNSProgressFraction.swift

@@ -178,12 +178,14 @@ class TestUserDefaults : XCTestCase {
 	}
 
 	func test_setValue_String() {
+#if !DARWIN_COMPATIBILITY_TESTS  // Works if run on its own, hangs if all tests in class are run
 		let defaults = UserDefaults.standard
 
 		// Register a String value. UserDefaults.string(forKey:) is supposed to return the String
 		defaults.set("hello", forKey: "key1")
 
 		XCTAssertEqual(defaults.string(forKey: "key1"), "hello")
+#endif
 	}
 
 	func test_setValue_NSURL() {
@@ -196,12 +198,14 @@ class TestUserDefaults : XCTestCase {
 	}
 
 	func test_setValue_URL() {
+#if !DARWIN_COMPATIBILITY_TESTS  // Works if run on its own, hangs if all tests in class are run
 		let defaults = UserDefaults.standard
 
 		// Set a URL value. UserDefaults.url(forKey:) is supposed to return the URL
 		defaults.set(URL(fileURLWithPath: "/hello/world"), forKey: "key1")
 
 		XCTAssertEqual(defaults.url(forKey: "key1"), URL(fileURLWithPath: "/hello/world"))
+#endif
 	}
 
 	func test_setValue_NSData() {

TestFoundation/TestUserDefaults.swift

@@ -16,8 +16,6 @@
     import SwiftXCTest
 #endif
 
-class OptionalParserConformance: XMLParserDelegate {}
-
 enum XMLParserDelegateEvent {
     case startDocument
     case endDocument
@@ -49,7 +47,7 @@ extension XMLParserDelegateEvent: Equatable {
 
 }
 
-class XMLParserDelegateEventStream: XMLParserDelegate {
+class XMLParserDelegateEventStream: NSObject, XMLParserDelegate {
     var events: [XMLParserDelegateEvent] = []
 
     func parserDidStartDocument(_ parser: XMLParser) {

TestFoundation/TestXMLParser.swift

@@ -22,10 +22,6 @@ import SwiftXCTest
 #endif
 
 
-internal func testBundle() -> Bundle {
-    return Bundle.main
-}
-
 // ignore SIGPIPE which is sent when writing to closed file descriptors.
 _ = signal(SIGPIPE, SIG_IGN)