Test tweaks

Author: wu-hui

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

@@ -473,7 +473,7 @@ public void testHandlesDeletedDocumentThenSetMutationThenAck() {
     writeMutation(setMutation("foo/bar", map("foo", "bar")));
     int expectedVersion = garbageCollectorIsEager() ? 0 : 2;
     assertChanged(doc("foo/bar", expectedVersion, map("foo", "bar")).setHasLocalMutations());
-    assertContains(doc("foo/bar", 2, map("foo", "bar")).setHasLocalMutations());
+    assertContains(doc("foo/bar", expectedVersion, map("foo", "bar")).setHasLocalMutations());
 
     releaseTarget(targetId);
     acknowledgeMutation(3);
@@ -618,7 +618,7 @@ public void testHandlesDocumentThenDeleteMutationThenAck() {
 
     writeMutation(deleteMutation("foo/bar"));
     assertRemoved("foo/bar");
-    assertContains(deletedDoc("foo/bar", 2).setHasLocalMutations());
+    assertContains(deletedDoc("foo/bar", 1).setHasLocalMutations());
 
     // Remove the target so only the mutation is pinning the document.
     releaseTarget(targetId);
@@ -642,7 +642,7 @@ public void testHandlesDeleteMutationThenDocumentThenAck() {
     applyRemoteEvent(
         updateRemoteEvent(doc("foo/bar", 1, map("it", "base")), asList(targetId), emptyList()));
     assertRemoved("foo/bar");
-    assertContains(deletedDoc("foo/bar", 2).setHasLocalMutations());
+    assertContains(deletedDoc("foo/bar", 1).setHasLocalMutations());
 
     releaseTarget(targetId);
     acknowledgeMutation(2);

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

@@ -100,7 +100,7 @@ public void testCreateOverlayFromSet() {
         setMutation("foo/bar", map("foo", "bar")),
         persistence.getDocumentOverlay(User.UNAUTHENTICATED).getOverlay(key("foo/bar")));
     // Version is 0 because of remote document elision.
-    assertContains(doc("foo/bar", 0, map("foo", "bar")).setHasLocalMutations());
+    assertContains(doc("foo/bar", 2, map("foo", "bar")).setHasLocalMutations());
 
     SQLiteOverlayMigrationManager migrationManager =
         (SQLiteOverlayMigrationManager) persistence.getOverlayMigrationManager();
@@ -124,7 +124,7 @@ public void testCreateOverlayFromDelete() {
         deleteMutation("foo/bar"),
         persistence.getDocumentOverlay(User.UNAUTHENTICATED).getOverlay(key("foo/bar")));
     // Version is 0 because of remote document elision.
-    assertContains(deletedDoc("foo/bar", 0).setHasLocalMutations());
+    assertContains(deletedDoc("foo/bar", 2).setHasLocalMutations());
 
     SQLiteOverlayMigrationManager migrationManager =
         (SQLiteOverlayMigrationManager) persistence.getOverlayMigrationManager();