FSTSpecTests.mm: fix doWatchFilter to correctly parse the new encoding

dconeybe · dconeybe · commit 4122464174a6 · 2023-04-25T15:22:11.000-04:00
diff --git a/Firestore/Example/Tests/SpecTests/FSTSpecTests.mm b/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()];
 }

Original file line number	Diff line number	Diff line change
`@@ -465,13 +465,12 @@ - (void)doWatchEntity:(NSDictionary *)watchEntity {`
`465`	`465`	`}`
`466`	`466`	`}`
`467`	`467`
`468`		`-- (void)doWatchFilter:(NSArray *)watchFilter {`
`469`		`- NSArray<NSNumber > targets = watchFilter[0];`
	`468`	`+- (void)doWatchFilter:(NSDictionary *)watchFilter {`
	`469`	`+ NSArray<NSString > keys = watchFilter[@"keys"];`
	`470`	`+ NSArray<NSNumber > targets = watchFilter[@"targetIds"];`
`470`	`471`	`HARD_ASSERT(targets.count == 1, "ExistenceFilters currently support exactly one target only.");`
`471`	`472`
`472`		`- int keyCount = watchFilter.count == 0 ? 0 : (int)watchFilter.count - 1;`
`473`		`-`
`474`		`- ExistenceFilter filter{keyCount};`
	`473`	`+ ExistenceFilter filter{static_cast<int>(keys.count)};`
`475`	`474`	`ExistenceFilterWatchChange change{filter, targets[0].intValue};`
`476`	`475`	`[self.driver receiveWatchChange:change snapshotVersion:SnapshotVersion::None()];`
`477`	`476`	`}`