Skip to content

Cleanup validation tests after SE-0089 #3844

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 1 commit into from
Jul 29, 2016
Merged

Cleanup validation tests after SE-0089 #3844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions validation-test/StdlibUnittest/RaceTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ struct RaceTest1 : RaceTestWithPerTrialData {
case Observation(0x1):
sink(.pass)
case Observation(0x2):
sink(.passInteresting(String(observation)))
sink(.passInteresting(String(describing: observation)))
case Observation(0xffff):
sink(.failure)
case Observation(0xfffe):
sink(.failureInteresting(String(observation)))
sink(.failureInteresting(String(describing: observation)))
default:
fatalError("should not happen")
}
Expand Down
30 changes: 15 additions & 15 deletions validation-test/stdlib/AtomicInt.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ struct AtomicInt_fetchAndAdd_1_RaceTest : RaceTestWithPerTrialData {
Observation(2, 10, 20, 0, 40),
Observation(2, 10, 20, 30, 0),
Observation(2, 10, 20, 30, 40):
sink(.passInteresting(String(observation)))
sink(.passInteresting(String(describing: observation)))

default:
sink(.failureInteresting(String(observation)))
sink(.failureInteresting(String(describing: observation)))
}
}
}
Expand Down Expand Up @@ -215,10 +215,10 @@ struct AtomicInt_fetchAndAdd_ReleaseAtomicStores_1_RaceTest
Observation(2, 10, 20, 0, 0),
Observation(2, 10, 20, 30, 0),
Observation(2, 10, 20, 30, 40):
sink(.passInteresting(String(observation)))
sink(.passInteresting(String(describing: observation)))

default:
sink(.failureInteresting(String(observation)))
sink(.failureInteresting(String(describing: observation)))
}
}
}
Expand Down Expand Up @@ -302,10 +302,10 @@ struct AtomicInt_fetchAndAdd_ReleaseAtomicStores_2_RaceTest
Observation(2, 10, 20, 0, 0),
Observation(2, 10, 20, 30, 0),
Observation(2, 10, 20, 30, 40):
sink(.passInteresting(String(observation)))
sink(.passInteresting(String(describing: observation)))

default:
sink(.failureInteresting(String(observation)))
sink(.failureInteresting(String(describing: observation)))
}
}
}
Expand Down Expand Up @@ -429,10 +429,10 @@ struct AtomicInt_fetchAndAdd_ReleaseNonAtomicStores_RaceTest
Observation(2, 10, 20, 0, 0, 100, 200, 999, 999),
Observation(2, 10, 20, 30, 0, 100, 200, 300, 999),
Observation(2, 10, 20, 30, 40, 100, 200, 300, 400):
sink(.passInteresting(String(observation)))
sink(.passInteresting(String(describing: observation)))

default:
sink(.failureInteresting(String(observation)))
sink(.failureInteresting(String(describing: observation)))
}
}
}
Expand Down Expand Up @@ -510,10 +510,10 @@ struct AtomicInt_fetchAndAnd_1_RaceTest : RaceTestWithPerTrialData {
Observation(2, 8, 16, -4, 64),
Observation(2, 8, 16, 32, -4),
Observation(2, 8, 16, 32, 64):
sink(.passInteresting(String(observation)))
sink(.passInteresting(String(describing: observation)))

default:
sink(.failureInteresting(String(observation)))
sink(.failureInteresting(String(describing: observation)))
}
}
}
Expand Down Expand Up @@ -591,10 +591,10 @@ struct AtomicInt_fetchAndOr_1_RaceTest : RaceTestWithPerTrialData {
Observation(2, 11, 19, 3, 67),
Observation(2, 11, 19, 35, 3),
Observation(2, 11, 19, 35, 67):
sink(.passInteresting(String(observation)))
sink(.passInteresting(String(describing: observation)))

default:
sink(.failureInteresting(String(observation)))
sink(.failureInteresting(String(describing: observation)))
}
}
}
Expand Down Expand Up @@ -672,10 +672,10 @@ struct AtomicInt_fetchAndXor_1_RaceTest : RaceTestWithPerTrialData {
Observation(2, 10, 18, 3, 66),
Observation(2, 10, 18, 34, 3),
Observation(2, 10, 18, 34, 66):
sink(.passInteresting(String(observation)))
sink(.passInteresting(String(describing: observation)))

default:
sink(.failureInteresting(String(observation)))
sink(.failureInteresting(String(describing: observation)))
}
}
}
Expand Down Expand Up @@ -773,7 +773,7 @@ struct AtomicInitializeARCRefRaceTest : RaceTestWithPerTrialData {
// Lost race, value destroyed.
lostRace += 1
default:
sink(.failureInteresting(String(observation)))
sink(.failureInteresting(String(describing: observation)))
}
}
if wonRace != 1 {
Expand Down
2 changes: 1 addition & 1 deletion validation-test/stdlib/String.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,7 +1090,7 @@ StringTests.test("unicodeViews") {
// slices
// It is 4 bytes long, so it should return a replacement character.
expectEqual(
"\u{FFFD}", String(
"\u{FFFD}", String(describing:
winter.utf8[
winter.utf8.startIndex
..<
Expand Down