fix build errors in API plugin unit tests

aws-amplify · Mar 22, 2024 · 797711a · 797711a
1 parent 8859896
commit 797711a
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 10 deletions.
diff --git a/...ts/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptorTests.swift b/...ts/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/APIKeyAuthInterceptorTests.swift
@@ -9,6 +9,7 @@
 import XCTest
 import Amplify
 @testable import AWSAPIPlugin
+@testable @_spi(AppSyncRTC) import AmplifyNetwork
 
 class APIKeyAuthInterceptorTests: XCTestCase {
 

diff --git a/...s/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/CognitoAuthInterceptorTests.swift b/...s/AWSAPIPluginTests/Interceptor/SubscriptionInterceptor/CognitoAuthInterceptorTests.swift
@@ -9,7 +9,8 @@
 import XCTest
 import Amplify
 @testable import AWSAPIPlugin
-@testable @_spi(WebSocket) import AWSPluginsCore
+@testable import AWSPluginsCore
+@testable @_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
 
 class CognitoAuthInterceptorTests: XCTestCase {
 

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Mocks/MockSubscription.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Mocks/MockSubscription.swift
@@ -10,7 +10,8 @@ import Foundation
 import Amplify
 import Combine
 @testable import AWSAPIPlugin
-@_spi(WebSocket) import AWSPluginsCore
+@testable import AWSPluginsCore
+@testable @_spi(WebSocket) @_spi(AppSyncRTC) import AmplifyNetwork
 
 struct MockSubscriptionConnectionFactory: AppSyncRealTimeClientFactoryProtocol {
 

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeCombineTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeCombineTests.swift
@@ -11,6 +11,7 @@ import XCTest
 import Amplify
 @testable import AmplifyTestCommon
 @testable import AWSAPIPlugin
+@testable @_spi(AppSyncRTC) import AmplifyNetwork
 @_implementationOnly import AmplifyAsyncTesting
 
 class GraphQLSubscribeCombineTests: OperationTestBase {

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTaskTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTaskTests.swift
@@ -11,6 +11,7 @@ import XCTest
 import Amplify
 @testable import AmplifyTestCommon
 @testable import AWSAPIPlugin
+@testable @_spi(AppSyncRTC) import AmplifyNetwork
 @_implementationOnly import AmplifyAsyncTesting
 
 class GraphQLSubscribeTasksTests: OperationTestBase {
@@ -130,7 +131,11 @@ class GraphQLSubscribeTasksTests: OperationTestBase {
         await fulfillment(of: [onSubscribeInvoked], timeout: 0.05)
 
         try await MockAppSyncRealTimeClient.waitForSubscirbing()
-        mockAppSyncRealTimeClient?.triggerEvent(.error([AppSyncRealTimeRequest.Error.limitExceeded]))
+        mockAppSyncRealTimeClient?.triggerEvent(.error([
+            "errors": [
+                "errorType": "LimitExceededError"
+            ]
+        ]))
         expectedCompletionFailureError = APIError.operationError("", "", AppSyncRealTimeRequest.Error.limitExceeded)
         await waitForSubscriptionExpectations()
     }
@@ -145,18 +150,21 @@ class GraphQLSubscribeTasksTests: OperationTestBase {
         try await subscribe()
         await fulfillment(of: [onSubscribeInvoked], timeout: 0.05)
 
-        let unauthorizedError = GraphQLError(message: "", extensions: ["errorType": "Unauthorized"])
         try await MockAppSyncRealTimeClient.waitForSubscirbing()
-        mockAppSyncRealTimeClient?.triggerEvent(.error([unauthorizedError]))
+        mockAppSyncRealTimeClient?.triggerEvent(.error([
+            "errors": [
+                "errorType": "Unauthorized"
+            ]
+        ]))
         expectedCompletionFailureError = APIError.operationError(
             "Subscription item event failed with error: Unauthorized",
             "",
-            GraphQLResponseError<JSONValue>.error([unauthorizedError])
+            AppSyncRealTimeRequest.Error.unauthorized
         )
         await waitForSubscriptionExpectations()
     }
 
-    func testConnectionErrorWithAppSyncConnectionError() async throws {
+    func testConnectionErrorWithOtherAppSyncConnectionError() async throws {
         receivedCompletionSuccess.isInverted = true
         receivedStateValueConnected.isInverted = true
         receivedStateValueDisconnected.isInverted = true
@@ -167,8 +175,16 @@ class GraphQLSubscribeTasksTests: OperationTestBase {
         await fulfillment(of: [onSubscribeInvoked], timeout: 0.05)
 
         try await MockAppSyncRealTimeClient.waitForSubscirbing()
-        mockAppSyncRealTimeClient?.triggerEvent(.error([URLError(URLError.Code(rawValue: 400))]))
-        expectedCompletionFailureError = APIError.operationError("", "", URLError(URLError.Code(rawValue: 400)))
+        mockAppSyncRealTimeClient?.triggerEvent(.error([
+            "errors": [
+                "message": "other error"
+            ]
+        ]))
+        expectedCompletionFailureError = APIError.operationError(
+            "Subscription item event failed with error",
+            "",
+            GraphQLResponseError<JSONValue>.error([GraphQLError(message: "other error")])
+        )
         await waitForSubscriptionExpectations()
     }
 

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/GraphQLSubscribeTests.swift
@@ -9,6 +9,7 @@ import XCTest
 @testable import Amplify
 @testable import AmplifyTestCommon
 @testable import AWSAPIPlugin
+@testable @_spi(AppSyncRTC) import AmplifyNetwork
 
 class GraphQLSubscribeTests: OperationTestBase {
 

diff --git a/...meClient/AppSyncRealTimeClientTests.swift → ...meClient/AppSyncRealTimeClientTests.swift b/...meClient/AppSyncRealTimeClientTests.swift → ...meClient/AppSyncRealTimeClientTests.swift
@@ -9,7 +9,6 @@
 import XCTest
 import Combine
 import Amplify
-@_spi(WebSocket) import AWSPluginsCore
 @testable import AWSAPIPlugin
 
 class AppSyncRealTimeClientTests: XCTestCase {

diff --git a/...ent/AppSyncRealTimeRequestAuthTests.swift → ...ent/AppSyncRealTimeRequestAuthTests.swift b/...ent/AppSyncRealTimeRequestAuthTests.swift → ...ent/AppSyncRealTimeRequestAuthTests.swift