Skip to content

Commit da8a087

Browse files
committed
Update tests to match new expectations everywhere
1 parent cb03a45 commit da8a087

File tree

2 files changed

+0
-16
lines changed

2 files changed

+0
-16
lines changed

test/stdlib/BridgeEquatableToObjC.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,7 @@ BridgeEquatableToObjC.test("Bridge equatable struct") {
3232
let objcResult = objcA.isEqual(objcB)
3333

3434
expectEqual(swiftResult, true)
35-
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
36-
// Apple platforms use old semantics for now...
37-
expectEqual(objcResult, false)
38-
#else
3935
expectEqual(objcResult, true)
40-
#endif
4136
}
4237

4338
BridgeEquatableToObjC.test("Bridge non-equatable struct") {

test/stdlib/SwiftValueNSObject.swift

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,7 @@ func TestHashableEquals<T: Equatable>(_ e1: T, _ e2: T) {
9090
// This has not always been true for Equatable value types
9191
func TestEquatableEquals<T: Equatable>(_ e1: T, _ e2: T) {
9292
if e1 == e2 {
93-
#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
94-
// Legacy: Swift Equatable is not used in ObjC
95-
TestSwiftValueNSObjectNotEquals(e1 as AnyObject, e2 as AnyObject)
96-
#else
9793
TestSwiftValueNSObjectEquals(e1 as AnyObject, e2 as AnyObject)
98-
#endif
9994
} else {
10095
TestSwiftValueNSObjectNotEquals(e1 as AnyObject, e2 as AnyObject)
10196
}
@@ -114,14 +109,8 @@ func TestHashable<T: Hashable>(_ h: T)
114109
// Test Obj-C hashValue for Swift types that are Equatable but not Hashable
115110
func TestEquatableHash<T: Equatable>(_ e: T)
116111
{
117-
#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(visionOS)
118-
// Legacy behavior used the pointer value, which is
119-
// incompatible with user-defined equality.
120-
TestSwiftValueNSObjectDefaultHashValue(e as AnyObject)
121-
#else
122112
// New behavior uses a constant hash value in this case
123113
TestSwiftValueNSObjectHashValue(e as AnyObject, 1)
124-
#endif
125114
}
126115

127116
func TestNonEquatableHash<T>(_ e: T)

0 commit comments

Comments
 (0)