use new test helpers after merging master

Brian Chen · Brian Chen · commit 1a5aaa962686 · 2021-11-19T12:06:56.000-06:00
diff --git a/firebase-crashlytics-ndk/src/third_party/crashpad b/firebase-crashlytics-ndk/src/third_party/crashpad
@@ -1 +1 @@
-Subproject commit e5e47bc277532ae109a444cbb3646977c93fc077
+Subproject commit 36d4bb83b3d79dc85c35c258a9364f7d6ec0f6b3
diff --git a/firebase-crashlytics-ndk/src/third_party/mini_chromium b/firebase-crashlytics-ndk/src/third_party/mini_chromium
@@ -1 +1 @@
-Subproject commit 0e22eed71eec97dacbe80822a14c5cd0b580d793
+Subproject commit 76a9bb7475f6217eaf108789246379d3972b4e6a
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteIndexManager.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteIndexManager.java
@@ -22,6 +22,7 @@
 
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
+import com.google.firebase.Timestamp;
 import com.google.firebase.firestore.auth.User;
 import com.google.firebase.firestore.core.Bound;
 import com.google.firebase.firestore.core.FieldFilter;
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/IndexBackfillerTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/IndexBackfillerTest.java
@@ -186,8 +186,6 @@ public void testBackfillWritesOldestDocumentFirst() {
   }
 
   @Test
-  @Ignore("Flaky")
-  // TODO(indexing): This test is flaky. Fix.
   public void testBackfillUpdatesCollectionGroups() {
     addFieldIndex("coll1", "foo");
     addFieldIndex("coll2", "foo");
diff --git a/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteIndexManagerTest.java b/firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteIndexManagerTest.java
@@ -29,7 +29,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import com.google.firebase.Timestamp;
 import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.core.Target;
 import com.google.firebase.firestore.model.DocumentKey;
@@ -661,9 +660,9 @@ public void testAddFieldIndexWritesToCollectionGroup() {
   public void markCollectionGroupIndexedSetsCollectionToNextMax() {
     SQLiteIndexManager sqLiteIndexManager = (SQLiteIndexManager) indexManager;
     sqLiteIndexManager.addFieldIndex(
-        new FieldIndex("coll1").withAddedField(field("value"), FieldIndex.Segment.Kind.ASCENDING));
+        fieldIndex("coll1", 1, version(10), "value", FieldIndex.Segment.Kind.ASCENDING));
     sqLiteIndexManager.addFieldIndex(
-        new FieldIndex("coll2").withAddedField(field("value"), FieldIndex.Segment.Kind.ASCENDING));
+        fieldIndex("coll2", 2, version(10), "value", FieldIndex.Segment.Kind.ASCENDING));
 
     // Set `coll1` to max value.
     sqLiteIndexManager.markCollectionGroupIndexed("coll1");

Original file line number	Diff line number	Diff line change
`@@ -186,8 +186,6 @@ public void testBackfillWritesOldestDocumentFirst() {`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`@Test`
`189`		`- @Ignore("Flaky")`
`190`		`- // TODO(indexing): This test is flaky. Fix.`
`191`	`189`	`public void testBackfillUpdatesCollectionGroups() {`
`192`	`190`	`addFieldIndex("coll1", "foo");`
`193`	`191`	`addFieldIndex("coll2", "foo");`