Skip to content

Commit 5e35f4a

Browse files
Remove unused parameter from LocalStore tests (#721)
1 parent 88d909c commit 5e35f4a

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -824,10 +824,13 @@ public void testThrowsAwayDocumentsWithUnknownTargetIDsImmediately() {
824824
return;
825825
}
826826

827-
int targetID = 321;
827+
int unknownTargetID = 321;
828828
applyRemoteEvent(
829-
updateRemoteEvent(doc("foo/bar", 1, map()), emptyList(), emptyList(), asList(targetID)));
830-
829+
updateRemoteEvent(
830+
doc("foo/bar", 1, map()),
831+
/* updatedInTargets= */ asList(unknownTargetID),
832+
/* removedFromTargets= */ emptyList(),
833+
/* activeTargets= */ emptyList()));
831834
assertNotContains("foo/bar");
832835
}
833836

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -416,14 +416,17 @@ public QueryData getQueryDataForTarget(int targetId) {
416416

417417
public static RemoteEvent updateRemoteEvent(
418418
MaybeDocument doc, List<Integer> updatedInTargets, List<Integer> removedFromTargets) {
419-
return updateRemoteEvent(doc, updatedInTargets, removedFromTargets, Collections.emptyList());
419+
List<Integer> activeTargets = new ArrayList<>();
420+
activeTargets.addAll(updatedInTargets);
421+
activeTargets.addAll(removedFromTargets);
422+
return updateRemoteEvent(doc, updatedInTargets, removedFromTargets, activeTargets);
420423
}
421424

422425
public static RemoteEvent updateRemoteEvent(
423426
MaybeDocument doc,
424427
List<Integer> updatedInTargets,
425428
List<Integer> removedFromTargets,
426-
List<Integer> limboTargets) {
429+
List<Integer> activeTargets) {
427430
DocumentChange change =
428431
new DocumentChange(updatedInTargets, removedFromTargets, doc.getKey(), doc);
429432
WatchChangeAggregator aggregator =
@@ -436,11 +439,9 @@ public ImmutableSortedSet<DocumentKey> getRemoteKeysForTarget(int targetId) {
436439

437440
@Override
438441
public QueryData getQueryDataForTarget(int targetId) {
439-
boolean isLimbo =
440-
!(updatedInTargets.contains(targetId) || removedFromTargets.contains(targetId));
441-
QueryPurpose purpose =
442-
isLimbo ? QueryPurpose.LIMBO_RESOLUTION : QueryPurpose.LISTEN;
443-
return queryData(targetId, purpose, doc.getKey().toString());
442+
return activeTargets.contains(targetId)
443+
? queryData(targetId, QueryPurpose.LISTEN, doc.getKey().toString())
444+
: null;
444445
}
445446
});
446447
aggregator.handleDocumentChange(change);

0 commit comments

Comments
 (0)