DarwinCompatibilityTest: Update working test list and shims

- DarwinShims: Remove the extensions to FileHandle and Scanner as the
  missing functions are in the latest macOS 10.15 release.

- TestsToSkip: Update the list of tests to skip when running
  DarwinCompatibilityTests/xcode-build.sh to be more granular and
  also remove tests that now pass.

- FileHandle.readInBackgroundAndNotify(): If the read fails the userInfo
  NSFileHandleNotificationDataItem entry should be an empty Data() not
  nil.

Author: spevans

DarwinCompatibilityTests/DarwinShims.swift

@@ -45,16 +45,6 @@ extension Thread {
     }
 }
 
-extension Scanner {
-    public func scanString(_ searchString: String) -> String? {
-        var result: NSString? = nil
-        if scanString(searchString, 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?
@@ -83,27 +73,3 @@ extension NSCharacterSet {
         return self as CharacterSet
     }
 }
-
-
-extension FileHandle {
-    public func offset() throws -> UInt64 {
-        return self.offsetInFile
-    }
-
-    public func read(upToCount count: Int) throws -> Data? {
-        guard count > 0 else { return nil }
-        let data = readData(ofLength: count)
-        if data.count == 0 { return nil }
-        return data
-    }
-
-    public func readToEnd() throws -> Data? {
-        try read(upToCount: Int.max)
-    }
-
-    public func write<T: DataProtocol>(contentsOf data: T) throws {
-        if let d = data as? Data {
-            self.write(d)
-        }
-    }
-}

DarwinCompatibilityTests/TestsToSkip.txt

@@ -1,76 +1,82 @@
+TestBridging
 TestByteCountFormatter
 TestCachedURLResponse/test_equalCheckingData
 TestCachedURLResponse/test_equalCheckingResponse
 TestCachedURLResponse/test_equalCheckingStoragePolicy
 TestCachedURLResponse/test_hash
-TestCodable
-TestDateComponents
-TestDateFormatter
-TestDateIntervalFormatter
-TestDecimal
-TestFileHandle/testReadToEnd
-TestFileHandle/testReadUpToCount
-TestFileHandle/testWritingWithBuffer
-TestFileHandle/testWritingWithMultiregionData
-TestFileHandle/test_readToEndOfFileAndNotify_readError
+TestDataURLProtocol/test_invalidURIs
+TestDateFormatter/test_dateStyleMedium
+TestDateFormatter/test_expectedTimeZone
+TestDateIntervalFormatter/testDecodingFixtures
+TestDecimal/test_NSDecimalNumberValues
+TestDecimal/test_multiplyingByPowerOf10
 TestFileManager
 TestHTTPCookie
-TestHTTPCookieStorage
-TestHTTPURLResponse
-TestISO8601DateFormatter
-TestIndexPath
-TestIndexSet
-TestJSONEncoder
+TestHTTPCookieStorage/test_removeCookies
+TestHTTPURLResponse/test_suggestedFilename_4
+TestISO8601DateFormatter/test_loadingFixtures
+TestIndexPath/testLoadedValuesMatch
+TestIndexSet/testLoadedValuesMatch
 TestJSONSerialization
 TestLengthFormatter
-TestMeasurement
+TestMeasurement/testLoadedValuesMatch
 TestNSArray
-TestNSAttributedString
+TestNSAttributedString/test_unarchivingFixtures
 TestNSCache
-TestNSData
-TestNSDateComponents
-TestNSDictionary
+TestNSData/test_description
+TestNSData/test_edgeDebugDescription
+TestNSData/test_edgeNoCopyDescription
+TestNSData/test_emptyDescription
+TestNSData/test_longDebugDescription
+TestNSData/test_longDescription
+TestNSDateComponents/test_hash
+TestNSDictionary/test_copying
+TestNSDictionary/test_mutableCopying
 TestNSGeometry
 TestNSKeyedArchiver
 TestNSMutableAttributedString
 TestNSNumber
-TestNSOrderedSet
+TestNSNumberBridging/testNSNumberBridgeFromDouble
+TestNSNumberBridging/testNSNumberBridgeFromFloat
+TestNSOrderedSet/test_enumerationUsingBlock
+TestNSOrderedSet/test_loadedValuesMatch
 TestNSRegularExpression
 TestNSSet
-TestNSSortDescriptor
-TestNSString
-TestNSTextCheckingResult
-TestNSURLRequest
+TestNSString/test_FromContentsOfURLUsedEncodingUTF16BE
+TestNSString/test_FromContentsOfURLUsedEncodingUTF16LE
+TestNSString/test_FromContentsOfURLUsedEncodingUTF32BE
+TestNSString/test_FromContentsOfURLUsedEncodingUTF32LE
+TestNSTextCheckingResult/test_loadedVauesMatch
+TestNSURLRequest/test_hash
 TestNotificationQueue
-TestNumberFormatter
+TestNumberFormatter/test_settingFormat
 TestObjCRuntime
-TestProcess
-TestProcessInfo
-TestRunLoop
+TestProcess/test_currentDirectory
+TestProcess/test_plutil
+TestProcessInfo/test_globallyUniqueString
 TestScanner/testHexFloatingPoint
-TestScanner/testScanString
 TestSocketPort/testSendingOneMessageRemoteToLocal
-TestTimeZone
-TestURL
+TestURLCache/testNoMemoryUsageIfDisabled
 TestURLCache/testRemovingAll
 TestURLCache/testRemovingOne
 TestURLCache/testRemovingSince
 TestURLCache/testShrinkingDiskCapacityEvictsItems
 TestURLCache/testShrinkingMemoryCapacityEvictsItems
 TestURLCache/testStoragePolicy
 TestURLCache/testStoringTwiceOnlyHasOneEntry
-TestURLComponents
+TestURLCredentialStorage/test_storageStartsEmpty
 TestURLCredentialStorage/test_storageWillSendNotificationWhenAddingDifferentDefaultCredential
 TestURLCredentialStorage/test_storageWillSendNotificationWhenAddingExistingCredentialToDifferentSpace
 TestURLCredentialStorage/test_storageWillSendNotificationWhenAddingNewCredential
 TestURLCredentialStorage/test_storageWillSendNotificationWhenAddingNewDefaultCredential
 TestURLCredentialStorage/test_storageWillSendNotificationWhenRemovingDefaultNotification
 TestURLCredentialStorage/test_storageWillSendNotificationWhenRemovingExistingCredential
-TestURLProtocol
-TestURLRequest
+TestURLProtocol/test_customProtocolResponseWithDelegate
+TestURLProtocol/test_customProtocolSetDataInResponseWithDelegate
 TestURLResponse
+TestURLSession
 TestURLSessionFTP
 TestUnit
-TestUserDefaults
+TestUserDefaults/test_setValue_NSURL
 TestXMLDocument
 TestXMLParser

Sources/Foundation/FileHandle.swift

@@ -847,6 +847,7 @@ extension FileHandle {
             if error == 0 {
                 userInfo[NSFileHandleNotificationDataItem] = Data(data)
             } else {
+                userInfo[NSFileHandleNotificationDataItem] = Data()
 #if os(Windows)
                 // On Windows, reading from a directory results in an
                 // ERROR_ACCESS_DENIED. If we get ERROR_ACCESS_DENIED

Tests/Foundation/Tests/TestFileHandle.swift

@@ -513,7 +513,7 @@ class TestFileHandle : XCTestCase {
                 return true
             }
 
-            XCTAssertNil(notification.userInfo?[NSFileHandleNotificationDataItem])
+            XCTAssertEqual(notification.userInfo?[NSFileHandleNotificationDataItem] as? Data, Data())
 #if os(Windows)
             XCTAssertEqual(error, NSNumber(value: ERROR_DIRECTORY_NOT_SUPPORTED))
 #else