@@ -107,20 +107,20 @@ func expectEqualCString(_ lhs: UnsafePointer<UInt8>,
107107 }
108108}
109109
110- CStringTests . test ( " String.init(validatingUTF8 :) " ) {
110+ CStringTests . test ( " String.init(validatingCString :) " ) {
111111 do {
112112 let ( s, dealloc) = getASCIIUTF8 ( )
113- expectEqual ( " ab " , String ( validatingUTF8 : bindAsCChar ( s) ) )
113+ expectEqual ( " ab " , String ( validatingCString : bindAsCChar ( s) ) )
114114 dealloc ( )
115115 }
116116 do {
117117 let ( s, dealloc) = getNonASCIIUTF8 ( )
118- expectEqual ( " аб " , String ( validatingUTF8 : bindAsCChar ( s) ) )
118+ expectEqual ( " аб " , String ( validatingCString : bindAsCChar ( s) ) )
119119 dealloc ( )
120120 }
121121 do {
122122 let ( s, dealloc) = getIllFormedUTF8String1 ( )
123- expectNil ( String ( validatingUTF8 : bindAsCChar ( s) ) )
123+ expectNil ( String ( validatingCString : bindAsCChar ( s) ) )
124124 dealloc ( )
125125 }
126126}
@@ -324,14 +324,14 @@ CStringTests.test("String.cString.with.inout.CChar.conversion") {
324324 expectUnreachable ( )
325325}
326326
327- CStringTests . test ( " String.validatingUTF8 .with.Array.input " ) {
327+ CStringTests . test ( " String.validatingCString .with.Array.input " ) {
328328 guard #available( SwiftStdlib 5 . 7 , * ) else { return }
329329 do {
330330 let ( u8p, dealloc) = getASCIIUTF8 ( )
331331 defer { dealloc ( ) }
332332 let buffer = UnsafeBufferPointer ( start: u8p, count: getUTF8Length ( u8p) + 1 )
333333 let str = buffer. withMemoryRebound ( to: CChar . self) {
334- String ( validatingUTF8 : Array ( $0) )
334+ String ( validatingCString : Array ( $0) )
335335 }
336336 expectNotNil ( str)
337337 str? . withCString {
@@ -344,41 +344,41 @@ CStringTests.test("String.validatingUTF8.with.Array.input") {
344344 // no need to test every case; that is covered in other tests
345345 expectCrashLater (
346346 // 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"
348348 )
349- _ = String ( validatingUTF8 : [ ] )
349+ _ = String ( validatingCString : [ ] )
350350 expectUnreachable ( )
351351}
352352
353- CStringTests . test ( " String.validatingUTF8 .with.String.input " ) {
353+ CStringTests . test ( " String.validatingCString .with.String.input " ) {
354354 guard #available( SwiftStdlib 5 . 7 , * ) else { return }
355355 let ( u8p, dealloc) = getASCIIUTF8 ( )
356356 defer { dealloc ( ) }
357- var str = String ( validatingUTF8 : " ab " )
357+ var str = String ( validatingCString : " ab " )
358358 expectNotNil ( str)
359359 str? . withCString {
360360 $0. withMemoryRebound ( to: UInt8 . self, capacity: getUTF8Length ( u8p) + 1 ) {
361361 expectEqualCString ( u8p, $0)
362362 }
363363 }
364- str = String ( validatingUTF8 : " " )
364+ str = String ( validatingCString : " " )
365365 expectNotNil ( str)
366366 expectEqual ( str? . isEmpty, true )
367367}
368368
369- CStringTests . test ( " String.validatingUTF8 .with.inout.conversion " ) {
369+ CStringTests . test ( " String.validatingCString .with.inout.conversion " ) {
370370 guard #available( SwiftStdlib 5 . 7 , * ) else { return }
371371 var c = CChar . zero
372- var str = String ( validatingUTF8 : & c)
372+ var str = String ( validatingCString : & c)
373373 expectNotNil ( str)
374374 expectEqual ( str? . isEmpty, true )
375375 c = 100
376376 guard enableCrashTests else { return }
377377 expectCrashLater (
378378 // 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"
380380 )
381- str = String ( validatingUTF8 : & c)
381+ str = String ( validatingCString : & c)
382382 expectUnreachable ( )
383383}
384384
0 commit comments