test(datastore): fix ObserveQuery with predicate test case (#2784)

Author: Di Wu

AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginIntegrationTests/DataStoreObserveQueryTests.swift

@@ -156,21 +156,37 @@ class DataStoreObserveQueryTests: SyncEngineIntegrationTestBase {
     ///    - The models only contain models based on the predicate
     ///
     func testInitialSyncWithPredicate() async throws {
-        await setUp(withModels: TestModelRegistration(), logLevel: .info)
+        let startTime = Temporal.DateTime.now()
+        await setUp(
+            withModels: TestModelRegistration(),
+            logLevel: .verbose,
+            dataStoreConfiguration: .custom(
+                syncMaxRecords: 100,
+                syncExpressions: [
+                    DataStoreSyncExpression(
+                        modelSchema: Post.schema,
+                        modelPredicate: { Post.keys.createdAt.ge(startTime) }
+                    )
+                ]
+            )
+        )
         try startAmplify()
-        let post1 = Post(title: "xyz 1", content: "content", createdAt: .now())
-        let post2 = Post(title: "xyz 2", content: "content", createdAt: .now())
-        let post3 = Post(title: "xyz 3", content: "content", createdAt: .now())
+
+        let randomTitle = UUID().uuidString
+        let post1 = Post(title: "\(randomTitle) 1", content: "content", createdAt: .now())
+        let post2 = Post(title: "\(randomTitle) 2", content: "content", createdAt: .now())
+        let post3 = Post(title: "\(randomTitle) 3", content: "content", createdAt: .now())
         try await savePostAndWaitForSync(post1)
         try await savePostAndWaitForSync(post2)
         try await savePostAndWaitForSync(post3)
         try await clearDataStore()
+
         var snapshots = [DataStoreQuerySnapshot<Post>]()
         let snapshotWithIsSynced = asyncExpectation(description: "query snapshot with isSynced true")
         var snapshotWithIsSyncedFulfilled = false
         let receivedPostFromObserveQuery = asyncExpectation(description: "received Post")
-        let post4 = Post(title: "xyz 4", content: "content", createdAt: .now())
-        let predicate = Post.keys.title.beginsWith("xyz")
+        let post4 = Post(title: "\(randomTitle) 4", content: "content", createdAt: .now())
+        let predicate = Post.keys.title.beginsWith(randomTitle)
         Amplify.Publisher.create(Amplify.DataStore.observeQuery(for: Post.self, where: predicate)).sink { completed in
             switch completed {
             case .finished:
@@ -184,17 +200,17 @@ class DataStoreObserveQueryTests: SyncEngineIntegrationTestBase {
                 snapshotWithIsSyncedFulfilled = true
                 Task { await snapshotWithIsSynced.fulfill() }
             } else if snapshotWithIsSyncedFulfilled {
-                if querySnapshot.items.count >= 4 && querySnapshot.items.contains(where: { post in
-                    post.title.contains("xyz")
-                }){
+                if querySnapshot.items.count >= 4
+                   && querySnapshot.items.allSatisfy({ $0.title.contains(randomTitle)})
+                {
                     Task { await receivedPostFromObserveQuery.fulfill() }
                 }
             }
 
         }.store(in: &cancellables)
 
         await waitForExpectations([snapshotWithIsSynced], timeout: 100)
-    
+
         try await savePostAndWaitForSync(post4)
         await waitForExpectations([receivedPostFromObserveQuery], timeout: 100)
 

AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginIntegrationTests/TestSupport/SyncEngineIntegrationTestBase.swift

@@ -32,16 +32,23 @@ class SyncEngineIntegrationTestBase: DataStoreTestBase {
     // swiftlint:enable force_try
     // swiftlint:enable force_cast
 
-    func setUp(withModels models: AmplifyModelRegistration, logLevel: LogLevel = .error) async {
-
+    func setUp(
+        withModels models: AmplifyModelRegistration,
+        logLevel: LogLevel = .error,
+        dataStoreConfiguration: DataStoreConfiguration? = nil
+    ) async {
         continueAfterFailure = false
 
         Amplify.Logging.logLevel = logLevel
 
         do {
             try Amplify.add(plugin: AWSAPIPlugin(modelRegistration: models))
-            try Amplify.add(plugin: AWSDataStorePlugin(modelRegistration: models,
-                                                       configuration: .custom(syncMaxRecords: 100)))
+            try Amplify.add(
+                plugin: AWSDataStorePlugin(
+                    modelRegistration: models,
+                    configuration: dataStoreConfiguration ?? .custom(syncMaxRecords: 100)
+                )
+            )
         } catch {
             XCTFail(String(describing: error))
             return
@@ -61,9 +68,13 @@ class SyncEngineIntegrationTestBase: DataStoreTestBase {
         try await Amplify.DataStore.clear()
     }
 
-    func startAmplify() throws {
-        let amplifyConfig = try TestConfigHelper.retrieveAmplifyConfiguration(
+    func getTestConfiguration() throws -> AmplifyConfiguration {
+        try TestConfigHelper.retrieveAmplifyConfiguration(
             forResource: Self.amplifyConfigurationFile)
+    }
+
+    func startAmplify() throws {
+        let amplifyConfig = try getTestConfiguration()
         do {
             try Amplify.configure(amplifyConfig)
         } catch {