Make the NormalizationCheck test compare code units

Lance Parker · Lance Parker · commit 17187344dfec · 2018-11-16T14:43:04.000-08:00
diff --git a/validation-test/stdlib/String.swift b/validation-test/stdlib/String.swift
@@ -2190,10 +2190,12 @@ StringTests.test("NormalizationBufferCrashRegressionTest") {
   expectTrue(set.contains(str))
 }
 
-StringTests.test("NormalizationSanityCheck") {
+StringTests.test("NormalizationCheck") {
   let str = "\u{0336}\u{0344}\u{0357}\u{0343}\u{0314}\u{0351}\u{0340}\u{0300}\u{0340}\u{0360}\u{0314}\u{0357}\u{0315}\u{0301}\u{0344}a"
-  let strNFC = "\u{0336}\u{0308}\u{0301}\u{0357}\u{0313}\u{0314}\u{0351}\u{0300}\u{0300}\u{0300}\u{0314}\u{0357}\u{0301}\u{0308}\u{0301}\u{0315}\u{0360}\u{0061}"
-  expectEqual(str, strNFC)
+  let nfcCodeUnits = str._nfcCodeUnits
+  let expectedCodeUnits: [UInt8] = [0xCC, 0xB6, 0xCC, 0x88, 0xCC, 0x81, 0xCD, 0x97, 0xCC, 0x93, 0xCC, 0x94, 0xCD, 0x91, 0xCC, 0x80, 0xCC, 0x80, 0xCC, 0x80, 0xCC, 0x94, 0xCD, 0x97, 0xCC, 0x81, 0xCC, 0x88, 0xCC, 0x81, 0xCC, 0x95, 0xCD, 0xA0, 0x61]
+  
+  expectEqual(expectedCodeUnits, nfcCodeUnits)
 }
 
 runAllTests()

Original file line number	Diff line number	Diff line change
`@@ -2190,10 +2190,12 @@ StringTests.test("NormalizationBufferCrashRegressionTest") {`
`2190`	`2190`	`expectTrue(set.contains(str))`
`2191`	`2191`	`}`
`2192`	`2192`
`2193`		`-StringTests.test("NormalizationSanityCheck") {`
	`2193`	`+StringTests.test("NormalizationCheck") {`
`2194`	`2194`	`let str = "\u{0336}\u{0344}\u{0357}\u{0343}\u{0314}\u{0351}\u{0340}\u{0300}\u{0340}\u{0360}\u{0314}\u{0357}\u{0315}\u{0301}\u{0344}a"`
`2195`		`- let strNFC = "\u{0336}\u{0308}\u{0301}\u{0357}\u{0313}\u{0314}\u{0351}\u{0300}\u{0300}\u{0300}\u{0314}\u{0357}\u{0301}\u{0308}\u{0301}\u{0315}\u{0360}\u{0061}"`
`2196`		`- expectEqual(str, strNFC)`
	`2195`	`+ let nfcCodeUnits = str._nfcCodeUnits`
	`2196`	`+ let expectedCodeUnits: [UInt8] = [0xCC, 0xB6, 0xCC, 0x88, 0xCC, 0x81, 0xCD, 0x97, 0xCC, 0x93, 0xCC, 0x94, 0xCD, 0x91, 0xCC, 0x80, 0xCC, 0x80, 0xCC, 0x80, 0xCC, 0x94, 0xCD, 0x97, 0xCC, 0x81, 0xCC, 0x88, 0xCC, 0x81, 0xCC, 0x95, 0xCD, 0xA0, 0x61]`
	`2197`	`+`
	`2198`	`+ expectEqual(expectedCodeUnits, nfcCodeUnits)`
`2197`	`2199`	`}`
`2198`	`2200`
`2199`	`2201`	`runAllTests()`