Merge pull request #20710 from lorentey/validate-validation

[test] Extend Set, Dictionary test suite

Author: lorentey

test/stdlib/Inputs/DictionaryKeyValueTypes.swift

@@ -54,11 +54,10 @@ struct TestValueCOWTy {
 var _keyCount = _stdlib_AtomicInt(0)
 var _keySerial = _stdlib_AtomicInt(0)
 
-// A wrapper class that can help us track allocations and find issues with
-// object lifetime.
-final class TestKeyTy 
-  : Equatable, Hashable, CustomStringConvertible, ExpressibleByIntegerLiteral 
-{
+class _BaseKeyTy: CustomStringConvertible {
+  final var value: Int
+  final var serial: Int
+
   class var objectCount: Int {
     get {
       return _keyCount.load()
@@ -70,18 +69,8 @@ final class TestKeyTy
 
   init(_ value: Int) {
     _keyCount.fetchAndAdd(1)
-    serial = _keySerial.addAndFetch(1)
+    self.serial = _keySerial.addAndFetch(1)
     self.value = value
-    self._hashValue = value
-  }
-
-  convenience init(integerLiteral value: Int) {
-    self.init(value)
-  }
-  
-  convenience init(value: Int, hashValue: Int) {
-    self.init(value)
-    self._hashValue = hashValue
   }
 
   deinit {
@@ -94,18 +83,60 @@ final class TestKeyTy
     assert(serial > 0, "dead TestKeyTy")
     return value.description
   }
+}
+
+// A wrapper class that can help us track allocations and find issues with
+// object lifetime.
+final class TestKeyTy
+  : _BaseKeyTy, Equatable, Hashable, ExpressibleByIntegerLiteral
+{
+  override init(_ value: Int) {
+    super.init(value)
+  }
+
+  convenience init(integerLiteral value: Int) {
+    self.init(value)
+  }
+
+  func hash(into hasher: inout Hasher) {
+    hasher.combine(value)
+  }
 
   var hashValue: Int {
-    return _hashValue
+    return value
   }
 
-  var value: Int
-  var _hashValue: Int
-  var serial: Int
+  static func ==(lhs: TestKeyTy, rhs: TestKeyTy) -> Bool {
+    return lhs.value == rhs.value
+  }
 }
 
-func == (lhs: TestKeyTy, rhs: TestKeyTy) -> Bool {
-  return lhs.value == rhs.value
+// A variant of TestKeyTy with precise control over hashing.
+// This is useful for bucket-level tests.
+final class RawTestKeyTy: _BaseKeyTy, Equatable, Hashable
+{
+  var _hash: Int
+
+  init(value: Int, hashValue: Int) {
+    self._hash = hashValue
+    super.init(value)
+  }
+
+  var hashValue: Int {
+    return _hash
+  }
+
+  func hash(into hasher: inout Hasher) {
+    hasher.combine(_hash)
+  }
+
+  func _rawHashValue(seed: Int) -> Int {
+    return _hash
+  }
+
+  static func ==(lhs: RawTestKeyTy, rhs: RawTestKeyTy) -> Bool {
+    return lhs.value == rhs.value
+  }
 }
 
 var _valueCount = _stdlib_AtomicInt(0)