Convert String tests

Author: jmschonfeld

Tests/FoundationInternationalizationTests/StringTests+Data.swift renamed to Tests/FoundationInternationalizationTests/StringICUEncodingTests.swift

@@ -10,36 +10,34 @@
 //
 //===----------------------------------------------------------------------===//
 
+import Testing
+
 #if FOUNDATION_FRAMEWORK
 @testable import Foundation
 #else
 @testable import FoundationEssentials
 @testable import FoundationInternationalization
 #endif // FOUNDATION_FRAMEWORK
 
-#if canImport(TestSupport)
-import TestSupport
-#endif
-
-final class StringConverterTests: XCTestCase {
+@Suite("String (ICU Encoding)")
+private struct StringICUEncodingTests {
     private func _test_roundTripConversion(
         string: String,
         data: Data,
-        encoding: String._Encoding,
-        file: StaticString = #filePath,
-        line: UInt = #line
+        encoding: String.Encoding,
+        sourceLocation: SourceLocation = #_sourceLocation
     ) {
-        XCTAssertEqual(
-            string.data(using: encoding), data, "Failed to convert string to data.",
-            file: file, line: line
+        #expect(
+            string.data(using: encoding) == data, "Failed to convert string to data.",
+            sourceLocation: sourceLocation
         )
-        XCTAssertEqual(
-            string, String(data: data, encoding: encoding), "Failed to convert data to string.",
-            file: file, line: line
+        #expect(
+            string == String(data: data, encoding: encoding), "Failed to convert data to string.",
+            sourceLocation: sourceLocation
         )
     }
 
-    func test_japaneseEUC() {
+    @Test func japaneseEUC() {
         // Confirm that https://github.com/swiftlang/swift-foundation/issues/1016 is fixed.
 
         // ASCII
@@ -117,22 +115,22 @@ final class StringConverterTests: XCTestCase {
         // Unsupported characters
         let onsen = "Onsen♨" // BMP emoji
         let sushi = "Sushi🍣" // non-BMP emoji
-        XCTAssertNil(onsen.data(using: String._Encoding.japaneseEUC))
-        XCTAssertNil(sushi.data(using: String._Encoding.japaneseEUC))
-        XCTAssertEqual(
-            onsen.data(using: String._Encoding.japaneseEUC, allowLossyConversion: true),
+        #expect(onsen.data(using: .japaneseEUC) == nil)
+        #expect(sushi.data(using: .japaneseEUC) == nil)
+        #expect(
+            onsen.data(using: .japaneseEUC, allowLossyConversion: true) ==
             "Onsen?".data(using: .utf8)
         )
         #if FOUNDATION_FRAMEWORK
         // NOTE: Foundation framework replaces an unsupported non-BMP character
         //       with "??"(two question marks).
-        XCTAssertEqual(
-            sushi.data(using: String._Encoding.japaneseEUC, allowLossyConversion: true),
+        #expect(
+            sushi.data(using: .japaneseEUC, allowLossyConversion: true) ==
             "Sushi??".data(using: .utf8)
         )
         #else
-        XCTAssertEqual(
-            sushi.data(using: String._Encoding.japaneseEUC, allowLossyConversion: true),
+        #expect(
+            sushi.data(using: .japaneseEUC, allowLossyConversion: true) ==
             "Sushi?".data(using: .utf8)
         )
         #endif

Tests/FoundationInternationalizationTests/StringTests+Locale.swift

@@ -10,33 +10,28 @@
 //
 //===----------------------------------------------------------------------===//
 
+import Testing
+
 #if FOUNDATION_FRAMEWORK
 @testable import Foundation
 #else
 @testable import FoundationEssentials
 @testable import FoundationInternationalization
 #endif // FOUNDATION_FRAMEWORK
 
-#if canImport(TestSupport)
-import TestSupport
-#endif
-
 extension String {
     var _scalarViewDescription: String {
         return unicodeScalars.map { "\\u{\(String($0.value, radix: 16, uppercase: true))}" }.joined()
     }
 }
 
-final class StringLocaleTests: XCTestCase {
+@Suite("String (Locale)")
+private struct StringLocaleTests {
 
-    func testCapitalize_localized() {
+    @Test func capitalize_localized() {
         var locale: Locale?
-        // `extension StringProtocol { func capitalized(with: Locale) }` is
-        // declared twice on Darwin: once in FoundationInternationalization
-        // and once in SDK. Therefore it is ambiguous when building the package
-        // on Darwin. Workaround it by testing the internal implementation.
-        func test(_ string: String, _ expected: String, file: StaticString = #filePath, line: UInt = #line) {
-            XCTAssertEqual(string._capitalized(with: locale), expected, file: file, line: line)
+        func test(_ string: String, _ expected: String, sourceLocation: SourceLocation = #_sourceLocation) {
+            #expect(string.capitalized(with: locale) == expected, sourceLocation: sourceLocation)
         }
 
         do {
@@ -84,18 +79,18 @@ final class StringLocaleTests: XCTestCase {
         }
     }
 
-    func testUppercase_localized() {
+    @Test func uppercase_localized() {
 
-        func test(_ localeID: String?, _ string: String, _ expected: String, file: StaticString = #filePath, line: UInt = #line) {
+        func test(_ localeID: String?, _ string: String, _ expected: String, sourceLocation: SourceLocation = #_sourceLocation) {
             let locale: Locale?
             if let localeID {
                 locale = Locale(identifier: localeID)
             } else {
                 locale = nil
             }
-            let actual = string._uppercased(with: locale)
+            let actual = string.uppercased(with: locale)
 
-            XCTAssertEqual(actual, expected, "actual: \(actual._scalarViewDescription), expected: \(expected._scalarViewDescription)", file: file, line: line)
+            #expect(actual == expected, "actual: \(actual._scalarViewDescription), expected: \(expected._scalarViewDescription)", sourceLocation: sourceLocation)
         }
 
         test(nil, "ffl", "FFL") // 0xFB04
@@ -128,17 +123,17 @@ final class StringLocaleTests: XCTestCase {
         test("el_GR", "\u{03B9}\u{0308}\u{0301}", "\u{0399}\u{0308}")
     }
 
-    func testLowercase_localized() {
-        func test(_ localeID: String?, _ string: String, _ expected: String, file: StaticString = #filePath, line: UInt = #line) {
+    @Test func lowercase_localized() {
+        func test(_ localeID: String?, _ string: String, _ expected: String, sourceLocation: SourceLocation = #_sourceLocation) {
             let locale: Locale?
             if let localeID {
                 locale = Locale(identifier: localeID)
             } else {
                 locale = nil
             }
-            let actual = string._lowercased(with: locale)
+            let actual = string.lowercased(with: locale)
 
-            XCTAssertEqual(actual, expected, "actual: \(actual._scalarViewDescription), expected: \(expected._scalarViewDescription)", file: file, line: line)
+            #expect(actual == expected, "actual: \(actual._scalarViewDescription), expected: \(expected._scalarViewDescription)", sourceLocation: sourceLocation)
         }
 
         test(nil, "ᾈ", "ᾀ")     // 0x1F88
@@ -156,8 +151,9 @@ final class StringLocaleTests: XCTestCase {
         test("tr", "İİ", "ii")
     }
 
-    func testFuzzFailure() throws {
-        let input = String(data: Data(base64Encoded: "77+977+977+977+977+977+977+977+977+977+9Cg==")!, encoding: .utf8)!
+    @Test func fuzzFailure() throws {
+        let data = try #require(Data(base64Encoded: "77+977+977+977+977+977+977+977+977+977+9Cg=="))
+        let input = try #require(String(data: data, encoding: .utf8))
         _ = input.lowercased(with: Locale(identifier: "en_US"))
         _ = input.capitalized(with: Locale(identifier: "en_US"))
         _ = input.capitalized(with: Locale(identifier: "en_US"))