fix broken unit test cases of API and DataStore

aws-amplify · Apr 26, 2024 · acbb4e8 · acbb4e8
1 parent 1a20c33
commit acbb4e8
Show file tree

Hide file tree

Showing 11 changed files with 147 additions and 135 deletions.
diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/AWSAPICategoryPlugin+ReachabilityTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/AWSAPICategoryPlugin+ReachabilityTests.swift
@@ -82,7 +82,7 @@ class AWSAPICategoryPluginReachabilityTests: XCTestCase {
         XCTAssertEqual(reachability.key, graphQLAPI)
     }
 
-    func testReachabilityConcurrentPerform() throws {
+    func testReachabilityConcurrentPerform() async throws {
         let graphQLAPI = "graphQLAPI"
         let restAPI = "restAPI"
         do {
@@ -114,7 +114,7 @@ class AWSAPICategoryPluginReachabilityTests: XCTestCase {
             concurrentPerformCompleted.fulfill()
 
         }
-        wait(for: [concurrentPerformCompleted], timeout: 1)
+        await fulfillment(of: [concurrentPerformCompleted], timeout: 1)
         XCTAssertEqual(apiPlugin.reachabilityMap.count, 2)
     }
 

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/AWSGraphQLOperationTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/AWSGraphQLOperationTests.swift
@@ -15,7 +15,7 @@ import AWSPluginsCore
 class AWSGraphQLOperationTests: AWSAPICategoryPluginTestBase {
 
     /// Tests that upon completion, the operation is removed from the task mapper.
-    func testOperationCleanup() {
+    func testOperationCleanup() async {
         let request = GraphQLRequest(apiName: apiName,
                                      document: testDocument,
                                      variables: nil,
@@ -34,7 +34,7 @@ class AWSGraphQLOperationTests: AWSAPICategoryPluginTestBase {
         } receiveValue: { _ in }
         defer { sink.cancel() }
 
-        wait(for: [receivedCompletion], timeout: 1)
+        await fulfillment(of: [receivedCompletion], timeout: 1)
         let task = operation.mapper.task(for: operation)
         XCTAssertNil(task)
     }

diff --git a/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/AWSRESTOperationTests.swift b/AmplifyPlugins/API/Tests/AWSAPIPluginTests/Operation/AWSRESTOperationTests.swift
@@ -52,7 +52,7 @@ class AWSRESTOperationTests: OperationTestBase {
         await fulfillment(of: [listenerWasInvoked], timeout: 3)
     }
 
-    func testGetFailsWithBadAPIName() throws {
+    func testGetFailsWithBadAPIName() async throws {
         let sentData = Data([0x00, 0x01, 0x02, 0x03])
         try setUpPluginForSingleResponse(sending: sentData, for: .rest)
 
@@ -69,14 +69,13 @@ class AWSRESTOperationTests: OperationTestBase {
                 receivedFailure.fulfill()
             }
         }
-
-        waitForExpectations(timeout: 1.00)
+        await fulfillment(of: [receivedSuccess, receivedFailure], timeout: 1)
     }
 
     /// - Given: A configured plugin
     /// - When: I invoke `APICategory.get(apiName:path:listener:)`
     /// - Then: The listener is invoked with the successful value
-    func testGetReturnsValue() throws {
+    func testGetReturnsValue() async throws {
         let sentData = Data([0x00, 0x01, 0x02, 0x03])
         try setUpPluginForSingleResponse(sending: sentData, for: .rest)
 
@@ -92,10 +91,10 @@ class AWSRESTOperationTests: OperationTestBase {
             callbackInvoked.fulfill()
         }
 
-        wait(for: [callbackInvoked], timeout: 1.0)
+        await fulfillment(of: [callbackInvoked], timeout: 1.0)
     }
 
-    func testRESTOperation_withCustomHeader_shouldOverrideDefaultAmplifyHeaders() throws {
+    func testRESTOperation_withCustomHeader_shouldOverrideDefaultAmplifyHeaders() async throws {
         let expectedHeaderValue = "text/plain"
         let sentData = Data([0x00, 0x01, 0x02, 0x03])
         try setUpPluginForSingleResponse(sending: sentData, for: .rest)
@@ -117,7 +116,7 @@ class AWSRESTOperationTests: OperationTestBase {
             }
             callbackInvoked.fulfill()
         }
-        wait(for: [callbackInvoked, validated], timeout: 1.0)
+        await fulfillment(of: [callbackInvoked, validated], timeout: 1.0)
     }
 
 }

diff --git a/...fyPlugins/API/Tests/AWSAPIPluginTests/Reachability/NetworkReachabilityNotifierTests.swift b/...fyPlugins/API/Tests/AWSAPIPluginTests/Reachability/NetworkReachabilityNotifierTests.swift
@@ -93,7 +93,7 @@ class NetworkReachabilityNotifierTests: XCTestCase {
         cancellable.cancel()
     }
 
-    func testWifiConnectivity_publisherGoesOutOfScope() {
+    func testWifiConnectivity_publisherGoesOutOfScope() async {
         MockReachability.iConnection = .wifi
         let defaultValueExpect = expectation(description: ".sink receives default value")
         let completeExpect = expectation(description: ".sink receives completion")
@@ -104,12 +104,12 @@ class NetworkReachabilityNotifierTests: XCTestCase {
             defaultValueExpect.fulfill()
         })
 
-        wait(for: [defaultValueExpect], timeout: 1.0)
+        await fulfillment(of: [defaultValueExpect], timeout: 1.0)
         notifier = nil
         notification = Notification.init(name: .reachabilityChanged)
         NotificationCenter.default.post(notification)
 
-        wait(for: [completeExpect], timeout: 1.0)
+        await fulfillment(of: [completeExpect], timeout: 1.0)
         cancellable.cancel()
     }
 }