Firestore Spec Tests: Port JS PR 7021 (bundle the readTime and resumeToken) (#11183)

Author: dconeybe

Firestore/Example/Tests/SpecTests/FSTSpecTests.mm

@@ -465,13 +465,12 @@ - (void)doWatchEntity:(NSDictionary *)watchEntity {
  }
 }
 
-- (void)doWatchFilter:(NSArray *)watchFilter {
- NSArray<NSNumber *> *targets = watchFilter[0];
+- (void)doWatchFilter:(NSDictionary *)watchFilter {
+ NSArray<NSString *> *keys = watchFilter[@"keys"];
+ NSArray<NSNumber *> *targets = watchFilter[@"targetIds"];
  HARD_ASSERT(targets.count == 1, "ExistenceFilters currently support exactly one target only.");
 
- int keyCount = watchFilter.count == 0 ? 0 : (int)watchFilter.count - 1;
-
- ExistenceFilter filter{keyCount};
+ ExistenceFilter filter{static_cast<int>(keys.count)};
  ExistenceFilterWatchChange change{filter, targets[0].intValue};
  [self.driver receiveWatchChange:change snapshotVersion:SnapshotVersion::None()];
 }

Firestore/Example/Tests/SpecTests/json/existence_filter_spec_test.json

@@ -132,12 +132,14 @@
  ]
  },
  {
- "watchFilter": [
- [
- 2
+ "watchFilter": {
+ "keys": [
+ "collection/1"
  ],
- "collection/1"
- ]
+ "targetIds": [
+ 2
+ ]
+ }
  },
  {
  "watchSnapshot": {
@@ -366,13 +368,15 @@
  ]
  },
  {
- "watchFilter": [
- [
- 2
+ "watchFilter": {
+ "keys": [
+ "collection/1",
+ "collection/2"
  ],
- "collection/1",
- "collection/2"
- ]
+ "targetIds": [
+ 2
+ ]
+ }
  },
  {
  "watchEntity": {
@@ -729,11 +733,13 @@
  }
  },
  {
- "watchFilter": [
- [
+ "watchFilter": {
+ "keys": [
+ ],
+ "targetIds": [
  2
  ]
- ]
+ }
  },
  {
  "watchRemove": {
@@ -910,12 +916,14 @@
  ]
  },
  {
- "watchFilter": [
- [
- 2
+ "watchFilter": {
+ "keys": [
+ "collection/1"
  ],
- "collection/1"
- ]
+ "targetIds": [
+ 2
+ ]
+ }
  },
  {
  "watchSnapshot": {
@@ -1203,12 +1211,14 @@
  ]
  },
  {
- "watchFilter": [
- [
- 2
+ "watchFilter": {
+ "keys": [
+ "collection/1"
  ],
- "collection/1"
- ]
+ "targetIds": [
+ 2
+ ]
+ }
  },
  {
  "watchSnapshot": {
@@ -1313,12 +1323,14 @@
  }
  },
  {
- "watchFilter": [
- [
- 2
+ "watchFilter": {
+ "keys": [
+ "collection/1"
  ],
- "collection/1"
- ]
+ "targetIds": [
+ 2
+ ]
+ }
  },
  {
  "watchSnapshot": {
@@ -1489,12 +1501,14 @@
  ]
  },
  {
- "watchFilter": [
- [
- 2
+ "watchFilter": {
+ "keys": [
+ "collection/1"
  ],
- "collection/1"
- ]
+ "targetIds": [
+ 2
+ ]
+ }
  },
  {
  "watchSnapshot": {
@@ -1846,12 +1860,14 @@
  ]
  },
  {
- "watchFilter": [
- [
- 2
+ "watchFilter": {
+ "keys": [
+ "collection/1"
  ],
- "collection/1"
- ]
+ "targetIds": [
+ 2
+ ]
+ }
  },
  {
  "watchSnapshot": {
@@ -2149,11 +2165,13 @@
  ]
  },
  {
- "watchFilter": [
- [
+ "watchFilter": {
+ "keys": [
+ ],
+ "targetIds": [
  2
  ]
- ]
+ }
  },
  {
  "watchSnapshot": {
@@ -2265,12 +2283,14 @@
  ]
  },
  {
- "watchFilter": [
- [
- 2
+ "watchFilter": {
+ "keys": [
+ "collection/1"
  ],
- "collection/1"
- ]
+ "targetIds": [
+ 2
+ ]
+ }
  },
  {
  "watchSnapshot": {

Firestore/Example/Tests/SpecTests/json/limbo_spec_test.json

@@ -3445,11 +3445,13 @@
  ]
  },
  {
- "watchFilter": [
- [
+ "watchFilter": {
+ "keys": [
+ ],
+ "targetIds": [
  1
  ]
- ]
+ }
  },
  {
  "watchCurrent": [
@@ -8201,15 +8203,16 @@
  }
  },
  {
- "watchFilter": [
- [
- 2
+ "watchFilter": {
+ "keys": [
+ "collection/b1",
+ "collection/b2",
+ "collection/b3"
  ],
- "collection/b1",
- "collection/b2",
- "collection/b3"
- ]
-
+ "targetIds": [
+ 2
+ ]
+ }
  },
  {
  "watchSnapshot": {

Firestore/Example/Tests/SpecTests/json/limit_spec_test.json

@@ -5611,12 +5611,14 @@
  }
  },
  {
- "watchFilter": [
- [
- 2
+ "watchFilter": {
+ "keys": [
+ "collection/b"
  ],
- "collection/b"
- ]
+ "targetIds": [
+ 2
+ ]
+ }
  },
  {
  "watchSnapshot": {