More progress on macOS tests

Author: parkera

Sources/CoreFoundation/include/ForSwiftFoundationOnly.h

@@ -339,8 +339,8 @@ CF_EXPORT struct _NSCFXMLBridgeUntyped __NSCFXMLBridgeUntyped;
 
 CF_EXPORT struct _CFSwiftBridge __CFSwiftBridge;
 
-CF_PRIVATE void *_Nullable _CFSwiftRetain(void *_Nullable t);
-CF_PRIVATE void _CFSwiftRelease(void *_Nullable t);
+CF_EXPORT void *_Nullable _CFSwiftRetain(void *_Nullable t);
+CF_EXPORT void _CFSwiftRelease(void *_Nullable t);
 
 CF_EXPORT void _CFRuntimeBridgeTypeToClass(CFTypeID type, const void *isa);
 

Sources/Foundation/FileManager.swift

@@ -16,6 +16,7 @@ fileprivate let UF_HIDDEN: Int32 = 1
 #endif
 
 @_implementationOnly import _CoreFoundation
+
 #if os(Windows)
 import CRT
 import WinSDK
@@ -972,7 +973,7 @@ open class FileManager : NSObject {
                 isDirectory.boolValue {
                 for language in _preferredLanguages {
                     let stringsFile = dotLocalized.appendingPathComponent(language).appendingPathExtension("strings")
-                    if let data = try? Data(contentsOf: stringsFile.path),
+                    if let data = try? Data(contentsOf: stringsFile),
                        let plist = (try? PropertyListSerialization.propertyList(from: data, format: nil)) as? NSDictionary {
 
                         let localizedName = (plist[nameWithoutExtension] as? NSString)?._swiftObject
@@ -1034,13 +1035,13 @@ open class FileManager : NSObject {
     /* These methods are provided here for compatibility. The corresponding methods on NSData which return NSErrors should be regarded as the primary method of creating a file from an NSData or retrieving the contents of a file as an NSData.
      */
     open func contents(atPath path: String) -> Data? {
-        return try? Data(contentsOf: path)
+        return try? Data(contentsOf: URL(fileURLWithPath: path))
     }
 
     @discardableResult
     open func createFile(atPath path: String, contents data: Data?, attributes attr: [FileAttributeKey : Any]? = nil) -> Bool {
         do {
-            try (data ?? Data()).write(to: path, options: .atomic)
+            try (data ?? Data()).write(to: URL(fileURLWithPath: path), options: .atomic)
             if let attr = attr {
                 try self.setAttributes(attr, ofItemAtPath: path)
             }

Sources/Foundation/NSArray.swift

@@ -458,7 +458,7 @@ open class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCo
     open func write(to url: URL, atomically: Bool) -> Bool {
         do {
             let pListData = try PropertyListSerialization.data(fromPropertyList: self, format: .xml, options: 0)
-            try pListData.write(to: url.path, options: atomically ? .atomic : [])
+            try pListData.write(to: url, options: atomically ? .atomic : [])
             return true
         } catch {
             return false

Sources/Foundation/NSCharacterSet.swift

@@ -9,6 +9,7 @@
 
 
 @_implementationOnly import _CoreFoundation
+import FoundationEssentials
 
 let kCFCharacterSetControl = CFCharacterSetPredefinedSet.control
 let kCFCharacterSetWhitespace = CFCharacterSetPredefinedSet.whitespace
@@ -186,7 +187,7 @@ open class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSSecureCodin
 
     public convenience init?(contentsOfFile fName: String) {
         do {
-           let data = try Data(contentsOf: fName)
+            let data = try Data(contentsOf: URL(fileURLWithPath: fName))
             self.init(bitmapRepresentation: data)
         } catch {
             return nil

Sources/Foundation/NSData.swift

@@ -1207,11 +1207,11 @@ extension NSData {
 extension Data {
     // Temporary until SwiftFoundation supports this
     public init(contentsOf url: URL, options: ReadingOptions = []) throws {
-        self = try .init(contentsOf: url.path, options: options)
+        self = try .init(contentsOf: url, options: options)
     }
 
     public func write(to url: URL, options: WritingOptions = []) throws {
-        try write(to: url.path, options: options)
+        try write(to: url, options: options)
     }
 }
 

Sources/Foundation/NSDictionary.swift

@@ -82,7 +82,7 @@ open class NSDictionary : NSObject, NSCopying, NSMutableCopying, NSSecureCoding,
     @available(*, deprecated)
     public convenience init?(contentsOf url: URL) {
         do {
-            guard let plistDoc = try? Data(contentsOf: url.path) else { return nil }
+            guard let plistDoc = try? Data(contentsOf: url) else { return nil }
             let plistDict = try PropertyListSerialization.propertyList(from: plistDoc, options: [], format: nil) as? Dictionary<AnyHashable,Any>
             guard let plistDictionary = plistDict else { return nil }
             self.init(dictionary: plistDictionary)
@@ -509,7 +509,7 @@ open class NSDictionary : NSObject, NSCopying, NSMutableCopying, NSSecureCoding,
     open func write(to url: URL, atomically: Bool) -> Bool {
         do {
             let pListData = try PropertyListSerialization.data(fromPropertyList: self, format: .xml, options: 0)
-            try pListData.write(to: url.path, options: atomically ? .atomic : [])
+            try pListData.write(to: url, options: atomically ? .atomic : [])
             return true
         } catch {
             return false

Sources/Foundation/NSString.swift

@@ -1259,8 +1259,7 @@ extension NSString {
     internal func _writeTo(_ url: URL, _ useAuxiliaryFile: Bool, _ enc: UInt) throws {
         var data = Data()
         try _getExternalRepresentation(&data, url, enc)
-        // TODO: Use URL version when that is ready
-        try data.write(to: url.path, options: useAuxiliaryFile ? .atomic : [])
+        try data.write(to: url, options: useAuxiliaryFile ? .atomic : [])
     }
 
     open func write(to url: URL, atomically useAuxiliaryFile: Bool, encoding enc: UInt) throws {

Sources/FoundationNetworking/URLSession/NetworkingSpecific.swift

@@ -52,7 +52,7 @@ class _NSNonfileURLContentLoader: _NSNonfileURLContentLoading {
             }
             // Temporary workaround for lack of URL in swift-foundation
             // TODO: Replace with argument
-            let feURL = FoundationEssentials.URL(path: url.path)
+            let feURL = FoundationEssentials.URL(fileURLWithPath: url.path)
             return CocoaError.error(.fileReadUnknown, userInfo: userInfo, url: feURL)
         }
 
@@ -99,7 +99,8 @@ class _NSNonfileURLContentLoader: _NSNonfileURLContentLoading {
             }
         }
         throw cocoaError()
-    }    #else
+    }    
+#else
     @usableFromInline
     func contentsOf(url: Foundation.URL) throws -> (result: NSData, textEncodingNameIfAvailable: String?) {