Fix how test mock resource bundles are found to work across platforms

okta · Oct 30, 2024 · d09f527 · d09f527
1 parent d37de8f
commit d09f527
Show file tree

Hide file tree

Showing 32 changed files with 252 additions and 70 deletions.
diff --git a/Tests/APIClientTestCommon/MockResponses.swift b/Tests/APIClientTestCommon/MockResponses.swift
@@ -0,0 +1,19 @@
+//
+// Copyright (c) 2024-Present, Okta, Inc. and/or its affiliates. All rights reserved.
+// The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
+//
+// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and limitations under the License.
+//
+
+import Foundation
+
+extension Bundle {
+    public static var apiClientTestCommon: Bundle {
+        .module
+    }
+}
diff --git a/Tests/AuthFoundationTests/CredentialRefreshTests.swift b/Tests/AuthFoundationTests/CredentialRefreshTests.swift
@@ -93,6 +93,10 @@ final class CredentialRefreshTests: XCTestCase, OAuth2ClientDelegate {
         return credential
     }
 
+    static override func setUp() {
+        registerMock(bundles: .authFoundationTests)
+    }
+
     override func setUpWithError() throws {
         delegate = CredentialRefreshDelegate()
         coordinator = MockCredentialCoordinator()

diff --git a/Tests/AuthFoundationTests/CredentialRevokeTests.swift b/Tests/AuthFoundationTests/CredentialRevokeTests.swift
@@ -35,6 +35,10 @@ final class CredentialTests: XCTestCase {
                                                                        scopes: "openid"),
                                                   clientSettings: [ "client_id": "foo" ]))
 
+    static override func setUp() {
+        registerMock(bundles: .authFoundationTests)
+    }
+
     override func setUpWithError() throws {
         coordinator = MockCredentialCoordinator()
         credential = coordinator.credentialDataSource.credential(for: token, coordinator: coordinator)

diff --git a/Tests/AuthFoundationTests/MockResponses.swift b/Tests/AuthFoundationTests/MockResponses.swift
@@ -0,0 +1,19 @@
+//
+// Copyright (c) 2024-Present, Okta, Inc. and/or its affiliates. All rights reserved.
+// The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
+//
+// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and limitations under the License.
+//
+
+import Foundation
+
+extension Bundle {
+    public static var authFoundationTests: Bundle {
+        .module
+    }
+}
diff --git a/Tests/AuthFoundationTests/OAuth2ClientTests.swift b/Tests/AuthFoundationTests/OAuth2ClientTests.swift
@@ -20,7 +20,11 @@ final class OAuth2ClientTests: XCTestCase {
                                                    clientId: "clientid",
                                                    scopes: "openid")
     var token: Token!
-
+
+    static override func setUp() {
+        registerMock(bundles: .authFoundationTests)
+    }
+
     override func setUpWithError() throws {
         Credential.tokenStorage = MockTokenStorage()
         Credential.credentialDataSource = MockCredentialDataSource()

diff --git a/Tests/AuthFoundationTests/OIDCLegacyMigratorTests.swift b/Tests/AuthFoundationTests/OIDCLegacyMigratorTests.swift
@@ -26,6 +26,10 @@ final class OIDCLegacyMigratorTests: XCTestCase {
     let issuer = URL(string: "https://example.com")!
     let redirectUri = URL(string: "my-app:/")!
 
+    static override func setUp() {
+        registerMock(bundles: .authFoundationTests)
+    }
+
     override func setUp() {
         keychain = MockKeychain()
         Keychain.implementation = keychain

diff --git a/Tests/AuthFoundationTests/TokenTests.swift b/Tests/AuthFoundationTests/TokenTests.swift
@@ -31,6 +31,10 @@ final class TokenTests: XCTestCase {
                                                    clientId: "clientid",
                                                    scopes: "openid")
 
+    static override func setUp() {
+        registerMock(bundles: .authFoundationTests)
+    }
+
     override func setUpWithError() throws {
         JWK.validator = MockJWKValidator()
         Token.idTokenValidator = MockIDTokenValidator()

diff --git a/Tests/JWTTests/DefaultJWKValidatorTests.swift b/Tests/JWTTests/DefaultJWKValidatorTests.swift
@@ -33,6 +33,10 @@ final class DefaultJWKValidatorTests: XCTestCase {
         """
     var validator: DefaultJWKValidator!
 
+    static override func setUp() {
+        registerMock(bundles: .jwtTests)
+    }
+
     override func setUpWithError() throws {
         validator = DefaultJWKValidator()
     }

diff --git a/Tests/JWTTests/DefaultTokenHashValidatorTests.swift b/Tests/JWTTests/DefaultTokenHashValidatorTests.swift
@@ -25,6 +25,10 @@ final class DefaultTokenHashValidatorTests: XCTestCase {
 
     let validAccessToken = "VGhpc0lzQVJlYWxseUdyZWF0QWNjZXNzVG9rZW4sIERvbid0WW91VGhpbms_"
 
+    static override func setUp() {
+        registerMock(bundles: .jwtTests)
+    }
+
     override func setUpWithError() throws {
         validator = DefaultTokenHashValidator(hashKey: .accessToken)
     }

diff --git a/Tests/JWTTests/JSONValueTests.swift b/Tests/JWTTests/JSONValueTests.swift
@@ -18,6 +18,10 @@ class JSONTests: XCTestCase {
     let decoder = JSONDecoder()
     let encoder = JSONEncoder()
 
+    static override func setUp() {
+        registerMock(bundles: .jwtTests)
+    }
+
     func testString() throws {
         let value = JSON.string("Test String")
         XCTAssertNotNil(value)

diff --git a/Tests/JWTTests/JWKTests.swift b/Tests/JWTTests/JWKTests.swift
@@ -17,6 +17,10 @@ import TestCommon
 @testable import JWT
 
 final class JWKTests: XCTestCase {
+    static override func setUp() {
+        registerMock(bundles: .jwtTests)
+    }
+
     func testKeySets() throws {
         let keyData = try data(filename: "keys")
         let jwks = try JSONDecoder().decode(JWKS.self, from: keyData)

diff --git a/Tests/JWTTests/MockResponses.swift b/Tests/JWTTests/MockResponses.swift
@@ -0,0 +1,19 @@
+//
+// Copyright (c) 2024-Present, Okta, Inc. and/or its affiliates. All rights reserved.
+// The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
+//
+// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and limitations under the License.
+//
+
+import Foundation
+
+extension Bundle {
+    public static var jwtTests: Bundle {
+        .module
+    }
+}
diff --git a/Tests/OktaDirectAuthTests/DirectAuth1FATests.swift b/Tests/OktaDirectAuthTests/DirectAuth1FATests.swift
@@ -24,6 +24,10 @@ final class DirectAuth1FATests: XCTestCase {
     var client: OAuth2Client!
     var flow: DirectAuthenticationFlow!
 
+    static override func setUp() {
+        registerMock(bundles: .oktaDirectAuthTests)
+    }
+
     override func setUpWithError() throws {
         urlSession = URLSessionMock()
         client = OAuth2Client(baseURL: issuer,

diff --git a/Tests/OktaDirectAuthTests/DirectAuth2FATests.swift b/Tests/OktaDirectAuthTests/DirectAuth2FATests.swift
@@ -24,6 +24,10 @@ final class DirectAuth2FATests: XCTestCase {
     var client: OAuth2Client!
     var flow: DirectAuthenticationFlow!
 
+    static override func setUp() {
+        registerMock(bundles: .oktaDirectAuthTests)
+    }
+
     override func setUpWithError() throws {
         urlSession = URLSessionMock()
         client = OAuth2Client(baseURL: issuer,

diff --git a/Tests/OktaDirectAuthTests/MockResponses.swift b/Tests/OktaDirectAuthTests/MockResponses.swift
@@ -0,0 +1,19 @@
+//
+// Copyright (c) 2024-Present, Okta, Inc. and/or its affiliates. All rights reserved.
+// The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
+//
+// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and limitations under the License.
+//
+
+import Foundation
+
+extension Bundle {
+    public static var oktaDirectAuthTests: Bundle {
+        .module
+    }
+}
diff --git a/Tests/OktaOAuth2Tests/AuthorizationCodeFlowSuccessTests.swift b/Tests/OktaOAuth2Tests/AuthorizationCodeFlowSuccessTests.swift
@@ -57,6 +57,10 @@ final class AuthorizationCodeFlowSuccessTests: XCTestCase {
     var client: OAuth2Client!
     var flow: AuthorizationCodeFlow!
 
+    static override func setUp() {
+        registerMock(bundles: .oktaOAuth2Tests)
+    }
+
     override func setUpWithError() throws {
         client = OAuth2Client(baseURL: issuer,
                               clientId: "clientId",
@@ -67,13 +71,13 @@ final class AuthorizationCodeFlowSuccessTests: XCTestCase {
         Token.accessTokenValidator = MockTokenHashValidator()
 
         urlSession.expect("https://example.com/oauth2/default/.well-known/openid-configuration",
-                          data: try data(filename: "openid-configuration", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "openid-configuration"),
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/token",
-                          data: try data(filename: "token", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "token"),
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/keys?client_id=clientId",
-                          data: try data(filename: "keys", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "keys"),
                           contentType: "application/json")
 
         flow = client.authorizationCodeFlow(redirectUri: redirectUri,

diff --git a/Tests/OktaOAuth2Tests/DeviceAuthorizationFlowErrorTests.swift b/Tests/OktaOAuth2Tests/DeviceAuthorizationFlowErrorTests.swift
@@ -24,6 +24,10 @@ final class DeviceAuthorizationFlowErrorTests: XCTestCase {
     var client: OAuth2Client!
     var flow: DeviceAuthorizationFlow!
 
+    static override func setUp() {
+        registerMock(bundles: .oktaOAuth2Tests)
+    }
+
     override func setUpWithError() throws {
         client = OAuth2Client(baseURL: issuer,
                               clientId: "clientId",
@@ -42,7 +46,7 @@ final class DeviceAuthorizationFlowErrorTests: XCTestCase {
 
     func testSlowDown() throws {
         urlSession.expect("https://example.com/.well-known/openid-configuration",
-                          data: try data(filename: "openid-configuration", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "openid-configuration"),
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/device/authorize",
                           data: try data(filename: "device-authorize"),
@@ -52,10 +56,10 @@ final class DeviceAuthorizationFlowErrorTests: XCTestCase {
                           statusCode: 400,
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/token",
-                          data: try data(filename: "token", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "token"),
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/keys?client_id=clientId",
-                          data: try data(filename: "keys", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "keys"),
                           contentType: "application/json")
         DeviceAuthorizationFlow.slowDownInterval = 1
 
@@ -64,7 +68,7 @@ final class DeviceAuthorizationFlowErrorTests: XCTestCase {
 
     func testAuthorizationPending() throws {
         urlSession.expect("https://example.com/.well-known/openid-configuration",
-                          data: try data(filename: "openid-configuration", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "openid-configuration"),
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/device/authorize",
                           data: try data(filename: "device-authorize"),
@@ -74,10 +78,10 @@ final class DeviceAuthorizationFlowErrorTests: XCTestCase {
                           statusCode: 400,
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/token",
-                          data: try data(filename: "token", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "token"),
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/keys?client_id=clientId",
-                          data: try data(filename: "keys", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "keys"),
                           contentType: "application/json")
         DeviceAuthorizationFlow.slowDownInterval = 1
 

diff --git a/Tests/OktaOAuth2Tests/DeviceAuthorizationFlowSuccessTests.swift b/Tests/OktaOAuth2Tests/DeviceAuthorizationFlowSuccessTests.swift
@@ -24,6 +24,10 @@ final class DeviceAuthorizationFlowSuccessTests: XCTestCase {
     var client: OAuth2Client!
     var flow: DeviceAuthorizationFlow!
 
+    static override func setUp() {
+        registerMock(bundles: .oktaOAuth2Tests)
+    }
+
     override func setUpWithError() throws {
         client = OAuth2Client(baseURL: issuer,
                               clientId: "clientId",
@@ -34,16 +38,16 @@ final class DeviceAuthorizationFlowSuccessTests: XCTestCase {
         Token.accessTokenValidator = MockTokenHashValidator()
 
         urlSession.expect("https://example.com/.well-known/openid-configuration",
-                          data: try data(filename: "openid-configuration", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "openid-configuration"),
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/device/authorize",
                           data: try data(filename: "device-authorize"),
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/token",
-                          data: try data(filename: "token", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "token"),
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/keys?client_id=clientId",
-                          data: try data(filename: "keys", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "keys"),
                           contentType: "application/json")
         flow = client.deviceAuthorizationFlow()
     }

diff --git a/Tests/OktaOAuth2Tests/JWTAuthorizationFlowTests.swift b/Tests/OktaOAuth2Tests/JWTAuthorizationFlowTests.swift
@@ -53,6 +53,10 @@ final class JWTAuthorizationFlowTests: XCTestCase {
     var flow: JWTAuthorizationFlow!
     var jwt: JWT!
 
+    static override func setUp() {
+        registerMock(bundles: .oktaOAuth2Tests)
+    }
+
     override func setUpWithError() throws {
         client = OAuth2Client(baseURL: issuer,
                               clientId: "clientId",
@@ -63,13 +67,13 @@ final class JWTAuthorizationFlowTests: XCTestCase {
         Token.accessTokenValidator = MockTokenHashValidator()
 
         urlSession.expect("https://example.okta.com/.well-known/openid-configuration",
-                          data: try data(filename: "openid-configuration", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "openid-configuration"),
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/keys?client_id=clientId",
-                          data: try data(filename: "keys", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "keys"),
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/token",
-                          data: try data(filename: "token", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "token"),
                           contentType: "application/json")
 
         flow = client.jwtAuthorizationFlow()

diff --git a/Tests/OktaOAuth2Tests/MockResponses.swift b/Tests/OktaOAuth2Tests/MockResponses.swift
@@ -0,0 +1,19 @@
+//
+// Copyright (c) 2024-Present, Okta, Inc. and/or its affiliates. All rights reserved.
+// The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
+//
+// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and limitations under the License.
+//
+
+import Foundation
+
+extension Bundle {
+    public static var oktaOAuth2Tests: Bundle {
+        .module
+    }
+}
diff --git a/Tests/OktaOAuth2Tests/OAuth2ClientTests.swift b/Tests/OktaOAuth2Tests/OAuth2ClientTests.swift
@@ -12,6 +12,10 @@ final class OAuth2ClientTests: XCTestCase {
     var urlSession: URLSessionMock!
     var client: OAuth2Client!
 
+    static override func setUp() {
+        registerMock(bundles: .oktaOAuth2Tests)
+    }
+
     override func setUpWithError() throws {
         urlSession = URLSessionMock()
         client = OAuth2Client(baseURL: issuer, clientId: "theClientId", scopes: "openid profile offline_access", session: urlSession)
@@ -53,10 +57,10 @@ final class OAuth2ClientTests: XCTestCase {
                           data: openIdData,
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/keys?client_id=theClientId",
-                          data: try data(filename: "keys", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "keys"),
                           contentType: "application/json")
         urlSession.expect("https://example.okta.com/oauth2/v1/token",
-                          data: try data(filename: "token", matching: "OktaOAuth2Tests"),
+                          data: try data(filename: "token"),
                           contentType: "application/json")
 
         nonisolated(unsafe) var token: Token?