@@ -107,20 +107,20 @@ func expectEqualCString(_ lhs: UnsafePointer<UInt8>,
107
107
}
108
108
}
109
109
110
- CStringTests . test ( " String.init(validatingUTF8 :) " ) {
110
+ CStringTests . test ( " String.init(validatingCString :) " ) {
111
111
do {
112
112
let ( s, dealloc) = getASCIIUTF8 ( )
113
- expectEqual ( " ab " , String ( validatingUTF8 : bindAsCChar ( s) ) )
113
+ expectEqual ( " ab " , String ( validatingCString : bindAsCChar ( s) ) )
114
114
dealloc ( )
115
115
}
116
116
do {
117
117
let ( s, dealloc) = getNonASCIIUTF8 ( )
118
- expectEqual ( " аб " , String ( validatingUTF8 : bindAsCChar ( s) ) )
118
+ expectEqual ( " аб " , String ( validatingCString : bindAsCChar ( s) ) )
119
119
dealloc ( )
120
120
}
121
121
do {
122
122
let ( s, dealloc) = getIllFormedUTF8String1 ( )
123
- expectNil ( String ( validatingUTF8 : bindAsCChar ( s) ) )
123
+ expectNil ( String ( validatingCString : bindAsCChar ( s) ) )
124
124
dealloc ( )
125
125
}
126
126
}
@@ -324,14 +324,14 @@ CStringTests.test("String.cString.with.inout.CChar.conversion") {
324
324
expectUnreachable ( )
325
325
}
326
326
327
- CStringTests . test ( " String.validatingUTF8 .with.Array.input " ) {
327
+ CStringTests . test ( " String.validatingCString .with.Array.input " ) {
328
328
guard #available( SwiftStdlib 5 . 7 , * ) else { return }
329
329
do {
330
330
let ( u8p, dealloc) = getASCIIUTF8 ( )
331
331
defer { dealloc ( ) }
332
332
let buffer = UnsafeBufferPointer ( start: u8p, count: getUTF8Length ( u8p) + 1 )
333
333
let str = buffer. withMemoryRebound ( to: CChar . self) {
334
- String ( validatingUTF8 : Array ( $0) )
334
+ String ( validatingCString : Array ( $0) )
335
335
}
336
336
expectNotNil ( str)
337
337
str? . withCString {
@@ -344,41 +344,41 @@ CStringTests.test("String.validatingUTF8.with.Array.input") {
344
344
// no need to test every case; that is covered in other tests
345
345
expectCrashLater (
346
346
// Workaround for https://github.com/apple/swift/issues/58362 (rdar://91365967)
347
- // withMessage: "input of String.init(validatingUTF8 :) must be null-terminated"
347
+ // withMessage: "input of String.init(validatingCString :) must be null-terminated"
348
348
)
349
- _ = String ( validatingUTF8 : [ ] )
349
+ _ = String ( validatingCString : [ ] )
350
350
expectUnreachable ( )
351
351
}
352
352
353
- CStringTests . test ( " String.validatingUTF8 .with.String.input " ) {
353
+ CStringTests . test ( " String.validatingCString .with.String.input " ) {
354
354
guard #available( SwiftStdlib 5 . 7 , * ) else { return }
355
355
let ( u8p, dealloc) = getASCIIUTF8 ( )
356
356
defer { dealloc ( ) }
357
- var str = String ( validatingUTF8 : " ab " )
357
+ var str = String ( validatingCString : " ab " )
358
358
expectNotNil ( str)
359
359
str? . withCString {
360
360
$0. withMemoryRebound ( to: UInt8 . self, capacity: getUTF8Length ( u8p) + 1 ) {
361
361
expectEqualCString ( u8p, $0)
362
362
}
363
363
}
364
- str = String ( validatingUTF8 : " " )
364
+ str = String ( validatingCString : " " )
365
365
expectNotNil ( str)
366
366
expectEqual ( str? . isEmpty, true )
367
367
}
368
368
369
- CStringTests . test ( " String.validatingUTF8 .with.inout.conversion " ) {
369
+ CStringTests . test ( " String.validatingCString .with.inout.conversion " ) {
370
370
guard #available( SwiftStdlib 5 . 7 , * ) else { return }
371
371
var c = CChar . zero
372
- var str = String ( validatingUTF8 : & c)
372
+ var str = String ( validatingCString : & c)
373
373
expectNotNil ( str)
374
374
expectEqual ( str? . isEmpty, true )
375
375
c = 100
376
376
guard enableCrashTests else { return }
377
377
expectCrashLater (
378
378
// Workaround for https://github.com/apple/swift/issues/58362 (rdar://91365967)
379
- // withMessage: "input of String.init(validatingUTF8 :) must be null-terminated"
379
+ // withMessage: "input of String.init(validatingCString :) must be null-terminated"
380
380
)
381
- str = String ( validatingUTF8 : & c)
381
+ str = String ( validatingCString : & c)
382
382
expectUnreachable ( )
383
383
}
384
384
0 commit comments