Simply RemoteEventTests (#3307)

Author: schmidt-sebastian

firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalStoreTestCase.java

@@ -386,12 +386,7 @@ public void testHandlesSetMutationThenDocument() {
     Query query = query("foo");
     int targetId = allocateQuery(query);
     applyRemoteEvent(
-        updateRemoteEvent(
-            doc("foo/bar", 2, map("it", "changed")).setHasLocalMutations(),
-            asList(targetId),
-            emptyList(),
-            asList(targetId),
-            version(2)));
+        updateRemoteEvent(doc("foo/bar", 2, map("it", "changed")), asList(targetId), emptyList()));
     assertChanged(doc("foo/bar", 2, map("foo", "bar")).setHasLocalMutations());
     assertContains(doc("foo/bar", 2, map("foo", "bar")).setHasLocalMutations());
   }
@@ -549,11 +544,7 @@ public void testHandlesPatchMutationThenDocumentThenAck() {
     Query query = query("foo");
     int targetId = allocateQuery(query);
     applyRemoteEvent(
-        addedRemoteEvent(
-            asList(doc("foo/bar", 1, map("it", "base")).setHasLocalMutations()),
-            asList(targetId),
-            emptyList(),
-            version(1)));
+        addedRemoteEvent(doc("foo/bar", 1, map("it", "base")), asList(targetId), emptyList()));
     assertChanged(doc("foo/bar", 1, map("foo", "bar", "it", "base")).setHasLocalMutations());
     assertContains(doc("foo/bar", 1, map("foo", "bar", "it", "base")).setHasLocalMutations());
 
@@ -693,11 +684,7 @@ public void testHandlesSetMutationThenPatchMutationThenDocumentThenAckThenAck()
     int targetId = allocateQuery(query);
     applyRemoteEvent(
         updateRemoteEvent(
-            doc("foo/bar", 1, map("it", "base")).setHasLocalMutations(),
-            asList(targetId),
-            emptyList(),
-            asList(targetId),
-            version(1)));
+            doc("foo/bar", 1, map("it", "base")), asList(targetId), emptyList(), asList(targetId)));
     assertChanged(doc("foo/bar", 1, map("foo", "bar")).setHasLocalMutations());
     assertContains(doc("foo/bar", 1, map("foo", "bar")).setHasLocalMutations());
 
@@ -1119,8 +1106,7 @@ public void testUsesTargetMappingToExecuteQueries() {
         addedRemoteEvent(
             asList(doc("foo/a", 10, map("matches", true)), doc("foo/b", 10, map("matches", true))),
             asList(targetId),
-            emptyList(),
-            version(10)));
+            emptyList()));
     applyRemoteEvent(noChangeEvent(targetId, 10));
     updateViews(targetId, /* fromCache= */ false);
 
@@ -1143,10 +1129,7 @@ public void testIgnoresTargetMappingAfterExistenceFilterMismatch() {
     // Persist a mapping with a single document
     applyRemoteEvent(
         addedRemoteEvent(
-            asList(doc("foo/a", 10, map("matches", true))),
-            asList(targetId),
-            emptyList(),
-            version(10)));
+            asList(doc("foo/a", 10, map("matches", true))), asList(targetId), emptyList()));
     applyRemoteEvent(noChangeEvent(targetId, 10));
     updateViews(targetId, /* fromCache= */ false);
 
@@ -1249,8 +1232,7 @@ public void testQueriesIncludeDocumentsFromOtherQueries() {
         addedRemoteEvent(
             asList(doc("foo/a", 10, map("matches", true)), doc("foo/b", 20, map("matches", true))),
             asList(targetId),
-            emptyList(),
-            version(20)));
+            emptyList()));
     releaseTarget(targetId);
 
     // Run the original query again and ensure that both the original matches as well as all new
@@ -1275,8 +1257,7 @@ public void testQueriesFilterDocumentsThatNoLongerMatch() {
         addedRemoteEvent(
             asList(doc("foo/a", 10, map("matches", true)), doc("foo/b", 10, map("matches", true))),
             asList(targetId),
-            emptyList(),
-            version(10)));
+            emptyList()));
     applyRemoteEvent(noChangeEvent(targetId, 10));
     updateViews(targetId, /* fromCache=*/ false);
     releaseTarget(targetId);
@@ -1288,8 +1269,7 @@ public void testQueriesFilterDocumentsThatNoLongerMatch() {
         addedRemoteEvent(
             asList(doc("foo/a", 10, map("matches", true)), doc("foo/b", 20, map("matches", false))),
             asList(targetId),
-            emptyList(),
-            version(20)));
+            emptyList()));
     releaseTarget(targetId);
 
     // Re-run the filtered query and verify that the modified document is no longer returned.
@@ -1613,8 +1593,7 @@ public void testOnlyPersistsUpdatesForDocumentsWhenVersionChanges() {
         addedRemoteEvent(
             asList(doc("foo/bar", 1, map("val", "new")), doc("foo/baz", 2, map("val", "new"))),
             asList(2),
-            emptyList(),
-            version(2)));
+            emptyList()));
 
     assertChanged(doc("foo/baz", 2, map("val", "new")));
     // The update for foo/bar is ignored.

firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/TestUtil.java

@@ -424,7 +424,7 @@ public static RemoteEvent noChangeEvent(int targetId, int version, ByteString re
 
   public static RemoteEvent addedRemoteEvent(
       MutableDocument doc, List<Integer> updatedInTargets, List<Integer> removedFromTargets) {
-    return addedRemoteEvent(singletonList(doc), updatedInTargets, removedFromTargets, null);
+    return addedRemoteEvent(singletonList(doc), updatedInTargets, removedFromTargets);
   }
 
   public static RemoteEvent existenceFilterEvent(
@@ -445,8 +445,7 @@ public static RemoteEvent existenceFilterEvent(
   public static RemoteEvent addedRemoteEvent(
       List<MutableDocument> docs,
       List<Integer> updatedInTargets,
-      List<Integer> removedFromTargets,
-      @Nullable SnapshotVersion eventVersion) {
+      List<Integer> removedFromTargets) {
     Preconditions.checkArgument(!docs.isEmpty(), "Cannot pass empty docs array");
 
     WatchChangeAggregator aggregator =
@@ -473,35 +472,26 @@ public TargetData getTargetDataForTarget(int targetId) {
       version = doc.getVersion().compareTo(version) > 0 ? doc.getVersion() : version;
     }
 
-    return aggregator.createRemoteEvent(eventVersion == null ? version : eventVersion);
+    return aggregator.createRemoteEvent(version);
   }
 
   public static RemoteEvent addedRemoteEvent(MutableDocument doc, Integer targetId) {
-    return addedRemoteEvent(singletonList(doc), singletonList(targetId), emptyList(), null);
+    return addedRemoteEvent(singletonList(doc), singletonList(targetId), emptyList());
   }
 
   public static RemoteEvent updateRemoteEvent(
       MutableDocument doc, List<Integer> updatedInTargets, List<Integer> removedFromTargets) {
     List<Integer> activeTargets = new ArrayList<>();
     activeTargets.addAll(updatedInTargets);
     activeTargets.addAll(removedFromTargets);
-    return updateRemoteEvent(doc, updatedInTargets, removedFromTargets, activeTargets, null);
+    return updateRemoteEvent(doc, updatedInTargets, removedFromTargets, activeTargets);
   }
 
   public static RemoteEvent updateRemoteEvent(
       MutableDocument doc,
       List<Integer> updatedInTargets,
       List<Integer> removedFromTargets,
       List<Integer> activeTargets) {
-    return updateRemoteEvent(doc, updatedInTargets, removedFromTargets, activeTargets, null);
-  }
-
-  public static RemoteEvent updateRemoteEvent(
-      MutableDocument doc,
-      List<Integer> updatedInTargets,
-      List<Integer> removedFromTargets,
-      List<Integer> activeTargets,
-      @Nullable SnapshotVersion eventVersion) {
     DocumentChange change =
         new DocumentChange(updatedInTargets, removedFromTargets, doc.getKey(), doc);
     WatchChangeAggregator aggregator =
@@ -520,7 +510,7 @@ public TargetData getTargetDataForTarget(int targetId) {
               }
             });
     aggregator.handleDocumentChange(change);
-    return aggregator.createRemoteEvent(eventVersion == null ? doc.getVersion() : eventVersion);
+    return aggregator.createRemoteEvent(doc.getVersion());
   }
 
   public static SetMutation setMutation(String path, Map<String, Object> values) {