resolve TODOs

Author: milaGGL

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

@@ -250,8 +250,6 @@ public void listenToDocumentsWithBsonTypes() throws Throwable {
     }
   }
 
-  // TODO(Mila/BSON): remove the cache population after updating the
-  // assertSDKQueryResultsConsistentWithBackend
   @Test
   public void filterAndOrderBsonObjectIds() throws Exception {
     Map<String, Map<String, Object>> docs =
@@ -264,9 +262,6 @@ public void filterAndOrderBsonObjectIds() throws Exception {
             map("key", new BsonObjectId("507f191e810c19729de860ec")));
     CollectionReference randomColl = testCollectionWithDocsOnNightly(docs);
 
-    // Pre-populate the cache with all docs
-    waitFor(randomColl.get());
-
     Query orderedQuery =
         randomColl
             .orderBy("key", Direction.DESCENDING)
@@ -296,9 +291,6 @@ public void filterAndOrderBsonTimestamps() throws Exception {
             map("key", new BsonTimestamp(2, 1)));
     CollectionReference randomColl = testCollectionWithDocsOnNightly(docs);
 
-    // Pre-populate the cache with all docs
-    waitFor(randomColl.get());
-
     Query orderedQuery =
         randomColl
             .orderBy("key", Direction.DESCENDING)
@@ -328,9 +320,6 @@ public void filterAndOrderBsonBinaryData() throws Exception {
             map("key", BsonBinaryData.fromBytes(2, new byte[] {1, 2, 2})));
     CollectionReference randomColl = testCollectionWithDocsOnNightly(docs);
 
-    // Pre-populate the cache with all docs
-    waitFor(randomColl.get());
-
     Query orderedQuery =
         randomColl
             .orderBy("key", Direction.DESCENDING)
@@ -357,9 +346,6 @@ public void filterAndOrderRegex() throws Exception {
             "c", map("key", new RegexValue("^baz", "i")));
     CollectionReference randomColl = testCollectionWithDocsOnNightly(docs);
 
-    // Pre-populate the cache with all docs
-    waitFor(randomColl.get());
-
     Query orderedQuery =
         randomColl
             .orderBy("key", Direction.DESCENDING)
@@ -386,9 +372,6 @@ public void filterAndOrderInt32() throws Exception {
             "c", map("key", new Int32Value(2)));
     CollectionReference randomColl = testCollectionWithDocsOnNightly(docs);
 
-    // Pre-populate the cache with all docs
-    waitFor(randomColl.get());
-
     Query orderedQuery =
         randomColl.orderBy("key", Direction.DESCENDING).whereGreaterThan("key", new Int32Value(-1));
 
@@ -413,9 +396,6 @@ public void filterAndOrderMinKey() throws Exception {
             "e", map("key", MaxKey.instance()));
     CollectionReference randomColl = testCollectionWithDocsOnNightly(docs);
 
-    // Pre-populate the cache with all docs
-    waitFor(randomColl.get());
-
     Query query =
         randomColl
             .orderBy(
@@ -426,9 +406,8 @@ public void filterAndOrderMinKey() throws Exception {
 
     assertSDKQueryResultsConsistentWithBackend(randomColl, query, docs, Arrays.asList("b", "a"));
 
-    // TODO(Mila/BSON): uncomment this test when null value inclusion is fixed
-    // query = randomColl.whereNotEqualTo("key", MinKey.instance());
-    // assertSDKQueryResultsConsistentWithBackend(query, docs, Arrays.asList("d", "e"));
+    query = randomColl.whereNotEqualTo("key", MinKey.instance());
+    assertSDKQueryResultsConsistentWithBackend(randomColl, query, docs, Arrays.asList("d", "e"));
 
     query = randomColl.whereGreaterThanOrEqualTo("key", MinKey.instance());
     assertSDKQueryResultsConsistentWithBackend(randomColl, query, docs, Arrays.asList("a", "b"));
@@ -454,9 +433,6 @@ public void filterAndOrderMaxKey() throws Exception {
             "e", map("key", null));
     CollectionReference randomColl = testCollectionWithDocsOnNightly(docs);
 
-    // Pre-populate the cache with all docs
-    waitFor(randomColl.get());
-
     Query query =
         randomColl
             .orderBy(
@@ -467,9 +443,8 @@ public void filterAndOrderMaxKey() throws Exception {
 
     assertSDKQueryResultsConsistentWithBackend(randomColl, query, docs, Arrays.asList("d", "c"));
 
-    // TODO(Mila/BSON): uncomment this test when null value inclusion is fixed
-    // query = randomColl.whereNotEqualTo("key", MaxKey.instance());
-    // assertSDKQueryResultsConsistentWithBackend(randomColl, query, docs, Arrays.asList("a", "b"));
+    query = randomColl.whereNotEqualTo("key", MaxKey.instance());
+    assertSDKQueryResultsConsistentWithBackend(randomColl, query, docs, Arrays.asList("a", "b"));
 
     query = randomColl.whereGreaterThanOrEqualTo("key", MaxKey.instance());
     assertSDKQueryResultsConsistentWithBackend(randomColl, query, docs, Arrays.asList("c", "d"));
@@ -495,9 +470,6 @@ public void filterNullValueWithBsonTypes() throws Exception {
             "e", map("key", MaxKey.instance()));
     CollectionReference randomColl = testCollectionWithDocsOnNightly(docs);
 
-    // Pre-populate the cache with all docs
-    waitFor(randomColl.get());
-
     Query query = randomColl.whereEqualTo("key", null);
     assertSDKQueryResultsConsistentWithBackend(randomColl, query, docs, Arrays.asList("b", "c"));
 
@@ -550,9 +522,6 @@ public void orderBsonTypesTogether() throws Exception {
             map("key", MaxKey.instance()));
     CollectionReference randomColl = testCollectionWithDocsOnNightly(docs);
 
-    // Pre-populate the cache with all docs
-    waitFor(randomColl.get());
-
     Query orderedQuery = randomColl.orderBy("key", Direction.DESCENDING);
     List<String> expectedDocs =
         Arrays.asList(