Don't rely on bridging for NSData

Author: parkera

Tests/Foundation/TestDimension.swift

@@ -17,7 +17,7 @@ class TestDimension: XCTestCase {
         original.encode(with: archiver)
         archiver.finishEncoding()
 
-        let unarchiver = NSKeyedUnarchiver(forReadingWith: encodedData as Data)
+        let unarchiver = NSKeyedUnarchiver(forReadingWith: Data(encodedData))
         let decoded = Dimension(coder: unarchiver)
 
         XCTAssertNotNil(decoded)

Tests/Foundation/TestNSAttributedString.swift

@@ -286,7 +286,7 @@ class TestNSAttributedString : XCTestCase {
         archiver.encode(string, forKey: NSKeyedArchiveRootObjectKey)
         archiver.finishEncoding()
 
-        let unarchiver = NSKeyedUnarchiver(forReadingWith: data as Data)
+        let unarchiver = NSKeyedUnarchiver(forReadingWith: Data(data))
         unarchiver.requiresSecureCoding = true
         let unarchived = unarchiver.decodeObject(of: NSAttributedString.self, forKey: NSKeyedArchiveRootObjectKey)
 
@@ -621,7 +621,7 @@ class TestNSMutableAttributedString : XCTestCase {
         archiver.encode(string, forKey: NSKeyedArchiveRootObjectKey)
         archiver.finishEncoding()
 
-        let unarchiver = NSKeyedUnarchiver(forReadingWith: data as Data)
+        let unarchiver = NSKeyedUnarchiver(forReadingWith: Data(data))
         unarchiver.requiresSecureCoding = true
         let unarchived = unarchiver.decodeObject(of: NSMutableAttributedString.self, forKey: NSKeyedArchiveRootObjectKey)
 

Tests/Foundation/TestNSString.swift

@@ -1199,31 +1199,31 @@ class TestNSString: LoopbackServerTest {
         do {
             let string = NSString(string: "this is an external string that should be representable by data")
 
-            let UTF8Data = try XCTUnwrap(string.data(using: String.Encoding.utf8.rawValue, allowLossyConversion: false)) as NSData
-            let UTF8Length = UTF8Data.length
+            let UTF8Data = try XCTUnwrap(string.data(using: String.Encoding.utf8.rawValue, allowLossyConversion: false))/* as NSData*/
+            let UTF8Length = UTF8Data.count
             XCTAssertEqual(UTF8Length, 63, "NSString should successfully produce an external UTF8 representation with a length of 63 but got \(UTF8Length) bytes")
 
-            let UTF16Data = try XCTUnwrap(string.data(using: String.Encoding.utf16.rawValue, allowLossyConversion: false)) as NSData
-            let UTF16Length = UTF16Data.length
+            let UTF16Data = try XCTUnwrap(string.data(using: String.Encoding.utf16.rawValue, allowLossyConversion: false))/* as NSData*/
+            let UTF16Length = UTF16Data.count
             XCTAssertEqual(UTF16Length, 128, "NSString should successfully produce an external UTF16 representation with a length of 128 but got \(UTF16Length) bytes")
 
-            let ISOLatin1Data = try XCTUnwrap(string.data(using: String.Encoding.isoLatin1.rawValue, allowLossyConversion: false)) as NSData
-            let ISOLatin1Length = ISOLatin1Data.length
+            let ISOLatin1Data = try XCTUnwrap(string.data(using: String.Encoding.isoLatin1.rawValue, allowLossyConversion: false))/* as NSData*/
+            let ISOLatin1Length = ISOLatin1Data.count
             XCTAssertEqual(ISOLatin1Length, 63, "NSString should successfully produce an external ISOLatin1 representation with a length of 63 but got \(ISOLatin1Length) bytes")
         }
 
         do {
             let string = NSString(string: "🐢 encoding all the way down. 🐢🐢🐢")
 
-            let UTF8Data = try XCTUnwrap(string.data(using: String.Encoding.utf8.rawValue, allowLossyConversion: false)) as NSData
-            let UTF8Length = UTF8Data.length
+            let UTF8Data = try XCTUnwrap(string.data(using: String.Encoding.utf8.rawValue, allowLossyConversion: false))/* as NSData*/
+            let UTF8Length = UTF8Data.count
             XCTAssertEqual(UTF8Length, 44, "NSString should successfully produce an external UTF8 representation with a length of 44 but got \(UTF8Length) bytes")
 
-            let UTF16Data = try XCTUnwrap(string.data(using: String.Encoding.utf16.rawValue, allowLossyConversion: false)) as NSData
-            let UTF16Length = UTF16Data.length
+            let UTF16Data = try XCTUnwrap(string.data(using: String.Encoding.utf16.rawValue, allowLossyConversion: false))/* as NSData*/
+            let UTF16Length = UTF16Data.count
             XCTAssertEqual(UTF16Length, 74, "NSString should successfully produce an external UTF16 representation with a length of 74 but got \(UTF16Length) bytes")
 
-            let ISOLatin1Data = string.data(using: String.Encoding.isoLatin1.rawValue, allowLossyConversion: false) as NSData?
+            let ISOLatin1Data = string.data(using: String.Encoding.isoLatin1.rawValue, allowLossyConversion: false)/* as NSData?*/
             XCTAssertNil(ISOLatin1Data)
         }
     }

Tests/Foundation/TestSocketPort.swift

@@ -84,7 +84,7 @@ class TestSocketPort : XCTestCase {
 
         let received = expectation(description: "Message received")
         let delegate = TestPortDelegateWithBlock { message in
-            XCTAssertEqual(message.components as? [AnyHashable], [data as NSData])
+            XCTAssertEqual(message.components as? [AnyHashable], [data._bridgeToObjectiveC()])
             received.fulfill()
         }