Update Spec tests with Bundle changes (#2348)

Author: schmidt-sebastian

firebase-firestore/src/test/java/com/google/firebase/firestore/spec/SpecTestCase.java

@@ -190,7 +190,7 @@ public abstract class SpecTestCase implements RemoteStoreCallback {
   private Set<DocumentKey> expectedEnqueuedLimboDocs;
 
   /** Set of expected active targets, keyed by target ID. */
-  private Map<Integer, Pair<List<TargetData>, String>> expectedActiveTargets;
+  private Map<Integer, List<TargetData>> expectedActiveTargets;
 
   /**
    * The writes that have been sent to the SyncEngine via {@link SyncEngine#writeMutations} but not
@@ -466,9 +466,9 @@ private List<Integer> parseIntList(@Nullable JSONArray arr) throws JSONException
   // Methods for doing the steps of the spec test.
   //
 
-  private void doListen(JSONArray listenSpec) throws Exception {
-    int expectedId = listenSpec.getInt(0);
-    Query query = parseQuery(listenSpec.get(1));
+  private void doListen(JSONObject listenSpec) throws Exception {
+    int expectedId = listenSpec.getInt("targetId");
+    Query query = parseQuery(listenSpec.getJSONObject("query"));
     // TODO: Allow customizing listen options in spec tests
     ListenOptions options = new ListenOptions();
     options.includeDocumentMetadataChanges = true;
@@ -784,7 +784,7 @@ private void doStep(JSONObject step) throws Exception {
     }
 
     if (step.has("userListen")) {
-      doListen(step.getJSONArray("userListen"));
+      doListen(step.getJSONObject("userListen"));
     } else if (step.has("userUnlisten")) {
       doUnlisten(step.getJSONArray("userUnlisten"));
     } else if (step.has("userSet")) {
@@ -963,21 +963,29 @@ private void validateExpectedState(@Nullable JSONObject expectedState) throws JS
           int targetId = Integer.parseInt(targetIdString);
 
           JSONObject queryDataJson = activeTargets.getJSONObject(targetIdString);
-          String resumeToken = queryDataJson.getString("resumeToken");
           JSONArray queryArrayJson = queryDataJson.getJSONArray("queries");
 
-          expectedActiveTargets.put(targetId, new Pair<>(new ArrayList<>(), resumeToken));
+          expectedActiveTargets.put(targetId, new ArrayList<>());
           for (int i = 0; i < queryArrayJson.length(); i++) {
             Query query = parseQuery(queryArrayJson.getJSONObject(i));
             // TODO: populate the purpose of the target once it's possible to encode that in the
             // spec tests. For now, hard-code that it's a listen despite the fact that it's not
             // always the right value.
             TargetData targetData =
                 new TargetData(
-                        query.toTarget(), targetId, ARBITRARY_SEQUENCE_NUMBER, QueryPurpose.LISTEN)
-                    .withResumeToken(ByteString.copyFromUtf8(resumeToken), SnapshotVersion.NONE);
-
-            expectedActiveTargets.get(targetId).first.add(targetData);
+                    query.toTarget(), targetId, ARBITRARY_SEQUENCE_NUMBER, QueryPurpose.LISTEN);
+            if (queryDataJson.has("resumeToken")) {
+              targetData =
+                  targetData.withResumeToken(
+                      ByteString.copyFromUtf8(queryDataJson.getString("resumeToken")),
+                      SnapshotVersion.NONE);
+            } else {
+              targetData =
+                  targetData.withResumeToken(
+                      ByteString.EMPTY, version(queryDataJson.getInt("readTime")));
+            }
+
+            expectedActiveTargets.get(targetId).add(targetData);
           }
         }
       }
@@ -1095,13 +1103,12 @@ private void validateActiveTargets() {
     // Create a copy so we can modify it in tests
     Map<Integer, TargetData> actualTargets = new HashMap<>(datastore.activeTargets());
 
-    for (Map.Entry<Integer, Pair<List<TargetData>, String>> expected :
-        expectedActiveTargets.entrySet()) {
+    for (Map.Entry<Integer, List<TargetData>> expected : expectedActiveTargets.entrySet()) {
       assertTrue(
           "Expected active target not found: " + expected.getValue(),
           actualTargets.containsKey(expected.getKey()));
 
-      List<TargetData> expectedQueries = expected.getValue().first;
+      List<TargetData> expectedQueries = expected.getValue();
       TargetData expectedTarget = expectedQueries.get(0);
       TargetData actualTarget = actualTargets.get(expected.getKey());