chore: kickoff v1 release

Author: sebaland

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStorePlugin.swift

@@ -198,16 +198,7 @@ final public class AWSDataStorePlugin: DataStoreCategoryPlugin {
         case .failure(let dataStoreError):
             log.error("StorageEngine completed with error: \(dataStoreError)")
         case .finished:
-            break
-        }
-        stop { result in
-            switch result {
-            case .success:
-                self.log.info("Stopping DataStore successful.")
-                return
-            case .failure(let error):
-                self.log.error("Failed to stop StorageEngine with error: \(error)")
-            }
+            log.debug("StorageEngine completed successfully")
         }
     }
 

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Storage/StorageEngine.swift

@@ -133,9 +133,18 @@ final class StorageEngine: StorageEngineBehavior {
     func onReceiveCompletion(receiveCompletion: Subscribers.Completion<DataStoreError>) {
         switch receiveCompletion {
         case .failure(let dataStoreError):
-            storageEnginePublisher.send(completion: .failure(dataStoreError))
+            log.error("RemoteSyncEngine completed with error \(dataStoreError)")
         case .finished:
-            storageEnginePublisher.send(completion: .finished)
+            log.debug("RemoteSyncEngine completed successfully")
+        }
+
+        stopSync { result in
+            switch result {
+            case .success:
+                self.log.info("Stopping SyncEngine successful.")
+            case .failure(let error):
+                self.log.error("Failed to stop SyncEngine with error: \(error)")
+            }
         }
     }
 
@@ -323,6 +332,7 @@ final class StorageEngine: StorageEngineBehavior {
     func clear(completion: @escaping DataStoreCallback<Void>) {
         if let syncEngine = syncEngine {
             syncEngine.stop(completion: { _ in
+                self.syncEngine = nil
                 self.storageAdapter.clear(completion: completion)
             })
         } else {

AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginIntegrationTests/DataStoreObserveQueryTests.swift

@@ -252,10 +252,11 @@ class DataStoreObserveQueryTests: SyncEngineIntegrationTestBase {
                 snapshotWithIsSynced.fulfill()
             }
         }
-        savePostAndWaitForSync(Post(title: "title", content: "content", createdAt: .now()))
+        let newPost = Post(title: "title", content: "content", createdAt: .now())
+        savePostAndWaitForSync(newPost)
         wait(for: [snapshotWithIsSynced], timeout: 100)
-        XCTAssertTrue(snapshots.count >= 2)
-        XCTAssertFalse(snapshots[0].isSynced)
+        XCTAssertTrue(!snapshots.isEmpty)
+        XCTAssertTrue(snapshots.last!.items.contains(newPost))
         XCTAssertTrue(snapshots.last!.isSynced)
         XCTAssertTrue(snapshots.last!.items.count > numberOfPosts)
         sink.cancel()

AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Core/AWSDataStorePluginTests.swift

@@ -557,9 +557,8 @@ class AWSDataStorePluginTests: XCTestCase {
     func testStopStorageEngineOnTerminalEvent() {
         let storageEngine = MockStorageEngineBehavior()
         let stopExpectation = expectation(description: "stop should be called")
-        var count = 0
         storageEngine.responders[.stopSync] = StopSyncResponder { _ in
-            count = self.expect(stopExpectation, count, 1)
+            stopExpectation.fulfill()
         }
         let storageEngineBehaviorFactory: StorageEngineBehaviorFactory = {_, _, _, _, _, _  throws in
             return storageEngine
@@ -571,25 +570,24 @@ class AWSDataStorePluginTests: XCTestCase {
                                         validAPIPluginKey: "MockAPICategoryPlugin",
                                         validAuthPluginKey: "MockAuthCategoryPlugin")
 
-        let semaphore = DispatchSemaphore(value: 0)
+        let startExpectation = expectation(description: "Plugin should started")
         plugin.start(completion: {_ in
             XCTAssertNotNil(plugin.storageEngine)
             XCTAssertNotNil(plugin.dataStorePublisher)
-            semaphore.signal()
+            startExpectation.fulfill()
         })
-        semaphore.wait()
+        wait(for: [startExpectation], timeout: 1)
 
-        storageEngine.mockPublisher.send(completion: .finished)
+        storageEngine.mockSyncEnginePublisher.send(completion: .finished)
 
-        waitForExpectations(timeout: 1.0)
+        wait(for: [stopExpectation], timeout: 1)
     }
 
     func testStopStorageEngineOnTerminalFailureEvent() {
         let storageEngine = MockStorageEngineBehavior()
         let stopExpectation = expectation(description: "stop should be called")
-        var count = 0
         storageEngine.responders[.stopSync] = StopSyncResponder { _ in
-            count = self.expect(stopExpectation, count, 1)
+            stopExpectation.fulfill()
         }
         let storageEngineBehaviorFactory: StorageEngineBehaviorFactory = {_, _, _, _, _, _  throws in
             return storageEngine
@@ -601,16 +599,17 @@ class AWSDataStorePluginTests: XCTestCase {
                                         validAPIPluginKey: "MockAPICategoryPlugin",
                                         validAuthPluginKey: "MockAuthCategoryPlugin")
 
-        let semaphore = DispatchSemaphore(value: 0)
+        let startExpectation = expectation(description: "Plugin should started")
         plugin.start(completion: {_ in
             XCTAssertNotNil(plugin.storageEngine)
             XCTAssertNotNil(plugin.dataStorePublisher)
-            semaphore.signal()
+            startExpectation.fulfill()
         })
-        semaphore.wait()
 
-        storageEngine.mockPublisher.send(completion: .failure(.internalOperation("", "", nil)))
+        wait(for: [startExpectation], timeout: 1)
 
-        waitForExpectations(timeout: 1.0)
+        storageEngine.mockSyncEnginePublisher.send(completion: .failure(.internalOperation("", "", nil)))
+
+        wait(for: [stopExpectation], timeout: 1)
     }
 } // swiftlint:disable:this file_length

AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Sync/SubscriptionSync/Support/MockSQLiteStorageEngineAdapter.swift

@@ -303,6 +303,15 @@ class MockStorageEngineBehavior: StorageEngineBehavior {
 
     }
 
+    var mockSyncEnginePublisher: PassthroughSubject<RemoteSyncEngineEvent, DataStoreError>!
+    var mockSyncEngineSubscription: AnyCancellable! {
+        willSet {
+            if let subscription = mockSyncEngineSubscription {
+                subscription.cancel()
+            }
+        }
+    }
+
     var mockPublisher = PassthroughSubject<StorageEngineEvent, DataStoreError>()
     var publisher: AnyPublisher<StorageEngineEvent, DataStoreError> {
         mockPublisher.eraseToAnyPublisher()
@@ -314,6 +323,10 @@ class MockStorageEngineBehavior: StorageEngineBehavior {
                 responder.callback("")
             }
             startedSync = true
+            mockSyncEnginePublisher = PassthroughSubject()
+            mockSyncEngineSubscription = mockSyncEnginePublisher.sink(receiveCompletion: { completion in
+                self.stopSync(completion: { _ in })
+            }, receiveValue: { _ in })
             return .success(.successfullyInitialized)
         } else {
             return .success(.alreadyInitialized)

AmplifyPlugins/DataStore/Podfile.lock

@@ -128,4 +128,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 0bab7193bebdf470839514f327440893b0d26090
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.0