Skip to content

Commit f9d2c07

Browse files
Merge pull request #13084 from aschwaighofer/fix_stdlib_test_cases
stdlib: Fix test cases Dictionary.swift and Set.swift
2 parents 588ac6b + 48d11bd commit f9d2c07

File tree

2 files changed

+8
-24
lines changed

2 files changed

+8
-24
lines changed

validation-test/stdlib/Dictionary.swift

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3192,9 +3192,7 @@ DictionaryTestSuite.test("BridgedToObjC.Verbatim.KeyEnumerator.FastEnumeration.U
31923192
{ ($0 as! TestObjCKeyTy).value },
31933193
{ ($0 as! TestObjCValueTy).value })
31943194

3195-
let autoreleased = _isDebugAssertConfiguration() ?
3196-
(0, 0) : (3, 3)
3197-
expectAutoreleasedKeysAndValues(opt: autoreleased, unopt: (3, 3))
3195+
expectAutoreleasedKeysAndValues(unopt: (3, 3))
31983196
}
31993197

32003198
DictionaryTestSuite.test("BridgedToObjC.Verbatim.KeyEnumerator.FastEnumeration.UseFromObjC") {
@@ -3206,9 +3204,7 @@ DictionaryTestSuite.test("BridgedToObjC.Verbatim.KeyEnumerator.FastEnumeration.U
32063204
{ ($0 as! TestObjCKeyTy).value },
32073205
{ ($0 as! TestObjCValueTy).value })
32083206

3209-
let autoreleased = _isDebugAssertConfiguration() ?
3210-
(0, 0) : (3, 3)
3211-
expectAutoreleasedKeysAndValues(opt: autoreleased, unopt: (3, 3))
3207+
expectAutoreleasedKeysAndValues(unopt: (3, 3))
32123208
}
32133209

32143210
DictionaryTestSuite.test("BridgedToObjC.Verbatim.KeyEnumerator.FastEnumeration_Empty") {
@@ -3293,9 +3289,7 @@ DictionaryTestSuite.test("BridgedToObjC.Custom.KeyEnumerator.FastEnumeration.Use
32933289
{ ($0 as! TestObjCKeyTy).value },
32943290
{ ($0 as! TestObjCValueTy).value })
32953291

3296-
let autoreleased = _isDebugAssertConfiguration() ?
3297-
(0, 0) : (3, 3)
3298-
expectAutoreleasedKeysAndValues(opt: autoreleased, unopt: (3, 3))
3292+
expectAutoreleasedKeysAndValues(unopt: (3, 3))
32993293
}
33003294

33013295
DictionaryTestSuite.test("BridgedToObjC.Custom.KeyEnumerator.FastEnumeration.UseFromSwift.Partial") {
@@ -3321,9 +3315,7 @@ DictionaryTestSuite.test("BridgedToObjC.Custom.KeyEnumerator.FastEnumeration.Use
33213315
{ ($0 as! TestObjCKeyTy).value },
33223316
{ ($0 as! TestObjCValueTy).value })
33233317

3324-
let autoreleased = _isDebugAssertConfiguration() ?
3325-
(0, 0) : (3, 3)
3326-
expectAutoreleasedKeysAndValues(opt: autoreleased, unopt: (3, 3))
3318+
expectAutoreleasedKeysAndValues(unopt: (3, 3))
33273319
}
33283320

33293321
DictionaryTestSuite.test("BridgedToObjC.Custom.FastEnumeration.UseFromSwift") {

validation-test/stdlib/Set.swift

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2209,9 +2209,7 @@ SetTestSuite.test("BridgedToObjC.Verbatim.ObjectEnumerator.FastEnumeration.UseFr
22092209
s, { s.objectEnumerator() },
22102210
{ ($0 as! TestObjCKeyTy).value })
22112211

2212-
let autoreleased = _isDebugAssertConfiguration() ?
2213-
(0, 0) : (3, 0)
2214-
expectAutoreleasedKeysAndValues(opt: autoreleased, unopt: (3, 0))
2212+
expectAutoreleasedKeysAndValues(unopt: (3, 0))
22152213
}
22162214

22172215
SetTestSuite.test("BridgedToObjC.Verbatim.ObjectEnumerator.FastEnumeration.UseFromObjC") {
@@ -2222,9 +2220,7 @@ SetTestSuite.test("BridgedToObjC.Verbatim.ObjectEnumerator.FastEnumeration.UseFr
22222220
s, { s.objectEnumerator() },
22232221
{ ($0 as! TestObjCKeyTy).value })
22242222

2225-
let autoreleased = _isDebugAssertConfiguration() ?
2226-
(0, 0) : (3, 0)
2227-
expectAutoreleasedKeysAndValues(opt: autoreleased, unopt: (3, 0))
2223+
expectAutoreleasedKeysAndValues(unopt: (3, 0))
22282224
}
22292225

22302226
SetTestSuite.test("BridgedToObjC.Verbatim.ObjectEnumerator.FastEnumeration_Empty") {
@@ -2247,9 +2243,7 @@ SetTestSuite.test("BridgedToObjC.Custom.ObjectEnumerator.FastEnumeration.UseFrom
22472243
s, { s.objectEnumerator() },
22482244
{ ($0 as! TestObjCKeyTy).value })
22492245

2250-
let autoreleased = _isDebugAssertConfiguration() ?
2251-
(0, 0) : (3, 0)
2252-
expectAutoreleasedKeysAndValues(opt: autoreleased, unopt: (3, 0))
2246+
expectAutoreleasedKeysAndValues(unopt: (3, 0))
22532247
}
22542248

22552249
SetTestSuite.test("BridgedToObjC.Custom.ObjectEnumerator.FastEnumeration.UseFromSwift") {
@@ -2260,9 +2254,7 @@ SetTestSuite.test("BridgedToObjC.Custom.ObjectEnumerator.FastEnumeration.UseFrom
22602254
s, { s.objectEnumerator() },
22612255
{ ($0 as! TestObjCKeyTy).value })
22622256

2263-
let autoreleased = _isDebugAssertConfiguration() ?
2264-
(0, 0) : (3, 0)
2265-
expectAutoreleasedKeysAndValues(opt: autoreleased, unopt: (3, 0))
2257+
expectAutoreleasedKeysAndValues(unopt: (3, 0))
22662258
}
22672259

22682260
SetTestSuite.test("BridgedToObjC.Verbatim.FastEnumeration.UseFromSwift") {

0 commit comments

Comments
 (0)