Increase tests coverage

Author: cherylEnkidu

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/IndexingTest.java

@@ -14,8 +14,12 @@
 
 package com.google.firebase.firestore;
 
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testCollectionWithDocs;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testFirestore;
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitFor;
 import static com.google.firebase.firestore.testutil.TestUtil.assertDoesNotThrow;
+import static com.google.firebase.firestore.testutil.TestUtil.map;
+import static org.junit.Assert.assertEquals;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
@@ -112,15 +116,49 @@ public void testAutomaticIndexingSetSuccessfully() {
             .setLocalCacheSettings(PersistentCacheSettings.newBuilder().build())
             .build();
     db.setFirestoreSettings(settings);
+
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("match", true),
+                "b", map("match", false),
+                "c", map("match", false)));
+    QuerySnapshot results = waitFor(collection.whereEqualTo("match", true).get());
+    assertEquals(1, results.size());
+
     assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().enableIndexAutoCreation());
+
+    results = waitFor(collection.whereEqualTo("match", true).get());
+    assertEquals(1, results.size());
+
     assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().disableIndexAutoCreation());
+
+    results = waitFor(collection.whereEqualTo("match", true).get());
+    assertEquals(1, results.size());
   }
 
   @Test
   public void testAutomaticIndexingSetSuccessfullyUseDefault() {
     // Use persistent disk cache (default)
     FirebaseFirestore db = testFirestore();
+
+    CollectionReference collection =
+        testCollectionWithDocs(
+            map(
+                "a", map("match", true),
+                "b", map("match", false),
+                "c", map("match", false)));
+    QuerySnapshot results = waitFor(collection.whereEqualTo("match", true).get());
+    assertEquals(1, results.size());
+
     assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().enableIndexAutoCreation());
+
+    results = waitFor(collection.whereEqualTo("match", true).get());
+    assertEquals(1, results.size());
+
     assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().disableIndexAutoCreation());
+
+    results = waitFor(collection.whereEqualTo("match", true).get());
+    assertEquals(1, results.size());
   }
 }

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

@@ -502,4 +502,33 @@ public void testDisableIndexAutoCreationWorks() {
     executeQuery(query2);
     assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
   }
+
+  @Test
+  public void testIndexAutoCreationWorksWithMutation() {
+    Query query = query("coll").filter(filter("matches", "==", true));
+    int targetId = allocateQuery(query);
+
+    enableIndexAutoCreation();
+
+    applyRemoteEvent(addedRemoteEvent(doc("coll/a", 10, map("matches", true)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/b", 10, map("matches", false)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/c", 10, map("matches", false)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/d", 10, map("matches", false)), targetId));
+    applyRemoteEvent(addedRemoteEvent(doc("coll/e", 10, map("matches", true)), targetId));
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 0, /* byCollection= */ 2);
+    assertQueryReturned("coll/a", "coll/e");
+
+    writeMutation(deleteMutation("coll/e"));
+
+    backfillIndexes();
+
+    writeMutation(setMutation("coll/f", map("matches", true)));
+
+    executeQuery(query);
+    assertRemoteDocumentsRead(/* byKey= */ 1, /* byCollection= */ 0);
+    assertOverlaysRead(/* byKey= */ 1, /* byCollection= */ 1);
+    assertQueryReturned("coll/a", "coll/f");
+  }
 }