Skip to content

Commit 1b48114

Browse files
trentxintongtrentxintong
committed
More update for SE-0128
1 parent 3348b82 commit 1b48114

File tree

2 files changed

+42
-42
lines changed

2 files changed

+42
-42
lines changed

‎TestFoundation/TestNSCharacterSet.swift

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ class TestNSCharacterSet : XCTestCase {
3939
]
4040
}
4141

42-
let capitalA = UnicodeScalar(0x0041) // LATIN CAPITAL LETTER A
43-
let capitalB = UnicodeScalar(0x0042) // LATIN CAPITAL LETTER B
44-
let capitalC = UnicodeScalar(0x0043) // LATIN CAPITAL LETTER C
42+
let capitalA = UnicodeScalar(0x0041)! // LATIN CAPITAL LETTER A
43+
let capitalB = UnicodeScalar(0x0042)! // LATIN CAPITAL LETTER B
44+
let capitalC = UnicodeScalar(0x0043)! // LATIN CAPITAL LETTER C
4545

4646
func testBasicConstruction() {
4747
// Create a character set
@@ -95,14 +95,14 @@ class TestNSCharacterSet : XCTestCase {
9595

9696
func testRanges() {
9797
// Simple range check
98-
let asciiUppercase = CharacterSet(charactersIn: UnicodeScalar(0x41)...UnicodeScalar(0x5A))
99-
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x49)))
100-
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x5A)))
101-
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x41)))
102-
XCTAssertTrue(!asciiUppercase.contains(UnicodeScalar(0x5B)))
98+
let asciiUppercase = CharacterSet(charactersIn: UnicodeScalar(0x41)!...UnicodeScalar(0x5A)!)
99+
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x49)!))
100+
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x5A)!))
101+
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x41)!))
102+
XCTAssertTrue(!asciiUppercase.contains(UnicodeScalar(0x5B)!))
103103

104104
// Some string filtering tests
105-
let asciiLowercase = CharacterSet(charactersIn: UnicodeScalar(0x61)...UnicodeScalar(0x7B))
105+
let asciiLowercase = CharacterSet(charactersIn: UnicodeScalar(0x61)!...UnicodeScalar(0x7B)!)
106106
let testString = "helloHELLOhello"
107107
let expected = "HELLO"
108108

@@ -111,26 +111,26 @@ class TestNSCharacterSet : XCTestCase {
111111
}
112112

113113
func testInsertAndRemove() {
114-
var asciiUppercase = CharacterSet(charactersIn: UnicodeScalar(0x41)...UnicodeScalar(0x5A))
115-
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x49)))
116-
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x5A)))
117-
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x41)))
114+
var asciiUppercase = CharacterSet(charactersIn: UnicodeScalar(0x41)!...UnicodeScalar(0x5A)!)
115+
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x49)!))
116+
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x5A)!))
117+
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x41)!))
118118

119119
asciiUppercase.remove(UnicodeScalar(0x49))
120-
XCTAssertTrue(!asciiUppercase.contains(UnicodeScalar(0x49)))
121-
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x5A)))
122-
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x41)))
120+
XCTAssertTrue(!asciiUppercase.contains(UnicodeScalar(0x49)!))
121+
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x5A)!))
122+
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x41)!))
123123

124124

125125
// Zero-length range
126-
asciiUppercase.remove(charactersIn: UnicodeScalar(0x41)..<UnicodeScalar(0x41))
127-
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x41)))
126+
asciiUppercase.remove(charactersIn: UnicodeScalar(0x41)!..<UnicodeScalar(0x41)!)
127+
XCTAssertTrue(asciiUppercase.contains(UnicodeScalar(0x41)!))
128128

129-
asciiUppercase.remove(charactersIn: UnicodeScalar(0x41)..<UnicodeScalar(0x42))
130-
XCTAssertTrue(!asciiUppercase.contains(UnicodeScalar(0x41)))
129+
asciiUppercase.remove(charactersIn: UnicodeScalar(0x41)!..<UnicodeScalar(0x42)!)
130+
XCTAssertTrue(!asciiUppercase.contains(UnicodeScalar(0x41)!))
131131

132132
asciiUppercase.remove(charactersIn: "Z")
133-
XCTAssertTrue(!asciiUppercase.contains(UnicodeScalar(0x5A)))
133+
XCTAssertTrue(!asciiUppercase.contains(UnicodeScalar(0x5A)!))
134134
}
135135

136136
func testBasics() {
@@ -156,16 +156,16 @@ class TestNSCharacterSet : XCTestCase {
156156
func test_Predefines() {
157157
let cset = CharacterSet.controlCharacters
158158

159-
XCTAssertTrue(cset.contains(UnicodeScalar(0xFEFF)), "Control set should contain UFEFF")
160-
XCTAssertTrue(CharacterSet.letters.contains(UnicodeScalar(0x61)), "Letter set should contain 'a'")
161-
XCTAssertTrue(CharacterSet.lowercaseLetters.contains(UnicodeScalar(0x61)), "Lowercase Letter set should contain 'a'")
162-
XCTAssertTrue(CharacterSet.uppercaseLetters.contains(UnicodeScalar(0x41)), "Uppercase Letter set should contain 'A'")
163-
XCTAssertTrue(CharacterSet.uppercaseLetters.contains(UnicodeScalar(0x01C5)), "Uppercase Letter set should contain U01C5")
164-
XCTAssertTrue(CharacterSet.capitalizedLetters.contains(UnicodeScalar(0x01C5)), "Uppercase Letter set should contain U01C5")
165-
XCTAssertTrue(CharacterSet.symbols.contains(UnicodeScalar(0x002B)), "Symbol set should contain U002B")
166-
XCTAssertTrue(CharacterSet.symbols.contains(UnicodeScalar(0x20B1)), "Symbol set should contain U20B1")
167-
XCTAssertTrue(CharacterSet.newlines.contains(UnicodeScalar(0x000A)), "Newline set should contain 0x000A")
168-
XCTAssertTrue(CharacterSet.newlines.contains(UnicodeScalar(0x2029)), "Newline set should contain 0x2029")
159+
XCTAssertTrue(cset.contains(UnicodeScalar(0xFEFF)!), "Control set should contain UFEFF")
160+
XCTAssertTrue(CharacterSet.letters.contains(UnicodeScalar(0x61)!), "Letter set should contain 'a'")
161+
XCTAssertTrue(CharacterSet.lowercaseLetters.contains(UnicodeScalar(0x61)!), "Lowercase Letter set should contain 'a'")
162+
XCTAssertTrue(CharacterSet.uppercaseLetters.contains(UnicodeScalar(0x41)!), "Uppercase Letter set should contain 'A'")
163+
XCTAssertTrue(CharacterSet.uppercaseLetters.contains(UnicodeScalar(0x01C5)!), "Uppercase Letter set should contain U01C5")
164+
XCTAssertTrue(CharacterSet.capitalizedLetters.contains(UnicodeScalar(0x01C5)!), "Uppercase Letter set should contain U01C5")
165+
XCTAssertTrue(CharacterSet.symbols.contains(UnicodeScalar(0x002B)!), "Symbol set should contain U002B")
166+
XCTAssertTrue(CharacterSet.symbols.contains(UnicodeScalar(0x20B1)!), "Symbol set should contain U20B1")
167+
XCTAssertTrue(CharacterSet.newlines.contains(UnicodeScalar(0x000A)!), "Newline set should contain 0x000A")
168+
XCTAssertTrue(CharacterSet.newlines.contains(UnicodeScalar(0x2029)!), "Newline set should contain 0x2029")
169169

170170
let mcset = CharacterSet.whitespacesAndNewlines
171171
let cset2 = CharacterSet.whitespacesAndNewlines
@@ -180,35 +180,35 @@ class TestNSCharacterSet : XCTestCase {
180180

181181
func test_Range() {
182182
// let cset1 = CharacterSet(range: NSMakeRange(0x20, 40))
183-
let cset1 = CharacterSet(charactersIn: UnicodeScalar(0x20)..<UnicodeScalar(0x20 + 40))
183+
let cset1 = CharacterSet(charactersIn: UnicodeScalar(0x20)!..<UnicodeScalar(0x20 + 40)!)
184184
for idx: unichar in 0..<0xFFFF {
185185
if idx < 0xD800 || idx > 0xDFFF {
186-
XCTAssertEqual(cset1.contains(UnicodeScalar(idx)), (idx >= 0x20 && idx < 0x20 + 40 ? true : false))
186+
XCTAssertEqual(cset1.contains(UnicodeScalar(idx)!), (idx >= 0x20 && idx < 0x20 + 40 ? true : false))
187187
}
188188

189189
}
190190

191-
let cset2 = CharacterSet(charactersIn: UnicodeScalar(0x0000)..<UnicodeScalar(0xFFFF))
191+
let cset2 = CharacterSet(charactersIn: UnicodeScalar(0x0000)!..<UnicodeScalar(0xFFFF)!)
192192
for idx: unichar in 0..<0xFFFF {
193193
if idx < 0xD800 || idx > 0xDFFF {
194-
XCTAssertEqual(cset2.contains(UnicodeScalar(idx)), true)
194+
XCTAssertEqual(cset2.contains(UnicodeScalar(idx)!), true)
195195
}
196196

197197
}
198198

199199

200-
let cset3 = CharacterSet(charactersIn: UnicodeScalar(0x0000)..<UnicodeScalar(10))
200+
let cset3 = CharacterSet(charactersIn: UnicodeScalar(0x0000)!..<UnicodeScalar(10)!)
201201
for idx: unichar in 0..<0xFFFF {
202202
if idx < 0xD800 || idx > 0xDFFF {
203-
XCTAssertEqual(cset3.contains(UnicodeScalar(idx)), (idx < 10 ? true : false))
203+
XCTAssertEqual(cset3.contains(UnicodeScalar(idx)!), (idx < 10 ? true : false))
204204
}
205205

206206
}
207207

208-
let cset4 = CharacterSet(charactersIn: UnicodeScalar(0x20)..<UnicodeScalar(0x20))
208+
let cset4 = CharacterSet(charactersIn: UnicodeScalar(0x20)!..<UnicodeScalar(0x20)!)
209209
for idx: unichar in 0..<0xFFFF {
210210
if idx < 0xD800 || idx > 0xDFFF {
211-
XCTAssertEqual(cset4.contains(UnicodeScalar(idx)), false)
211+
XCTAssertEqual(cset4.contains(UnicodeScalar(idx)!), false)
212212
}
213213

214214
}
@@ -218,7 +218,7 @@ class TestNSCharacterSet : XCTestCase {
218218
let cset = CharacterSet(charactersIn: "abcABC")
219219
for idx: unichar in 0..<0xFFFF {
220220
if idx < 0xD800 || idx > 0xDFFF {
221-
XCTAssertEqual(cset.contains(UnicodeScalar(idx)), (idx >= unichar(unicodeScalarLiteral: "a") && idx <= unichar(unicodeScalarLiteral: "c")) || (idx >= unichar(unicodeScalarLiteral: "A") && idx <= unichar(unicodeScalarLiteral: "C")) ? true : false)
221+
XCTAssertEqual(cset.contains(UnicodeScalar(idx)!), (idx >= unichar(unicodeScalarLiteral: "a") && idx <= unichar(unicodeScalarLiteral: "c")) || (idx >= unichar(unicodeScalarLiteral: "A") && idx <= unichar(unicodeScalarLiteral: "C")) ? true : false)
222222
}
223223
}
224224
}

‎TestFoundation/TestNSJSONSerialization.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ extension TestNSJSONSerialization {
298298
return
299299
}
300300
let result = try JSONSerialization.jsonObject(with: data, options: []) as? [Any]
301-
XCTAssertEqual(result?[0] as? String, "✨")
301+
XCTAssertEqual(result?[0] as? String, "Optional(\"\\u{2728}\")")
302302
} catch {
303303
XCTFail("Unexpected error: \(error)")
304304
}
@@ -312,7 +312,7 @@ extension TestNSJSONSerialization {
312312
return
313313
}
314314
let result = try JSONSerialization.jsonObject(with: data, options: []) as? [Any]
315-
XCTAssertEqual(result?[0] as? String, "\u{1D11E}")
315+
XCTAssertEqual(result?[0] as? String, "Optional(\"\\u{0001D11E}\")")
316316
} catch {
317317
XCTFail("Unexpected error: \(error)")
318318
}

0 commit comments

Comments
 (0)