Skip to content

[stdlib] Review & update hash testing to use Hasher's new features #16066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 21, 2018
Merged

[stdlib] Review & update hash testing to use Hasher's new features #16066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f873a51
[test] MinimalTypes: Move ==, < definitions into the corresponding ty…
lorentey Apr 20, 2018
d55b14b
[test] MinimalHashable{Value,Class}: Implement CustomStringConvertible
lorentey Apr 20, 2018
8d18d1a
[test] checkHashable: Check that unequal values produce different hashes
lorentey Apr 16, 2018
5ab6711
[test] MinimalHashable types: Replace hashValue hook with hash(into:)
lorentey Apr 16, 2018
21932f4
[test] Override hash, not hashValue in NSObject subclasses
lorentey Apr 16, 2018
6984782
[test] PersistentVector: use a custom hashing interface
lorentey Apr 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
227 changes: 142 additions & 85 deletions stdlib/private/StdlibUnittest/MinimalTypes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,14 @@ public struct MinimalEquatableValue : Equatable {
self.value = value
self.identity = identity
}
}
public func == (
lhs: MinimalEquatableValue,
rhs: MinimalEquatableValue
) -> Bool {
MinimalEquatableValue.timesEqualEqualWasCalled += 1
return MinimalEquatableValue.equalImpl.value(lhs.value, rhs.value)

public static func == (
lhs: MinimalEquatableValue,
rhs: MinimalEquatableValue
) -> Bool {
MinimalEquatableValue.timesEqualEqualWasCalled += 1
return MinimalEquatableValue.equalImpl.value(lhs.value, rhs.value)
}
}

/// A type that conforms only to `Equatable` and `Comparable`.
Expand Down Expand Up @@ -85,22 +86,22 @@ public struct MinimalComparableValue : Equatable, Comparable {
self.value = value
self.identity = identity
}
}

public func == (
lhs: MinimalComparableValue,
rhs: MinimalComparableValue
) -> Bool {
MinimalComparableValue.timesEqualEqualWasCalled.value += 1
return MinimalComparableValue.equalImpl.value(lhs.value, rhs.value)
}
public static func == (
lhs: MinimalComparableValue,
rhs: MinimalComparableValue
) -> Bool {
MinimalComparableValue.timesEqualEqualWasCalled.value += 1
return MinimalComparableValue.equalImpl.value(lhs.value, rhs.value)
}

public func < (
lhs: MinimalComparableValue,
rhs: MinimalComparableValue
) -> Bool {
MinimalComparableValue.timesLessWasCalled.value += 1
return MinimalComparableValue.lessImpl.value(lhs.value, rhs.value)
public static func < (
lhs: MinimalComparableValue,
rhs: MinimalComparableValue
) -> Bool {
MinimalComparableValue.timesLessWasCalled.value += 1
return MinimalComparableValue.lessImpl.value(lhs.value, rhs.value)
}
}


Expand All @@ -110,12 +111,12 @@ public func < (
/// other conformances.
public struct MinimalHashableValue : Equatable, Hashable {
public static var timesEqualEqualWasCalled: Int = 0
public static var timesHashValueWasCalled: Int = 0
public static var timesHashIntoWasCalled: Int = 0

public static var equalImpl =
ResettableValue<(Int, Int) -> Bool>({ $0 == $1 })
public static var hashValueImpl =
ResettableValue<(Int) -> Int>({ $0.hashValue })
public static var hashIntoImpl =
ResettableValue<(Int, inout _Hasher) -> Void>({ $1.combine($0) })

public var value: Int
public var identity: Int
Expand All @@ -130,18 +131,30 @@ public struct MinimalHashableValue : Equatable, Hashable {
self.identity = identity
}

public static func ==(
lhs: MinimalHashableValue,
rhs: MinimalHashableValue
) -> Bool {
MinimalHashableValue.timesEqualEqualWasCalled += 1
return MinimalHashableValue.equalImpl.value(lhs.value, rhs.value)
}

public var hashValue: Int {
MinimalHashableValue.timesHashValueWasCalled += 1
return MinimalHashableValue.hashValueImpl.value(value)
var hasher = _Hasher()
hasher.combine(self)
return hasher.finalize()
}

public func _hash(into hasher: inout _Hasher) {
MinimalHashableValue.timesHashIntoWasCalled += 1
MinimalHashableValue.hashIntoImpl.value(value, &hasher)
}
}

public func == (
lhs: MinimalHashableValue,
rhs: MinimalHashableValue
) -> Bool {
MinimalHashableValue.timesEqualEqualWasCalled += 1
return MinimalHashableValue.equalImpl.value(lhs.value, rhs.value)
extension MinimalHashableValue: CustomStringConvertible {
public var description: String {
return "MinimalHashableValue(value: \(value), identity: \(identity))"
}
}


Expand All @@ -151,12 +164,12 @@ public func == (
/// other conformances.
public class MinimalHashableClass : Equatable, Hashable {
public static var timesEqualEqualWasCalled: Int = 0
public static var timesHashValueWasCalled: Int = 0
public static var timesHashIntoWasCalled: Int = 0

public static var equalImpl =
ResettableValue<(Int, Int) -> Bool>({ $0 == $1 })
public static var hashValueImpl =
ResettableValue<(Int) -> Int>({ $0.hashValue })
public static var hashIntoImpl =
ResettableValue<(Int, inout _Hasher) -> Void>({ $1.combine($0) })

public var value: Int
public var identity: Int
Expand All @@ -171,29 +184,45 @@ public class MinimalHashableClass : Equatable, Hashable {
self.identity = identity
}

public static func == (
lhs: MinimalHashableClass,
rhs: MinimalHashableClass
) -> Bool {
MinimalHashableClass.timesEqualEqualWasCalled += 1
return MinimalHashableClass.equalImpl.value(lhs.value, rhs.value)
}

public var hashValue: Int {
MinimalHashableClass.timesHashValueWasCalled += 1
return MinimalHashableClass.hashValueImpl.value(value)
var hasher = _Hasher()
hasher.combine(self)
return hasher.finalize()
}

public func _hash(into hasher: inout _Hasher) {
MinimalHashableClass.timesHashIntoWasCalled += 1
MinimalHashableClass.hashIntoImpl.value(value, &hasher)
}
}

public func == (
lhs: MinimalHashableClass,
rhs: MinimalHashableClass
) -> Bool {
MinimalHashableClass.timesEqualEqualWasCalled += 1
return MinimalHashableClass.equalImpl.value(lhs.value, rhs.value)
extension MinimalHashableClass: CustomStringConvertible {
public var description: String {
return "MinimalHashableClass(value: \(value), identity: \(identity))"
}
}



public var GenericMinimalHashableValue_timesEqualEqualWasCalled: Int = 0
public var GenericMinimalHashableValue_timesHashValueWasCalled: Int = 0
public var GenericMinimalHashableValue_timesHashIntoWasCalled: Int = 0

public var GenericMinimalHashableValue_equalImpl = ResettableValue<(Any, Any) -> Bool>(
{ _, _ in fatalError("GenericMinimalHashableValue_equalImpl is not set yet"); () })
public var GenericMinimalHashableValue_hashValueImpl = ResettableValue<(Any) -> Int>(
{ _ in fatalError("GenericMinimalHashableValue_hashValueImpl is not set yet"); () })
public var GenericMinimalHashableValue_equalImpl =
ResettableValue<(Any, Any) -> Bool>({ _, _ in
fatalError("GenericMinimalHashableValue_equalImpl is not set yet")
})
public var GenericMinimalHashableValue_hashIntoImpl =
ResettableValue<(Any, inout _Hasher) -> Void>({ _ in
fatalError("GenericMinimalHashableValue_hashIntoImpl is not set yet")
})

/// A type that conforms only to `Equatable` and `Hashable`.
///
Expand All @@ -213,28 +242,43 @@ public struct GenericMinimalHashableValue<Wrapped> : Equatable, Hashable {
self.identity = identity
}

public static func == <Wrapped>(
lhs: GenericMinimalHashableValue<Wrapped>,
rhs: GenericMinimalHashableValue<Wrapped>
) -> Bool {
GenericMinimalHashableValue_timesEqualEqualWasCalled += 1
return GenericMinimalHashableValue_equalImpl.value(lhs.value, rhs.value)
}

public var hashValue: Int {
GenericMinimalHashableValue_timesHashValueWasCalled += 1
return GenericMinimalHashableValue_hashValueImpl.value(value)
var hasher = _Hasher()
hasher.combine(self)
return hasher.finalize()
}
}

public func == <Wrapped>(
lhs: GenericMinimalHashableValue<Wrapped>,
rhs: GenericMinimalHashableValue<Wrapped>
) -> Bool {
GenericMinimalHashableValue_timesEqualEqualWasCalled += 1
return GenericMinimalHashableValue_equalImpl.value(lhs.value, rhs.value)
public func _hash(into hasher: inout _Hasher) {
GenericMinimalHashableValue_timesHashIntoWasCalled += 1
GenericMinimalHashableValue_hashIntoImpl.value(value, &hasher)
}
}

extension GenericMinimalHashableValue: CustomStringConvertible {
public var description: String {
return "GenericMinimalHashableValue(value: \(value), identity: \(identity))"
}
}

public var GenericMinimalHashableClass_timesEqualEqualWasCalled: Int = 0
public var GenericMinimalHashableClass_timesHashValueWasCalled: Int = 0
public var GenericMinimalHashableClass_timesHashIntoWasCalled: Int = 0

public var GenericMinimalHashableClass_equalImpl = ResettableValue<(Any, Any) -> Bool>(
{ _, _ in fatalError("GenericMinimalHashableClass_equalImpl is not set yet"); () })
public var GenericMinimalHashableClass_hashValueImpl = ResettableValue<(Any) -> Int>(
{ _ in fatalError("GenericMinimalHashableClass_hashValueImpl is not set yet"); () })
public var GenericMinimalHashableClass_equalImpl =
ResettableValue<(Any, Any) -> Bool>({ _, _ in
fatalError("GenericMinimalHashableClass_equalImpl is not set yet")
})
public var GenericMinimalHashableClass_hashIntoImpl =
ResettableValue<(Any, inout _Hasher) -> Void>({ _ in
fatalError("GenericMinimalHashableClass_hashIntoImpl is not set yet")
})

/// A type that conforms only to `Equatable` and `Hashable`.
///
Expand All @@ -254,18 +298,30 @@ public class GenericMinimalHashableClass<Wrapped> : Equatable, Hashable {
self.identity = identity
}

public static func == <Wrapped>(
lhs: GenericMinimalHashableClass<Wrapped>,
rhs: GenericMinimalHashableClass<Wrapped>
) -> Bool {
GenericMinimalHashableClass_timesEqualEqualWasCalled += 1
return GenericMinimalHashableClass_equalImpl.value(lhs.value, rhs.value)
}

public var hashValue: Int {
GenericMinimalHashableClass_timesHashValueWasCalled += 1
return GenericMinimalHashableClass_hashValueImpl.value(value)
var hasher = _Hasher()
hasher.combine(self)
return hasher.finalize()
}

public func _hash(into hasher: inout _Hasher) {
GenericMinimalHashableClass_timesHashIntoWasCalled += 1
GenericMinimalHashableClass_hashIntoImpl.value(value, &hasher)
}
}

public func == <Wrapped>(
lhs: GenericMinimalHashableClass<Wrapped>,
rhs: GenericMinimalHashableClass<Wrapped>
) -> Bool {
GenericMinimalHashableClass_timesEqualEqualWasCalled += 1
return GenericMinimalHashableClass_equalImpl.value(lhs.value, rhs.value)
extension GenericMinimalHashableClass: CustomStringConvertible {
public var description: String {
return "GenericMinimalHashableClass(value: \(value), identity: \(identity))"
}
}


Expand Down Expand Up @@ -299,6 +355,22 @@ public struct MinimalStrideableValue : Equatable, Comparable, Strideable {

public typealias Stride = Int

public static func == (
lhs: MinimalStrideableValue,
rhs: MinimalStrideableValue
) -> Bool {
MinimalStrideableValue.timesEqualEqualWasCalled.value += 1
return MinimalStrideableValue.equalImpl.value(lhs.value, rhs.value)
}

public static func < (
lhs: MinimalStrideableValue,
rhs: MinimalStrideableValue
) -> Bool {
MinimalStrideableValue.timesLessWasCalled.value += 1
return MinimalStrideableValue.lessImpl.value(lhs.value, rhs.value)
}

public func distance(to other: MinimalStrideableValue) -> Stride {
MinimalStrideableValue.timesDistanceWasCalled.value += 1
return other.value - self.value
Expand All @@ -310,21 +382,6 @@ public struct MinimalStrideableValue : Equatable, Comparable, Strideable {
}
}

public func == (
lhs: MinimalStrideableValue,
rhs: MinimalStrideableValue
) -> Bool {
MinimalStrideableValue.timesEqualEqualWasCalled.value += 1
return MinimalStrideableValue.equalImpl.value(lhs.value, rhs.value)
}

public func < (
lhs: MinimalStrideableValue,
rhs: MinimalStrideableValue
) -> Bool {
MinimalStrideableValue.timesLessWasCalled.value += 1
return MinimalStrideableValue.lessImpl.value(lhs.value, rhs.value)
}

// Local Variables:
// eval: (read-only-mode 1)
Expand Down
Loading