switch back to Lists.newArrayList() and remove assertSetEquals override

Author: Brian Chen

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

@@ -20,7 +20,6 @@
 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.assertSetEquals;
 import static com.google.firebase.firestore.testutil.TestUtil.expectError;
 import static com.google.firebase.firestore.testutil.TestUtil.map;
 import static java.util.Arrays.asList;
@@ -32,6 +31,7 @@
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.firebase.firestore.Query.Direction;
 import com.google.firebase.firestore.testutil.EventAccumulator;
@@ -514,30 +514,30 @@ public void testQueriesCanUseNotEqualFilters() {
     expectedDocsMap.remove("i");
 
     QuerySnapshot snapshot = waitFor(collection.whereNotEqualTo("zip", 98101L).get());
-    assertSetEquals(expectedDocsMap.values(), querySnapshotToValues(snapshot));
+    assertEquals(Lists.newArrayList(expectedDocsMap.values()), querySnapshotToValues(snapshot));
 
     // With objects.
     expectedDocsMap = Maps.newHashMap(allDocs);
     expectedDocsMap.remove("f");
     expectedDocsMap.remove("h");
     expectedDocsMap.remove("i");
     snapshot = waitFor(collection.whereNotEqualTo("zip", map("code", 500)).get());
-    assertSetEquals(expectedDocsMap.values(), querySnapshotToValues(snapshot));
+    assertEquals(Lists.newArrayList(expectedDocsMap.values()), querySnapshotToValues(snapshot));
 
     // With Null.
     expectedDocsMap = Maps.newHashMap(allDocs);
     expectedDocsMap.remove("h");
     expectedDocsMap.remove("i");
     snapshot = waitFor(collection.whereNotEqualTo("zip", null).get());
-    assertSetEquals(expectedDocsMap.values(), querySnapshotToValues(snapshot));
+    assertEquals(Lists.newArrayList(expectedDocsMap.values()), querySnapshotToValues(snapshot));
 
     // With NaN.
     expectedDocsMap = Maps.newHashMap(allDocs);
     expectedDocsMap.remove("h");
     expectedDocsMap.remove("i");
     expectedDocsMap.remove("j");
     snapshot = waitFor(collection.whereNotEqualTo("zip", Double.NaN).get());
-    assertSetEquals(expectedDocsMap.values(), querySnapshotToValues(snapshot));
+    assertEquals(Lists.newArrayList(expectedDocsMap.values()), querySnapshotToValues(snapshot));
   }
 
   // TODO(ne-queries): Re-enable once emulator support is added to CI.
@@ -647,14 +647,14 @@ public void testQueriesCanUseNotInFilters() {
 
     QuerySnapshot snapshot =
         waitFor(collection.whereNotIn("zip", asList(98101L, 98103L, asList(98101L, 98102L))).get());
-    assertSetEquals(expectedDocsMap.values(), querySnapshotToValues(snapshot));
+    assertEquals(Lists.newArrayList(expectedDocsMap.values()), querySnapshotToValues(snapshot));
 
     // With objects.
     expectedDocsMap = Maps.newHashMap(allDocs);
     expectedDocsMap.remove("f");
     expectedDocsMap.remove("h");
     snapshot = waitFor(collection.whereNotIn("zip", asList(map("code", 500L))).get());
-    assertSetEquals(expectedDocsMap.values(), querySnapshotToValues(snapshot));
+    assertEquals(Lists.newArrayList(expectedDocsMap.values()), querySnapshotToValues(snapshot));
 
     // With Null.
     List<Object> nullArray = new ArrayList<>();
@@ -667,15 +667,15 @@ public void testQueriesCanUseNotInFilters() {
     expectedDocsMap.remove("h");
     expectedDocsMap.remove("j");
     snapshot = waitFor(collection.whereNotIn("zip", asList(Double.NaN)).get());
-    assertSetEquals(expectedDocsMap.values(), querySnapshotToValues(snapshot));
+    assertEquals(Lists.newArrayList(expectedDocsMap.values()), querySnapshotToValues(snapshot));
 
     // With NaN and a number.
     expectedDocsMap = Maps.newHashMap(allDocs);
     expectedDocsMap.remove("a");
     expectedDocsMap.remove("h");
     expectedDocsMap.remove("j");
     snapshot = waitFor(collection.whereNotIn("zip", asList(Float.NaN, 98101L)).get());
-    assertSetEquals(expectedDocsMap.values(), querySnapshotToValues(snapshot));
+    assertEquals(Lists.newArrayList(expectedDocsMap.values()), querySnapshotToValues(snapshot));
   }
 
   // TODO(ne-queries): Re-enable once emulator support is added to CI.

firebase-firestore/src/main/java/com/google/firebase/firestore/Query.java

@@ -524,13 +524,16 @@ private void validateOrderByFieldMatchesInequality(
    * Given an operator, returns the set of operators that cannot be used with it.
    *
    * <p>Operators in a query must adhere to the following set of rules:
-   * <li>Only one array operator is allowed.
-   * <li>Only one disjunctive operator is allowed.
-   * <li>NOT_EQUAL cannot be used with another NOT_EQUAL operator.
-   * <li>NOT_IN cannot be used with array, disjunctive, or NOT_EQUAL operators.
    *
-   *     <p>Array operators: ARRAY_CONTAINS, ARRAY_CONTAINS_ANY Disjunctive operators: IN,
-   *     ARRAY_CONTAINS_ANY, NOT_IN
+   * <ol>
+   *   <li>Only one array operator is allowed.
+   *   <li>Only one disjunctive operator is allowed.
+   *   <li>NOT_EQUAL cannot be used with another NOT_EQUAL operator.
+   *   <li>NOT_IN cannot be used with array, disjunctive, or NOT_EQUAL operators.
+   * </ol>
+   *
+   * <p>Array operators: ARRAY_CONTAINS, ARRAY_CONTAINS_ANY Disjunctive operators: IN,
+   * ARRAY_CONTAINS_ANY, NOT_IN
    */
   private List<Operator> conflictingOps(Operator op) {
     switch (op) {

firebase-firestore/src/main/java/com/google/firebase/firestore/core/NotInFilter.java

@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC
+// Copyright 2020 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

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

@@ -611,12 +611,6 @@ public static <T> void assertSetEquals(List<T> expected, Set<T> actual) {
     assertEquals(expectedSet, actual);
   }
 
-  public static <T> void assertSetEquals(Iterable<T> expected, Iterable<T> actual) {
-    Set<T> expectedSet = Sets.newHashSet(expected);
-    Set<T> actualSet = Sets.newHashSet(actual);
-    assertEquals(expectedSet, actualSet);
-  }
-
   /** Asserts that the given runnable block fails with an internal error. */
   public static void assertFails(Runnable block) {
     try {