AnyHashable tests for Foundation types: add tests for bridging back to Swift types + fixes that make tests pass

stdlib/public/SDK/Foundation/AffineTransform.swift

@@ -294,6 +294,8 @@ extension AffineTransform : _ObjectiveCBridgeable {
 }
 
 extension NSAffineTransform : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as AffineTransform)
     }

stdlib/public/SDK/Foundation/Calendar.swift

@@ -1129,6 +1129,8 @@ extension Calendar : _ObjectiveCBridgeable {
 }
 
 extension NSCalendar : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as Calendar)
     }

stdlib/public/SDK/Foundation/CharacterSet.swift

@@ -469,6 +469,8 @@ extension CharacterSet : _ObjectiveCBridgeable {
 }
 
 extension NSCharacterSet : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as CharacterSet)
     }

stdlib/public/SDK/Foundation/Data.swift

@@ -730,6 +730,8 @@ extension Data : _ObjectiveCBridgeable {
 }
 
 extension NSData : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as Data)
     }

stdlib/public/SDK/Foundation/Date.swift

@@ -263,6 +263,8 @@ extension Date : _ObjectiveCBridgeable {
 }
 
 extension NSDate : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as Date)
     }

stdlib/public/SDK/Foundation/DateComponents.swift

@@ -346,6 +346,8 @@ extension DateComponents : _ObjectiveCBridgeable {
 }
 
 extension NSDateComponents : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as DateComponents)
     }

stdlib/public/SDK/Foundation/DateInterval.swift

@@ -222,6 +222,8 @@ extension DateInterval : _ObjectiveCBridgeable {
 
 @available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
 extension NSDateInterval : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as DateInterval)
     }

stdlib/public/SDK/Foundation/Foundation.swift

@@ -937,6 +937,8 @@ extension Set : _ObjectiveCBridgeable {
 /*
 FIXME(id-as-any): uncomment this when we can cast NSSet to Set<AnyHashable>.
 extension NSSet : _HasCustomAnyHashableRepresentation {
+  // Must be @nonobjc to avoid infinite recursion during bridging
+  @nonobjc
   public func _toCustomAnyHashable() -> AnyHashable? {
     var builder = _SetBuilder<Element>(count: s!.count)
     // FIXME(id-as-any): how to get the Hashable conformance here?

stdlib/public/SDK/Foundation/IndexPath.swift

@@ -241,6 +241,8 @@ extension IndexPath : _ObjectiveCBridgeable {
 }
 
 extension NSIndexPath : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as IndexPath)
     }

stdlib/public/SDK/Foundation/IndexSet.swift

@@ -885,6 +885,8 @@ extension IndexSet : _ObjectiveCBridgeable {
 }
 
 extension NSIndexSet : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as IndexSet)
     }

stdlib/public/SDK/Foundation/Locale.swift

@@ -483,6 +483,8 @@ extension Locale : _ObjectiveCBridgeable {
 }
 
 extension NSLocale : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as Locale)
     }

stdlib/public/SDK/Foundation/Measurement.swift

@@ -294,6 +294,8 @@ FIXME(id-as-any): can't write this code because of:
 
 @available(OSX 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *)
 extension NSMeasurement : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as Measurement)
     }

stdlib/public/SDK/Foundation/Notification.swift

@@ -153,6 +153,8 @@ extension Notification : _ObjectiveCBridgeable {
 }
 
 extension NSNotification : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as Notification)
     }

stdlib/public/SDK/Foundation/PersonNameComponents.swift

@@ -138,6 +138,8 @@ extension PersonNameComponents : _ObjectiveCBridgeable {
 
 @available(OSX 10.11, iOS 9.0, *)
 extension NSPersonNameComponents : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as PersonNameComponents)
     }

stdlib/public/SDK/Foundation/TimeZone.swift

@@ -277,6 +277,8 @@ extension TimeZone : _ObjectiveCBridgeable {
 }
 
 extension NSTimeZone : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as TimeZone)
     }

stdlib/public/SDK/Foundation/URL.swift

@@ -1168,6 +1168,8 @@ extension URL : CustomStringConvertible, CustomDebugStringConvertible {
 }
 
 extension NSURL : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as URL)
     }

stdlib/public/SDK/Foundation/URLComponents.swift

@@ -371,6 +371,8 @@ extension URLComponents : _ObjectiveCBridgeable {
 }
 
 extension NSURLComponents : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as URLComponents)
     }
@@ -463,6 +465,8 @@ extension URLQueryItem : _ObjectiveCBridgeable {
 
 @available(OSX 10.10, iOS 8.0, *)
 extension NSURLQueryItem : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as URLQueryItem)
     }

stdlib/public/SDK/Foundation/URLRequest.swift

@@ -297,6 +297,8 @@ extension URLRequest : _ObjectiveCBridgeable {
 }
 
 extension NSURLRequest : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as URLRequest)
     }

stdlib/public/SDK/Foundation/UUID.swift

@@ -141,6 +141,8 @@ extension UUID : _ObjectiveCBridgeable {
 }
 
 extension NSUUID : _HasCustomAnyHashableRepresentation {
+    // Must be @nonobjc to avoid infinite recursion during bridging.
+    @nonobjc
     public func _toCustomAnyHashable() -> AnyHashable? {
         return AnyHashable(self as UUID)
     }

test/1_stdlib/TestAffineTransform.swift

@@ -331,7 +331,7 @@ class TestAffineTransform : TestAffineTransformSuper {
     }
 
     func test_AnyHashableContainingAffineTransform() {
-        let values = [
+        let values: [AffineTransform] = [
             AffineTransform.identity,
             AffineTransform(m11: -55.66, m12: 22.7, m21: 1.5, m22: 0.0, tX: -22, tY: -33),
             AffineTransform(m11: -55.66, m12: 22.7, m21: 1.5, m22: 0.0, tX: -22, tY: -33)
@@ -343,6 +343,25 @@ class TestAffineTransform : TestAffineTransformSuper {
         expectNotEqual(anyHashables[0], anyHashables[1])
         expectEqual(anyHashables[1], anyHashables[2])
     }
+
+    func test_AnyHashableCreatedFromNSAffineTransform() {
+        func makeNSAffineTransform(rotatedByDegrees angle: CGFloat) -> NSAffineTransform {
+            let result = NSAffineTransform()
+            result.rotate(byDegrees: angle)
+            return result
+        }
+        let values: [NSAffineTransform] = [
+            makeNSAffineTransform(rotatedByDegrees: 0),
+            makeNSAffineTransform(rotatedByDegrees: 10),
+            makeNSAffineTransform(rotatedByDegrees: 10),
+        ]
+        let anyHashables = values.map(AnyHashable.init)
+        expectEqual("AffineTransform", String(anyHashables[0].base.dynamicType))
+        expectEqual("AffineTransform", String(anyHashables[1].base.dynamicType))
+        expectEqual("AffineTransform", String(anyHashables[2].base.dynamicType))
+        expectNotEqual(anyHashables[0], anyHashables[1])
+        expectEqual(anyHashables[1], anyHashables[2])
+    }
 }
 
 #if !FOUNDATION_XCTEST
@@ -364,6 +383,7 @@ AffineTransformTests.test("test_TransformComposition") { TestAffineTransform().t
 AffineTransformTests.test("test_hashing_identity") { TestAffineTransform().test_hashing_identity() }
 AffineTransformTests.test("test_hashing_values") { TestAffineTransform().test_hashing_values() }
 AffineTransformTests.test("test_AnyHashableContainingAffineTransform") { TestAffineTransform().test_AnyHashableContainingAffineTransform() }
+AffineTransformTests.test("test_AnyHashableCreatedFromNSAffineTransform") { TestAffineTransform().test_AnyHashableCreatedFromNSAffineTransform() }
 runAllTests()
 #endif
 

test/1_stdlib/TestCalendar.swift

@@ -257,7 +257,7 @@ class TestCalendar : TestCalendarSuper {
     }
 
     func test_AnyHashableContainingCalendar() {
-        let values = [
+        let values: [Calendar] = [
             Calendar(identifier: .gregorian),
             Calendar(identifier: .japanese),
             Calendar(identifier: .japanese)
@@ -269,6 +269,22 @@ class TestCalendar : TestCalendarSuper {
         expectNotEqual(anyHashables[0], anyHashables[1])
         expectEqual(anyHashables[1], anyHashables[2])
     }
+
+    func test_AnyHashableCreatedFromNSCalendar() {
+        if #available(iOS 8.0, *) {
+            let values: [NSCalendar] = [
+                NSCalendar(identifier: .gregorian)!,
+                NSCalendar(identifier: .japanese)!,
+                NSCalendar(identifier: .japanese)!,
+            ]
+            let anyHashables = values.map(AnyHashable.init)
+            expectEqual("Calendar", String(anyHashables[0].base.dynamicType))
+            expectEqual("Calendar", String(anyHashables[1].base.dynamicType))
+            expectEqual("Calendar", String(anyHashables[2].base.dynamicType))
+            expectNotEqual(anyHashables[0], anyHashables[1])
+            expectEqual(anyHashables[1], anyHashables[2])
+        }
+    }
 }
 
 #if !FOUNDATION_XCTEST
@@ -278,5 +294,6 @@ CalendarTests.test("test_bridgingAutoupdating") { TestCalendar().test_bridgingAu
 CalendarTests.test("test_equality") { TestCalendar().test_equality() }
 CalendarTests.test("test_properties") { TestCalendar().test_properties() }
 CalendarTests.test("test_AnyHashableContainingCalendar") { TestCalendar().test_AnyHashableContainingCalendar() }
+CalendarTests.test("test_AnyHashableCreatedFromNSCalendar") { TestCalendar().test_AnyHashableCreatedFromNSCalendar() }
 runAllTests()
 #endif

test/1_stdlib/TestCharacterSet.swift

@@ -154,7 +154,7 @@ class TestCharacterSet : TestCharacterSetSuper {
     }
 
     func test_AnyHashableContainingCharacterSet() {
-        let values = [
+        let values: [CharacterSet] = [
             CharacterSet(charactersIn: "ABC"),
             CharacterSet(charactersIn: "XYZ"),
             CharacterSet(charactersIn: "XYZ")
@@ -166,6 +166,20 @@ class TestCharacterSet : TestCharacterSetSuper {
         expectNotEqual(anyHashables[0], anyHashables[1])
         expectEqual(anyHashables[1], anyHashables[2])
     }
+
+    func test_AnyHashableCreatedFromNSCharacterSet() {
+        let values: [NSCharacterSet] = [
+            NSCharacterSet(charactersIn: "ABC"),
+            NSCharacterSet(charactersIn: "XYZ"),
+            NSCharacterSet(charactersIn: "XYZ"),
+        ]
+        let anyHashables = values.map(AnyHashable.init)
+        expectEqual("CharacterSet", String(anyHashables[0].base.dynamicType))
+        expectEqual("CharacterSet", String(anyHashables[1].base.dynamicType))
+        expectEqual("CharacterSet", String(anyHashables[2].base.dynamicType))
+        expectNotEqual(anyHashables[0], anyHashables[1])
+        expectEqual(anyHashables[1], anyHashables[2])
+    }
 }
 
 
@@ -180,6 +194,7 @@ CharacterSetTests.test("testInsertAndRemove") { TestCharacterSet().testInsertAnd
 CharacterSetTests.test("testBasics") { TestCharacterSet().testBasics() }
 CharacterSetTests.test("test_classForCoder") { TestCharacterSet().test_classForCoder() }
 CharacterSetTests.test("test_AnyHashableContainingCharacterSet") { TestCharacterSet().test_AnyHashableContainingCharacterSet() }
+CharacterSetTests.test("test_AnyHashableCreatedFromNSCharacterSet") { TestCharacterSet().test_AnyHashableCreatedFromNSCharacterSet() }
 runAllTests()
 #endif
 

test/1_stdlib/TestData.swift

@@ -867,7 +867,7 @@ class TestData : TestDataSuper {
     }
 
     func test_AnyHashableContainingData() {
-        let values = [
+        let values: [Data] = [
             Data(base64Encoded: "AAAA")!,
             Data(base64Encoded: "AAAB")!,
             Data(base64Encoded: "AAAB")!,
@@ -879,6 +879,20 @@ class TestData : TestDataSuper {
         expectNotEqual(anyHashables[0], anyHashables[1])
         expectEqual(anyHashables[1], anyHashables[2])
     }
+
+    func test_AnyHashableCreatedFromNSData() {
+        let values: [NSData] = [
+            NSData(base64Encoded: "AAAA")!,
+            NSData(base64Encoded: "AAAB")!,
+            NSData(base64Encoded: "AAAB")!,
+        ]
+        let anyHashables = values.map(AnyHashable.init)
+        expectEqual("Data", String(anyHashables[0].base.dynamicType))
+        expectEqual("Data", String(anyHashables[1].base.dynamicType))
+        expectEqual("Data", String(anyHashables[2].base.dynamicType))
+        expectNotEqual(anyHashables[0], anyHashables[1])
+        expectEqual(anyHashables[1], anyHashables[2])
+    }
 }
 
 #if !FOUNDATION_XCTEST
@@ -921,6 +935,7 @@ DataTests.test("test_passing") { TestData().test_passing() }
 DataTests.test("test_bufferSizeCalculation") { TestData().test_bufferSizeCalculation() }
 DataTests.test("test_classForCoder") { TestData().test_classForCoder() }
 DataTests.test("test_AnyHashableContainingData") { TestData().test_AnyHashableContainingData() }
+DataTests.test("test_AnyHashableCreatedFromNSData") { TestData().test_AnyHashableCreatedFromNSData() }
 
 // XCTest does not have a crash detection, whereas lit does
 DataTests.test("bounding failure subdata") {

test/1_stdlib/TestDate.swift

@@ -150,8 +150,22 @@ class TestDate : TestDateSuper {
         expectEqual(anyHashables[1], anyHashables[2])
     }
 
+    func test_AnyHashableCreatedFromNSDate() {
+        let values: [NSDate] = [
+            NSDate(timeIntervalSince1970: 1000000000),
+            NSDate(timeIntervalSince1970: 1000000001),
+            NSDate(timeIntervalSince1970: 1000000001),
+        ]
+        let anyHashables = values.map(AnyHashable.init)
+        expectEqual("Date", String(anyHashables[0].base.dynamicType))
+        expectEqual("Date", String(anyHashables[1].base.dynamicType))
+        expectEqual("Date", String(anyHashables[2].base.dynamicType))
+        expectNotEqual(anyHashables[0], anyHashables[1])
+        expectEqual(anyHashables[1], anyHashables[2])
+    }
+
     func test_AnyHashableContainingDateComponents() {
-        let values = [
+        let values: [DateComponents] = [
             DateComponents(year: 2016),
             DateComponents(year: 1995),
             DateComponents(year: 1995),
@@ -163,6 +177,25 @@ class TestDate : TestDateSuper {
         expectNotEqual(anyHashables[0], anyHashables[1])
         expectEqual(anyHashables[1], anyHashables[2])
     }
+
+    func test_AnyHashableCreatedFromNSDateComponents() {
+        func makeNSDateComponents(year: Int) -> NSDateComponents {
+            let result = NSDateComponents()
+            result.year = year
+            return result
+        }
+        let values: [NSDateComponents] = [
+            makeNSDateComponents(year: 2016),
+            makeNSDateComponents(year: 1995),
+            makeNSDateComponents(year: 1995),
+        ]
+        let anyHashables = values.map(AnyHashable.init)
+        expectEqual("DateComponents", String(anyHashables[0].base.dynamicType))
+        expectEqual("DateComponents", String(anyHashables[1].base.dynamicType))
+        expectEqual("DateComponents", String(anyHashables[2].base.dynamicType))
+        expectNotEqual(anyHashables[0], anyHashables[1])
+        expectEqual(anyHashables[1], anyHashables[2])
+    }
 }
 
 #if !FOUNDATION_XCTEST
@@ -177,6 +210,8 @@ DateTests.test("testEquality") { TestDate().testEquality() }
 DateTests.test("testTimeIntervalSinceDate") { TestDate().testTimeIntervalSinceDate() }
 DateTests.test("testDateComponents") { TestDate().testDateComponents() }
 DateTests.test("test_AnyHashableContainingDate") { TestDate().test_AnyHashableContainingDate() }
+DateTests.test("test_AnyHashableCreatedFromNSDate") { TestDate().test_AnyHashableCreatedFromNSDate() }
 DateTests.test("test_AnyHashableContainingDateComponents") { TestDate().test_AnyHashableContainingDateComponents() }
+DateTests.test("test_AnyHashableCreatedFromNSDateComponents") { TestDate().test_AnyHashableCreatedFromNSDateComponents() }
 runAllTests()
 #endif