Skip to content

Commit 309e564

Browse files
committed
[test] Set, Dictionary: skip tests for fixes not present in the 5.0 stdlib
1 parent 5704f9b commit 309e564

File tree

2 files changed

+37
-5
lines changed

2 files changed

+37
-5
lines changed

validation-test/stdlib/Dictionary.swift

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3003,7 +3003,11 @@ DictionaryTestSuite.test("BridgedFromObjC.Verbatim.RemoveAll") {
30033003
}
30043004
}
30053005

3006-
DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.RemoveAll") {
3006+
DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.RemoveAll")
3007+
.skip(
3008+
.stdlibOlderThan(.custom(1001.0),
3009+
reason: "https://github.com/apple/swift/pull/22527"))
3010+
.code {
30073011
do {
30083012
var d = getBridgedNonverbatimDictionary([:])
30093013
assert(isNativeDictionary(d))
@@ -3297,7 +3301,11 @@ DictionaryTestSuite.test("BridgedFromObjC.Verbatim.EqualityTest_Empty") {
32973301
assert(identity2 == d2._rawIdentifier())
32983302
}
32993303

3300-
DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.EqualityTest_Empty") {
3304+
DictionaryTestSuite.test("BridgedFromObjC.Nonverbatim.EqualityTest_Empty")
3305+
.skip(
3306+
.stdlibOlderThan(.custom(1001.0),
3307+
reason: "https://github.com/apple/swift/pull/22527"))
3308+
.code {
33013309
let d1 = getBridgedNonverbatimEquatableDictionary([:])
33023310
let identity1 = d1._rawIdentifier()
33033311
assert(isNativeDictionary(d1))

validation-test/stdlib/Set.swift

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1918,7 +1918,11 @@ SetTestSuite.test("BridgedFromObjC.Nonverbatim.Remove")
19181918
}
19191919
}
19201920

1921-
SetTestSuite.test("BridgedFromObjC.Verbatim.RemoveAll") {
1921+
SetTestSuite.test("BridgedFromObjC.Verbatim.RemoveAll")
1922+
.skip(
1923+
.stdlibOlderThan(.custom(1001.0),
1924+
reason: "https://github.com/apple/swift/pull/22527"))
1925+
.code {
19221926
do {
19231927
var s = getBridgedVerbatimSet([])
19241928
expectTrue(isCocoaSet(s))
@@ -2173,7 +2177,11 @@ SetTestSuite.test("BridgedFromObjC.Verbatim.EqualityTest_Empty") {
21732177
expectNotEqual(s1, s2)
21742178
}
21752179

2176-
SetTestSuite.test("BridgedFromObjC.Nonverbatim.EqualityTest_Empty") {
2180+
SetTestSuite.test("BridgedFromObjC.Nonverbatim.EqualityTest_Empty")
2181+
.skip(
2182+
.stdlibOlderThan(.custom(1001.0),
2183+
reason: "https://github.com/apple/swift/pull/22527"))
2184+
.code {
21772185
let s1 = getBridgedNonverbatimSet([])
21782186
let identity1 = s1._rawIdentifier()
21792187
expectTrue(isNativeSet(s1))
@@ -4618,6 +4626,9 @@ SetTestSuite.test("IndexValidation.RemoveAt.AfterGrow") {
46184626

46194627
#if _runtime(_ObjC)
46204628
SetTestSuite.test("ForcedNonverbatimBridge.Trap.String")
4629+
.skip(
4630+
.stdlibOlderThan(.custom(1001.0),
4631+
reason: "https://github.com/apple/swift/pull/23174"))
46214632
.skip(.custom(
46224633
{ _isFastAssertConfiguration() },
46234634
reason: "this trap is not guaranteed to happen in -Ounchecked"))
@@ -4639,6 +4650,9 @@ SetTestSuite.test("ForcedNonverbatimBridge.Trap.String")
46394650

46404651
#if _runtime(_ObjC)
46414652
SetTestSuite.test("ForcedNonverbatimBridge.Trap.Int")
4653+
.skip(
4654+
.stdlibOlderThan(.custom(1001.0),
4655+
reason: "https://github.com/apple/swift/pull/23174"))
46424656
.skip(.custom(
46434657
{ _isFastAssertConfiguration() },
46444658
reason: "this trap is not guaranteed to happen in -Ounchecked"))
@@ -4769,6 +4783,9 @@ SetTestSuite.test("ForcedVerbatimDowncast.Trap.Int")
47694783

47704784
#if _runtime(_ObjC)
47714785
SetTestSuite.test("ForcedBridgingNonverbatimDowncast.Trap.String")
4786+
.skip(
4787+
.stdlibOlderThan(.custom(1001.0),
4788+
reason: "https://github.com/apple/swift/pull/23174"))
47724789
.skip(.custom(
47734790
{ _isFastAssertConfiguration() },
47744791
reason: "this trap is not guaranteed to happen in -Ounchecked"))
@@ -4790,6 +4807,9 @@ SetTestSuite.test("ForcedBridgingNonverbatimDowncast.Trap.String")
47904807

47914808
#if _runtime(_ObjC)
47924809
SetTestSuite.test("ForcedBridgingNonverbatimDowncast.Trap.Int")
4810+
.skip(
4811+
.stdlibOlderThan(.custom(1001.0),
4812+
reason: "https://github.com/apple/swift/pull/23174"))
47934813
.skip(.custom(
47944814
{ _isFastAssertConfiguration() },
47954815
reason: "this trap is not guaranteed to happen in -Ounchecked"))
@@ -4811,7 +4831,11 @@ SetTestSuite.test("ForcedBridgingNonverbatimDowncast.Trap.Int")
48114831
#endif
48124832

48134833
#if _runtime(_ObjC)
4814-
SetTestSuite.test("Upcast.StringEqualityMismatch") {
4834+
SetTestSuite.test("Upcast.StringEqualityMismatch")
4835+
.skip(
4836+
.stdlibOlderThan(.custom(1001.0),
4837+
reason: "https://github.com/apple/swift/pull/23683"))
4838+
.code {
48154839
// Upcasting from NSString to String keys changes their concept of equality,
48164840
// resulting in two equal keys, one of which should be discarded by the
48174841
// downcast. (Along with its associated value.)

0 commit comments

Comments
 (0)