fix broken unit test cases of AWSAPIPlugin

aws-amplify · Apr 25, 2024 · fa72566 · fa72566
1 parent 3079ec7
commit fa72566
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 33 deletions.
diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Core/AppSyncListProviderPaginationTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Core/AppSyncListProviderPaginationTests.swift
@@ -52,8 +52,7 @@ extension AppSyncListProviderTests {
                 let nextPage = List(elements: [Comment4(content: "content"),
                                                Comment4(content: "content"),
                                                Comment4(content: "content")])
-                let event: GraphQLOperation<List<Comment4>>.OperationResult = .success(.success(nextPage))
-                return event
+                return .success(nextPage)
         }
         let elements = [Comment4(content: "content")]
         let provider = AppSyncListProvider(elements: elements, nextToken: "nextToken")
@@ -84,10 +83,8 @@ extension AppSyncListProviderTests {
     }
 
     func testLoadedStateGetNextPageFailure_APIError() async {
-        mockAPIPlugin.responders[.queryRequestResponse] =
-            QueryRequestResponder<List<Comment4>> { _ in
-                let event: GraphQLOperation<List<Comment4>>.OperationResult = .failure(APIError.unknown("", "", nil))
-                return event
+        mockAPIPlugin.responders[.queryRequestResponse] = QueryRequestResponder<List<Comment4>> { _ in
+                throw APIError.unknown("", "", nil)
         }
         let elements = [Comment4(content: "content")]
         let provider = AppSyncListProvider(elements: elements, nextToken: "nextToken")
@@ -108,12 +105,10 @@ extension AppSyncListProviderTests {
     }
 
     func testLoadedStateGetNextPageFailure_GraphQLErrorResponse() async {
-        mockAPIPlugin.responders[.queryRequestResponse] =
-            QueryRequestResponder<List<Comment4>> { _ in
-                let event: GraphQLOperation<List<Comment4>>.OperationResult = .success(
-                    .failure(GraphQLResponseError.error([GraphQLError]())))
-                return event
+        mockAPIPlugin.responders[.queryRequestResponse] = QueryRequestResponder<List<Comment4>> { _ in
+            return .failure(GraphQLResponseError.error([GraphQLError]()))
         }
+
         let elements = [Comment4(content: "content")]
         let provider = AppSyncListProvider(elements: elements, nextToken: "nextToken")
         guard case .loaded = provider.loadedState else {

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Core/AppSyncListProviderTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Core/AppSyncListProviderTests.swift
@@ -133,8 +133,7 @@ class AppSyncListProviderTests: XCTestCase {
                 ],
                 "nextToken": "nextToken"
             ]
-            let event: GraphQLOperation<JSONValue>.OperationResult = .success(.success(json))
-            return event
+            return .success(json)
         }
         let modelMetadata = AppSyncListDecoder.Metadata(appSyncAssociatedIdentifiers: ["postId"],
                                                         appSyncAssociatedFields: ["post"],
@@ -168,10 +167,8 @@ class AppSyncListProviderTests: XCTestCase {
     }
 
     func testNotLoadedStateSynchronousLoadFailure() async {
-        mockAPIPlugin.responders[.queryRequestResponse] =
-        QueryRequestResponder<JSONValue> { _ in
-            let event: GraphQLOperation<JSONValue>.OperationResult = .failure(APIError.unknown("", "", nil))
-            return event
+        mockAPIPlugin.responders[.queryRequestResponse] = QueryRequestResponder<JSONValue> { _ in
+            throw APIError.unknown("", "", nil)
         }
         let modelMetadata = AppSyncListDecoder.Metadata(appSyncAssociatedIdentifiers: ["postId"],
                                                         appSyncAssociatedFields: ["post"],
@@ -217,8 +214,7 @@ class AppSyncListProviderTests: XCTestCase {
                 ],
                 "nextToken": "nextToken"
             ]
-            let event: GraphQLOperation<JSONValue>.OperationResult = .success(.success(json))
-            return event
+            return .success(json)
         }
         let modelMetadata = AppSyncListDecoder.Metadata(appSyncAssociatedIdentifiers: ["postId"],
                                                         appSyncAssociatedFields: ["post"],
@@ -252,10 +248,8 @@ class AppSyncListProviderTests: XCTestCase {
     }
 
     func testNotLoadedStateLoadWithCompletionFailure_APIError() async {
-        mockAPIPlugin.responders[.queryRequestResponse] =
-        QueryRequestResponder<JSONValue> { _ in
-            let event: GraphQLOperation<JSONValue>.OperationResult = .failure(APIError.unknown("", "", nil))
-            return event
+        mockAPIPlugin.responders[.queryRequestResponse] = QueryRequestResponder<JSONValue> { _ in
+            throw APIError.unknown("", "", nil)
         }
         let modelMetadata = AppSyncListDecoder.Metadata(appSyncAssociatedIdentifiers: ["postId"],
                                                         appSyncAssociatedFields: ["post"],
@@ -287,11 +281,8 @@ class AppSyncListProviderTests: XCTestCase {
     }
 
     func testNotLoadedStateLoadWithCompletionFailure_GraphQLErrorResponse() async {
-        mockAPIPlugin.responders[.queryRequestResponse] =
-        QueryRequestResponder<JSONValue> { _ in
-            let event: GraphQLOperation<JSONValue>.OperationResult = .success(
-                .failure(GraphQLResponseError.error([GraphQLError]())))
-            return event
+        mockAPIPlugin.responders[.queryRequestResponse] = QueryRequestResponder<JSONValue> { _ in
+            return .failure(GraphQLResponseError.error([GraphQLError]()))
         }
         let modelMetadata = AppSyncListDecoder.Metadata(appSyncAssociatedIdentifiers: ["postId"],
                                                  appSyncAssociatedFields: ["post"],
@@ -339,8 +330,7 @@ class AppSyncListProviderTests: XCTestCase {
                 ],
                 "nextToken": "nextToken"
             ]
-            let event: GraphQLOperation<JSONValue>.OperationResult = .success(.success(json))
-            return event
+            return .success(json)
         }
         let modelMetadata = AppSyncListDecoder.Metadata(appSyncAssociatedIdentifiers: ["postId"],
                                                         appSyncAssociatedFields: ["post"],

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/AWSRESTOperationTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/AWSRESTOperationTests.swift
@@ -33,7 +33,7 @@ class AWSRESTOperationTests: OperationTestBase {
     }
 
     // TODO: Fix this test
-    func testGetReturnsOperation() throws {
+    func testGetReturnsOperation() async throws {
         try setUpPlugin(endpointType: .rest)
 
         // Use this as a semaphore to ensure the task is cleaned up before proceeding to the next test
@@ -49,8 +49,7 @@ class AWSRESTOperationTests: OperationTestBase {
         }
 
         XCTAssertNotNil(operation.request)
-
-        waitForExpectations(timeout: 1.00)
+        await fulfillment(of: [listenerWasInvoked], timeout: 1)
     }
 
     func testGetFailsWithBadAPIName() throws {