Extract TestHelpers to their own target

Package.swift

@@ -26,14 +26,20 @@ let package = Package(
                 .copy("PrivacyInfo.xcprivacy")
             ],
             swiftSettings: [
-                .enableExperimentalFeature("StrictConcurrency=complete")
+                .enableExperimentalFeature("StrictConcurrency")
             ]
         ),
         .testTarget(
             name: "UID2Tests",
+            dependencies: ["UID2", "TestHelpers"]
+        ),
+        .target(
+            name: "TestHelpers",
             dependencies: ["UID2"],
+            path: "Tests/TestHelpers",
             resources: [
                 .copy("TestData")
-            ]),
+            ]
+        )
     ]
 )

Tests/UID2Tests/TestExtensions/FixtureLoader.swift → Tests/TestHelpers/FixtureLoader.swift

@@ -8,13 +8,13 @@
 import Foundation
 @testable import UID2
 
-final class FixtureLoader {
+public final class FixtureLoader {
     enum Error: Swift.Error {
         case missingFixture(String)
     }
 
     /// Read `Data` from a Fixture.
-    static func data(
+    public static func data(
         fixture: String,
         withExtension fileExtension: String = "json",
         subdirectory: String = "TestData"
@@ -31,7 +31,7 @@ final class FixtureLoader {
 
     /// Decode a `Decodable` from a Fixture.
     /// Expects the fixture to use snake_case key encoding.
-    static func decode<T>(
+    public static func decode<T>(
         _ type: T.Type,
         fixture: String,
         withExtension fileExtension: String = "json",

Tests/UID2Tests/TestExtensions/HTTPStub.swift → Tests/TestHelpers/HTTPStub.swift

@@ -7,8 +7,8 @@
 
 import Foundation
 
-internal final class HTTPStub {
-    static let shared: HTTPStub = {
+public final class HTTPStub {
+    public static let shared: HTTPStub = {
         let stub = HTTPStub()
         URLProtocol.registerClass(HTTPStubProtocol.self)
         return stub
@@ -17,7 +17,7 @@ internal final class HTTPStub {
     private init() {}
 
     // Provides stubs in response to requests
-    var stubs: ((URLRequest) -> Result<(data: Data, response: HTTPURLResponse), Error>)!
+    public var stubs: ((URLRequest) -> Result<(data: Data, response: HTTPURLResponse), Error>)!
 
     // Stub for the current request
     private var stub: Result<(data: Data, response: HTTPURLResponse), Error>!

Tests/UID2Tests/TestExtensions/MockNetworkSession.swift → Tests/TestHelpers/MockNetworkSession.swift

@@ -8,19 +8,19 @@
 import Foundation
 @testable import UID2
 
-final class MockNetworkSession: NetworkSession {
+public final class MockNetworkSession: NetworkSession {
 
     private let fileName: String
     private let fileExtension: String
     private let responseCode: Int
 
-    init(_ fileName: String, _ fileExtension: String, _ responseCode: Int = 200) {
+    public init(_ fileName: String, _ fileExtension: String, _ responseCode: Int = 200) {
         self.fileName = fileName
         self.fileExtension = fileExtension
         self.responseCode = responseCode
     }
 
-    func loadData(for request: URLRequest) throws -> (Data, HTTPURLResponse) {
+    public func loadData(for request: URLRequest) throws -> (Data, HTTPURLResponse) {
         let jsonData = try FixtureLoader.data(fixture: fileName, withExtension: fileExtension)
         let response = HTTPURLResponse(url: request.url!, statusCode: responseCode, httpVersion: nil, headerFields: nil)!
         return (jsonData, response)

Tests/UID2Tests/TestExtensions/TestCryptoUtil.swift → Tests/TestHelpers/TestCryptoUtil.swift

@@ -36,16 +36,16 @@ private final class Atomic<Value: Sendable>: @unchecked Sendable {
 
 /// A test convenience which exposes the Symmetric Key it generates for the client.
 /// This key can then be used to encrypt stub responses for the client.
-internal final class TestCryptoUtil {
+public final class TestCryptoUtil {
     private let atomicSymmetricKey: Atomic<SymmetricKey?>
 
     /// `SymmetricKey` generated by the client, or `nil` if the key has not yet been generated.
-    var symmetricKey: SymmetricKey? {
+    public var symmetricKey: SymmetricKey? {
         atomicSymmetricKey.value
     }
-    let cryptoUtil: CryptoUtil
+    public let cryptoUtil: CryptoUtil
 
-    init() {
+    public init() {
         let symmetricKey = Atomic<SymmetricKey?>(nil)
         self.atomicSymmetricKey = symmetricKey
 

Tests/UID2Tests/TestExtensions/XCTest+Extensions.swift → Tests/TestHelpers/XCTest+Extensions.swift

@@ -8,7 +8,7 @@
 import XCTest
 
 /// `XCTAssertThrowsError` doesn't support async expressions.
-internal func assertThrowsError<T>(
+public func assertThrowsError<T>(
     _ expression: @escaping @autoclosure () async throws -> T,
     _ message: @autoclosure () -> String = "",
     file: StaticString = #filePath,

Tests/UID2Tests/IdentityPackageTests.swift

@@ -5,6 +5,7 @@
 //  Created by Brad Leege on 3/29/23.
 //
 
+import TestHelpers
 import XCTest
 @testable import UID2
 

Tests/UID2Tests/RefreshTokenAPITests.swift

@@ -5,6 +5,7 @@
 //  Created by Brad Leege on 2/1/23.
 //
 
+import TestHelpers
 import XCTest
 @testable import UID2
 
@@ -13,7 +14,6 @@ final class RefreshTokenAPITests: XCTestCase {
     /// 🟩  `POST /v2/token/refresh` - HTTP 200 - Success
     /// uid2-iOS-sdk@test.com
     func testRefreshTokenSuccess() async throws {
-
         // Load Generate Token
         let generateTokenResponse = try FixtureLoader.decode(RefreshTokenResponse.self, fixture: "generate-token-200-success")
         guard let generateToken = generateTokenResponse.toUID2Identity() else {

Tests/UID2Tests/UID2ClientTests.swift

@@ -7,6 +7,7 @@
 
 import CryptoKit
 import Foundation
+import TestHelpers
 @testable import UID2
 import XCTest
 

Tests/UID2Tests/UID2ManagerTests.swift

@@ -8,6 +8,7 @@
 import Combine
 import CryptoKit
 import Foundation
+import TestHelpers
 @testable import UID2
 import XCTest
 

Tests/UID2Tests/UID2TokenTests.swift

@@ -1,4 +1,5 @@
 import Foundation
+import TestHelpers
 import XCTest
 @testable import UID2