Skip to content

Commit e4d8408

Browse files
authored
Merge pull request #3844 from CodaFi/cleanup
Cleanup validation tests after SE-0089
2 parents 4a1d2e8 + 35fe7c7 commit e4d8408

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

validation-test/StdlibUnittest/RaceTest.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ struct RaceTest1 : RaceTestWithPerTrialData {
5555
case Observation(0x1):
5656
sink(.pass)
5757
case Observation(0x2):
58-
sink(.passInteresting(String(observation)))
58+
sink(.passInteresting(String(describing: observation)))
5959
case Observation(0xffff):
6060
sink(.failure)
6161
case Observation(0xfffe):
62-
sink(.failureInteresting(String(observation)))
62+
sink(.failureInteresting(String(describing: observation)))
6363
default:
6464
fatalError("should not happen")
6565
}

validation-test/stdlib/AtomicInt.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ struct AtomicInt_fetchAndAdd_1_RaceTest : RaceTestWithPerTrialData {
144144
Observation(2, 10, 20, 0, 40),
145145
Observation(2, 10, 20, 30, 0),
146146
Observation(2, 10, 20, 30, 40):
147-
sink(.passInteresting(String(observation)))
147+
sink(.passInteresting(String(describing: observation)))
148148

149149
default:
150-
sink(.failureInteresting(String(observation)))
150+
sink(.failureInteresting(String(describing: observation)))
151151
}
152152
}
153153
}
@@ -215,10 +215,10 @@ struct AtomicInt_fetchAndAdd_ReleaseAtomicStores_1_RaceTest
215215
Observation(2, 10, 20, 0, 0),
216216
Observation(2, 10, 20, 30, 0),
217217
Observation(2, 10, 20, 30, 40):
218-
sink(.passInteresting(String(observation)))
218+
sink(.passInteresting(String(describing: observation)))
219219

220220
default:
221-
sink(.failureInteresting(String(observation)))
221+
sink(.failureInteresting(String(describing: observation)))
222222
}
223223
}
224224
}
@@ -302,10 +302,10 @@ struct AtomicInt_fetchAndAdd_ReleaseAtomicStores_2_RaceTest
302302
Observation(2, 10, 20, 0, 0),
303303
Observation(2, 10, 20, 30, 0),
304304
Observation(2, 10, 20, 30, 40):
305-
sink(.passInteresting(String(observation)))
305+
sink(.passInteresting(String(describing: observation)))
306306

307307
default:
308-
sink(.failureInteresting(String(observation)))
308+
sink(.failureInteresting(String(describing: observation)))
309309
}
310310
}
311311
}
@@ -429,10 +429,10 @@ struct AtomicInt_fetchAndAdd_ReleaseNonAtomicStores_RaceTest
429429
Observation(2, 10, 20, 0, 0, 100, 200, 999, 999),
430430
Observation(2, 10, 20, 30, 0, 100, 200, 300, 999),
431431
Observation(2, 10, 20, 30, 40, 100, 200, 300, 400):
432-
sink(.passInteresting(String(observation)))
432+
sink(.passInteresting(String(describing: observation)))
433433

434434
default:
435-
sink(.failureInteresting(String(observation)))
435+
sink(.failureInteresting(String(describing: observation)))
436436
}
437437
}
438438
}
@@ -510,10 +510,10 @@ struct AtomicInt_fetchAndAnd_1_RaceTest : RaceTestWithPerTrialData {
510510
Observation(2, 8, 16, -4, 64),
511511
Observation(2, 8, 16, 32, -4),
512512
Observation(2, 8, 16, 32, 64):
513-
sink(.passInteresting(String(observation)))
513+
sink(.passInteresting(String(describing: observation)))
514514

515515
default:
516-
sink(.failureInteresting(String(observation)))
516+
sink(.failureInteresting(String(describing: observation)))
517517
}
518518
}
519519
}
@@ -591,10 +591,10 @@ struct AtomicInt_fetchAndOr_1_RaceTest : RaceTestWithPerTrialData {
591591
Observation(2, 11, 19, 3, 67),
592592
Observation(2, 11, 19, 35, 3),
593593
Observation(2, 11, 19, 35, 67):
594-
sink(.passInteresting(String(observation)))
594+
sink(.passInteresting(String(describing: observation)))
595595

596596
default:
597-
sink(.failureInteresting(String(observation)))
597+
sink(.failureInteresting(String(describing: observation)))
598598
}
599599
}
600600
}
@@ -672,10 +672,10 @@ struct AtomicInt_fetchAndXor_1_RaceTest : RaceTestWithPerTrialData {
672672
Observation(2, 10, 18, 3, 66),
673673
Observation(2, 10, 18, 34, 3),
674674
Observation(2, 10, 18, 34, 66):
675-
sink(.passInteresting(String(observation)))
675+
sink(.passInteresting(String(describing: observation)))
676676

677677
default:
678-
sink(.failureInteresting(String(observation)))
678+
sink(.failureInteresting(String(describing: observation)))
679679
}
680680
}
681681
}
@@ -773,7 +773,7 @@ struct AtomicInitializeARCRefRaceTest : RaceTestWithPerTrialData {
773773
// Lost race, value destroyed.
774774
lostRace += 1
775775
default:
776-
sink(.failureInteresting(String(observation)))
776+
sink(.failureInteresting(String(describing: observation)))
777777
}
778778
}
779779
if wonRace != 1 {

validation-test/stdlib/String.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@ StringTests.test("unicodeViews") {
10901090
// slices
10911091
// It is 4 bytes long, so it should return a replacement character.
10921092
expectEqual(
1093-
"\u{FFFD}", String(
1093+
"\u{FFFD}", String(describing:
10941094
winter.utf8[
10951095
winter.utf8.startIndex
10961096
..<

0 commit comments

Comments
 (0)