averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[test] replace uses of String(validatingUTF8:)

Browse Source 
- use the new name `String(validatingCString:)`
This commit is contained in:
Guillaume Lessard
2023-09-10 19:34:50 -07:00
parent 0c916f507d
commit c30307e21f
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
test/stdlib/StringAPICString.swift
View File

@@ -107,20 +107,20 @@ func expectEqualCString(_ lhs: UnsafePointer<UInt8>,
}
}
CStringTests.test("String.init(validatingUTF8:)") {
CStringTests.test("String.init(validatingCString:)") {
do {
let (s, dealloc) = getASCIIUTF8()
expectEqual("ab", String(validatingUTF8: bindAsCChar(s)))
expectEqual("ab", String(validatingCString: bindAsCChar(s)))
dealloc()
}
do {
let (s, dealloc) = getNonASCIIUTF8()
expectEqual("аб", String(validatingUTF8: bindAsCChar(s)))
expectEqual("аб", String(validatingCString: bindAsCChar(s)))
dealloc()
}
do {
let (s, dealloc) = getIllFormedUTF8String1()
expectNil(String(validatingUTF8: bindAsCChar(s)))
expectNil(String(validatingCString: bindAsCChar(s)))
dealloc()
}
}
@@ -324,14 +324,14 @@ CStringTests.test("String.cString.with.inout.CChar.conversion") {
expectUnreachable()
}
CStringTests.test("String.validatingUTF8.with.Array.input") {
CStringTests.test("String.validatingCString.with.Array.input") {
guard #available(SwiftStdlib 5.7, *) else { return }
do {
let (u8p, dealloc) = getASCIIUTF8()
defer { dealloc() }
let buffer = UnsafeBufferPointer(start: u8p, count: getUTF8Length(u8p)+1)
let str = buffer.withMemoryRebound(to: CChar.self) {
String(validatingUTF8: Array($0))
String(validatingCString: Array($0))
}
expectNotNil(str)
str?.withCString {
@@ -344,41 +344,41 @@ CStringTests.test("String.validatingUTF8.with.Array.input") {
// no need to test every case; that is covered in other tests
expectCrashLater(
// Workaround for https://github.com/apple/swift/issues/58362 (rdar://91365967)
// withMessage: "input of String.init(validatingUTF8:) must be null-terminated"
// withMessage: "input of String.init(validatingCString:) must be null-terminated"
)
_ = String(validatingUTF8: [])
_ = String(validatingCString: [])
expectUnreachable()
}
CStringTests.test("String.validatingUTF8.with.String.input") {
CStringTests.test("String.validatingCString.with.String.input") {
guard #available(SwiftStdlib 5.7, *) else { return }
let (u8p, dealloc) = getASCIIUTF8()
defer { dealloc() }
var str = String(validatingUTF8: "ab")
var str = String(validatingCString: "ab")
expectNotNil(str)
str?.withCString {
$0.withMemoryRebound(to: UInt8.self, capacity: getUTF8Length(u8p)+1) {
expectEqualCString(u8p, $0)
}
}
str = String(validatingUTF8: "")
str = String(validatingCString: "")
expectNotNil(str)
expectEqual(str?.isEmpty, true)
}
CStringTests.test("String.validatingUTF8.with.inout.conversion") {
CStringTests.test("String.validatingCString.with.inout.conversion") {
guard #available(SwiftStdlib 5.7, *) else { return }
var c = CChar.zero
var str = String(validatingUTF8: &c)
var str = String(validatingCString: &c)
expectNotNil(str)
expectEqual(str?.isEmpty, true)
c = 100
guard enableCrashTests else { return }
expectCrashLater(
// Workaround for https://github.com/apple/swift/issues/58362 (rdar://91365967)
// withMessage: "input of String.init(validatingUTF8:) must be null-terminated"
// withMessage: "input of String.init(validatingCString:) must be null-terminated"
)
str = String(validatingUTF8: &c)
str = String(validatingCString: &c)
expectUnreachable()
}

4
test/stdlib/StringAPICStringDiagnostics.swift
View File

@@ -6,7 +6,7 @@ func checkStringOverloadCompilationDiagnostics() {
_ = String(cString: "string") // expected-warning {{'init(cString:)' is deprecated: Use a copy of the String argument}}
_ = String(validatingUTF8: "string") // expected-warning {{init(validatingUTF8:)' is deprecated: Use a copy of the String argument}}
_ = String(validatingCString: "string") // expected-warning {{init(validatingCString:)' is deprecated: Use a copy of the String argument}}
_ = String.decodeCString("string", as: Unicode.UTF8.self) // expected-warning {{'decodeCString(_:as:repairingInvalidCodeUnits:)' is deprecated: Use a copy of the String argument}}
@@ -23,7 +23,7 @@ func checkInoutConversionOverloadCompilationDiagnostics() {
_ = String(cString: &c) // expected-warning {{'init(cString:)' is deprecated: Use String(_ scalar: Unicode.Scalar)}}
_ = String(validatingUTF8: &c) // expected-warning {{init(validatingUTF8:)' is deprecated: Use String(_ scalar: Unicode.Scalar)}}
_ = String(validatingCString: &c) // expected-warning {{init(validatingCString:)' is deprecated: Use String(_ scalar: Unicode.Scalar)}}
var u = Unicode.UTF8.CodeUnit.zero