Migrated from XCTest to SwiftTesting.

Author: will-lumley

.swiftlint.yml

@@ -2,6 +2,7 @@
 
 disabled_rules:
   inclusive_language
+  non_optional_string_data_conversion
 
 nesting:
   type_level:

Tests/FaviconFinderTests/FaviconFinderTests.swift

@@ -7,12 +7,14 @@
 //
 
 @testable import FaviconFinder
-import XCTest
+import Foundation
+import Testing
 
-class FaviconFinderTests: XCTestCase {
+struct FaviconFinderTests {
 
     // MARK: - Tests
 
+    @Test("Test URLs")
     func testURLs() async throws {
         // Remove the URL that requires meta-refresh redirect
         var testURLs = TestURL.allCases
@@ -27,6 +29,7 @@ class FaviconFinderTests: XCTestCase {
         }
     }
 
+    @Test("Test ICO Favicon")
     func testIco() async throws {
         let favicon = try await FaviconFinder(
             url: TestURL.google.url,
@@ -37,13 +40,14 @@ class FaviconFinderTests: XCTestCase {
             .first()
 
         // Ensure that our favicon is actually valid
-        let image = try XCTUnwrap(favicon.image)
-        XCTAssertTrue(image.isValidImage)
+        let image = try #require(favicon.image)
+        #expect(image.isValidImage == true)
 
         // Ensure that our favicon was retrieved from the desired source
-        XCTAssertTrue(favicon.url.sourceType == .ico)
+        #expect(favicon.url.sourceType == .ico)
     }
 
+    @Test("Test HTML Favicon")
     func testHtml() async throws {
         let favicon = try await FaviconFinder(
             url: TestURL.w3Schools.url,
@@ -54,13 +58,14 @@ class FaviconFinderTests: XCTestCase {
             .first()
 
         // Ensure that our favicon is actually valid
-        let image = try XCTUnwrap(favicon.image)
-        XCTAssertTrue(image.isValidImage)
+        let image = try #require(favicon.image)
+        #expect(image.isValidImage == true)
 
         // Ensure that our favicon was retrieved from the desired source
-        XCTAssertTrue(favicon.url.sourceType == .html)
+        #expect(favicon.url.sourceType == .html)
     }
 
+    @Test("Test WebApplicationManifestFile Favicon")
     func testWebApplicationManifestFile() async throws {
         let favicon = try await FaviconFinder(
             url: TestURL.webApplicationManifest.url,
@@ -71,13 +76,14 @@ class FaviconFinderTests: XCTestCase {
             .first()
 
         // Ensure that our favicon is actually valid
-        let image = try XCTUnwrap(favicon.image)
-        XCTAssertTrue(image.isValidImage)
+        let image = try #require(favicon.image)
+        #expect(image.isValidImage == true)
 
         // Ensure that our favicon was retrieved from the desired source
-        XCTAssertTrue(favicon.url.sourceType == .webApplicationManifestFile)
+        #expect(favicon.url.sourceType == .webApplicationManifestFile)
     }
 
+    @Test("Test Meta Refresh Redirect Favicon")
     func testCheckForMetaRefreshRedirect() async throws {
         let favicon = try await FaviconFinder(
             url: TestURL.metaRefreshRedirect.url,
@@ -91,41 +97,43 @@ class FaviconFinderTests: XCTestCase {
             .first()
 
         // Ensure that our favicon is actually valid
-        let image = try XCTUnwrap(favicon.image)
-        XCTAssertTrue(image.isValidImage)
+        let image = try #require(favicon.image)
+        #expect(image.isValidImage == true)
 
         // Ensure that our favicon was retrieved from the desired source
-        XCTAssertTrue(favicon.url.sourceType == .html)
+        #expect(favicon.url.sourceType == .html)
     }
 
+    @Test("Test ForeignEncoding Favicon")
     func testForeignEncoding() async throws {
         let favicon = try await FaviconFinder(url: TestURL.nonUtf8Encoded.url)
             .fetchFaviconURLs()
             .download()
             .first()
 
         // Ensure that our favicon is actually valid
-        let image = try XCTUnwrap(favicon.image)
-        XCTAssertTrue(image.isValidImage)
+        let image = try #require(favicon.image)
+        #expect(image.isValidImage == true)
     }
 
+    @Test("Test Cancel")
     func testCancel() async throws {
         let faviconFinder = FaviconFinder(
             url: TestURL.google.url,
             configuration: .init(preferredSource: .mock)
         )
 
-        let expectation = expectation(description: "Task should be cancelled")
+        // We're expecting to catch an error, and we'll store it here
+        var caughtError: Error?
 
-        // Find the Favicon's in a separate Task
+        // Find the Favicon's in a separate Task, so we can cancel it
         Task {
             do {
                 _ = try await faviconFinder.fetchFaviconURLs()
-                XCTFail("Expected fetchFaviconURLs to be cancelled, but it completed")
-            } catch is CancellationError {
-                expectation.fulfill()
+                Issue.record("Expected fetchFaviconURLs to be cancelled, but it completed")
             } catch {
-                XCTFail("Unexpected error: \(error)")
+                // Store the error
+                caughtError = error
             }
         }
 
@@ -135,8 +143,11 @@ class FaviconFinderTests: XCTestCase {
         // Cancel the finding
         faviconFinder.cancel()
 
-        // Wait for the expectation to be fulfilled
-        await fulfillment(of: [expectation], timeout: 5)
+        // Wait a couple seconds
+        try await Task.sleep(for: .seconds(2))
+
+        // We got a CancellationError, meaning that we got a cancellation, yay
+        #expect(caughtError is CancellationError)
     }
 
 }
@@ -151,7 +162,8 @@ private extension FaviconFinderTests {
             .fetchFaviconURLs()
             .download()
             .first()
-        XCTAssertNotNil(favicon.image)
+
+        #expect(favicon.image != nil)
     }
 
 }

Tests/FaviconFinderTests/Toolbox/Extensions/ArrayReorderTests.swift

@@ -7,27 +7,28 @@
 //
 
 @testable import FaviconFinder
-import XCTest
+import Testing
 
-class ArrayReorderTests: XCTestCase {
+struct ArrayReorderTests {
 
+    @Test("Reorder Elements")
     func testReorder() {
         var array = [Int]()
 
         array = [1, 2, 3]
         array = array.movingElementToFront(2)
 
-        XCTAssertEqual(array, [2, 1, 3])
+        #expect(array == [2, 1, 3])
 
         array = [1, 2, 3]
         array = array.movingElementToFront(1)
 
-        XCTAssertEqual(array, [1, 2, 3])
+        #expect(array == [1, 2, 3])
 
         array = [1, 2, 3]
         array = array.movingElementToFront(4)
 
-        XCTAssertEqual(array, [1, 2, 3])
+        #expect(array == [1, 2, 3])
     }
 
 }

Tests/FaviconFinderTests/Toolbox/Extensions/RegexTests.swift

@@ -7,9 +7,9 @@
 //
 
 @testable import FaviconFinder
-import XCTest
+import Testing
 
-class RegexTests: XCTestCase {
+struct RegexTests {
 
     // MARK: - Properties
 
@@ -19,14 +19,16 @@ class RegexTests: XCTestCase {
 
     // MARK: - Tests
 
-    func testRegexTest() {
+    @Test("Test Regex")
+    func regexTest() {
         let regex = Regex("go+gle")
-        XCTAssert(regex.test(input: "goooooogle"))
+        #expect(regex.test(input: "goooooogle") == true)
     }
 
-    func testRegexTestForHttpsOrHttp() {
-        XCTAssert(Regex.testForHttpsOrHttp(input: httpWebsite))
-        XCTAssert(Regex.testForHttpsOrHttp(input: httpsWebsite))
-        XCTAssert(Regex.testForHttpsOrHttp(input: plainWebsite) == false)
+    @Test("Test Regex for HTTP or HTTPS")
+    func regexTestForHttpsOrHttp() {
+        #expect(Regex.testForHttpsOrHttp(input: httpWebsite) == true)
+        #expect(Regex.testForHttpsOrHttp(input: httpsWebsite) == true)
+        #expect(Regex.testForHttpsOrHttp(input: plainWebsite) == false)
     }
 }

Tests/FaviconFinderTests/Toolbox/Extensions/StringRemovalTests.swift

@@ -7,14 +7,15 @@
 //
 
 import FaviconFinder
-import XCTest
+import Testing
 
-class StringRemovalTests: XCTestCase {
+struct StringRemovalTests {
 
-    func testRemoveEverythingAfter() {
+    @Test("Test Remove Everything After")
+    func removeEverythingAfter() {
         var str = "abcdef1234"
         str.removeEverythingAfter(str: "12")
 
-        XCTAssert(str == "abcdef", "RemoveEverythingAfter failed, str should be abcdef, but instead is \(str)")
+        #expect(str == "abcdef")
     }
 }

Tests/FaviconFinderTests/Toolbox/Extensions/URLParsingTests.swift

@@ -7,30 +7,34 @@
 //
 
 import FaviconFinder
-import XCTest
+import Foundation
+import Testing
+
+struct URLParsingTests {
 
-class URLParsingTests: XCTestCase {
     let gmailUrl  = URL(string: "https://mail.google.com")!
     let googleUrl = URL(string: "https://google.com")!
 
     let appleAuUrl = URL(string: "https://apple.com/au")!
     let appleUrl   = URL(string: "https://apple.com")!
 
-    func testUrlWithoutSubdomains() {
+    @Test("URL Without Subdomains")
+    func urlWithoutSubdomains() {
         guard let strippedGmailUrl = self.gmailUrl.urlWithoutSubdomains else {
-            XCTAssert(false, "\(self.gmailUrl) without subdomains returned nil.")
+            Issue.record("\(self.gmailUrl) without subdomains returned nil.")
             return
         }
 
-        XCTAssert(strippedGmailUrl == self.googleUrl, "Stripped Gmail URL returned \(strippedGmailUrl)")
+        #expect(strippedGmailUrl == self.googleUrl)
     }
 
-    func testAbsoluteStringWithoutScheme() {
+    @Test("Test AbsoluteString Without Scheme")
+    func absoluteStringWithoutScheme() {
         guard let appleAuUrlWithoutScheme = self.appleAuUrl.absoluteStringWithoutScheme else {
-            XCTAssert(false, "\(self.appleAuUrl) without scheme returned nil.")
+            Issue.record("\(self.appleAuUrl) without subdomains returned nil.")
             return
         }
 
-        XCTAssert(appleAuUrlWithoutScheme == "apple.com/au", "Stripped AppleAu URL returned \(appleAuUrlWithoutScheme)")
+        #expect(appleAuUrlWithoutScheme == "apple.com/au")
     }
 }

Tests/FaviconFinderTests/Toolbox/TestURLs.swift

@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import XCTest
+import Testing
 
 enum TestURL: CaseIterable {
     case google
@@ -22,7 +22,7 @@ enum TestURL: CaseIterable {
 extension TestURL {
 
     var url: URL {
-        guard let url = try? XCTUnwrap(URL(string: self.urlStr)) else {
+        guard let url = URL(string: self.urlStr) else {
             fatalError()
         }
         return url