Add more tests with filters on the same field (#5041)

* Add more tests

Author: wu-hui

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

@@ -627,6 +627,7 @@ public void testCursorsDoNoExpandResultSet() {
   @Test
   public void testFiltersOnTheSameField() {
     indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING));
+    indexManager.addFieldIndex(fieldIndex("coll", "a", Kind.ASCENDING, "b", Kind.ASCENDING));
 
     addDoc("coll/val1", map("a", 1, "b", 1));
     addDoc("coll/val2", map("a", 2, "b", 2));
@@ -654,6 +655,14 @@ public void testFiltersOnTheSameField() {
             .orderBy(orderBy("a"))
             .orderBy(orderBy(DocumentKey.KEY_FIELD_NAME, "desc"));
     verifyResults(query, "coll/val2");
+
+    query =
+        query("coll")
+            .filter(filter("a", ">", 1))
+            .filter(filter("a", "==", 3))
+            .orderBy(orderBy("a"))
+            .orderBy(orderBy("b"));
+    verifyResults(query, "coll/val3");
   }
 
   @Test

firebase-firestore/src/test/java/com/google/firebase/firestore/model/TargetIndexMatcherTest.java

@@ -602,9 +602,8 @@ public void withEqualityAndInequalityOnTheSameField() {
         query("collId")
             .filter(filter("a", ">=", 5))
             .filter(filter("a", "==", 0))
-            .filter(filter("b", "==", 0))
-            .orderBy(orderBy("a", "desc"))
-            .orderBy(orderBy(DocumentKey.KEY_FIELD_NAME, "desc")),
+            .orderBy(orderBy("a", "asc"))
+            .orderBy(orderBy("b", "asc")),
         "a",
         FieldIndex.Segment.Kind.ASCENDING,
         "b",