[test] Override hash, not hashValue in NSObject subclasses

Author: lorentey

validation-test/stdlib/AnyHashable.swift.gyb

@@ -443,18 +443,20 @@ class ${hashable_base.full_name} : ${', '.join([b.full_name for b in bases])} {
   init(_ value: Int) {
     self.value = value
   }
-  ${'override' if 'ObjC' in prefix else ''} var hashValue: Int {
+%   if 'ObjC' in prefix:
+  override var hash: Int {
     return value
   }
-%   if 'ObjC' in prefix:
   override func isEqual(_ object: Any?) -> Bool {
     guard let rhs = object as? ${hashable_base.full_name} else {
       return false
     }
     return self.value == rhs.value
   }
-%   end
-%   if not 'ObjC' in prefix:
+%   else:
+  var hashValue: Int {
+    return value
+  }
   static func == ${hashable_base.generic_parameters_decl} (
     lhs: ${hashable_base.full_name},
     rhs: ${hashable_base.full_name}

validation-test/stdlib/ObjectiveC.swift

@@ -10,6 +10,9 @@ import StdlibUnittest
 var ObjectiveCTests = TestSuite("ObjectiveC")
 
 class NSObjectWithCustomHashable : NSObject {
+  var _value: Int
+  var _hashValue: Int
+
   init(value: Int, hashValue: Int) {
     self._value = value
     self._hashValue = hashValue
@@ -20,24 +23,22 @@ class NSObjectWithCustomHashable : NSObject {
     return self._value == other_._value
   }
 
-  override var hashValue: Int {
+  override var hash: Int {
     return _hashValue
   }
-
-  var _value: Int
-  var _hashValue: Int
 }
 
 ObjectiveCTests.test("NSObject/Hashable") {
-  let instances: [(order: Int, object: NSObject)] = [
-    (10, NSObjectWithCustomHashable(value: 10, hashValue: 100)),
-    (10, NSObjectWithCustomHashable(value: 10, hashValue: 100)),
-    (20, NSObjectWithCustomHashable(value: 20, hashValue: 100)),
-    (30, NSObjectWithCustomHashable(value: 30, hashValue: 300)),
+  let instances: [(order: Int, hashOrder: Int, object: NSObject)] = [
+    (10, 1, NSObjectWithCustomHashable(value: 10, hashValue: 100)),
+    (10, 1, NSObjectWithCustomHashable(value: 10, hashValue: 100)),
+    (20, 1, NSObjectWithCustomHashable(value: 20, hashValue: 100)),
+    (30, 2, NSObjectWithCustomHashable(value: 30, hashValue: 300)),
   ]
   checkHashable(
     instances.map { $0.object },
-    equalityOracle: { instances[$0].order == instances[$1].order })
+    equalityOracle: { instances[$0].order == instances[$1].order },
+    hashEqualityOracle: { instances[$0].hashOrder == instances[$1].hashOrder })
 }
 
 runAllTests()