Skip to content

Remove unused parameter from LocalStore tests #721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 21, 2019
Merged

Remove unused parameter from LocalStore tests #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions firebase-firestore/src/test/java/com/google/firebase/firestore/local/LocalStoreTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,10 +824,13 @@ public void testThrowsAwayDocumentsWithUnknownTargetIDsImmediately() {
return;
}

int targetID = 321;
int unknownTargetID = 321;
applyRemoteEvent(
updateRemoteEvent(doc("foo/bar", 1, map()), emptyList(), emptyList(), asList(targetID)));

updateRemoteEvent(
doc("foo/bar", 1, map()),
/* updatedInTargets= */ asList(unknownTargetID),
/* removedFromTargets= */ emptyList(),
/* activeTargets= */ emptyList()));
assertNotContains("foo/bar");
}

Expand Down
15 changes: 8 additions & 7 deletions firebase-firestore/src/testUtil/java/com/google/firebase/firestore/testutil/TestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,14 +416,17 @@ public QueryData getQueryDataForTarget(int targetId) {

public static RemoteEvent updateRemoteEvent(
MaybeDocument doc, List<Integer> updatedInTargets, List<Integer> removedFromTargets) {
return updateRemoteEvent(doc, updatedInTargets, removedFromTargets, Collections.emptyList());
List<Integer> activeTargets = new ArrayList<>();
activeTargets.addAll(updatedInTargets);
activeTargets.addAll(removedFromTargets);
return updateRemoteEvent(doc, updatedInTargets, removedFromTargets, activeTargets);
}

public static RemoteEvent updateRemoteEvent(
MaybeDocument doc,
List<Integer> updatedInTargets,
List<Integer> removedFromTargets,
List<Integer> limboTargets) {
List<Integer> activeTargets) {
DocumentChange change =
new DocumentChange(updatedInTargets, removedFromTargets, doc.getKey(), doc);
WatchChangeAggregator aggregator =
Expand All @@ -436,11 +439,9 @@ public ImmutableSortedSet<DocumentKey> getRemoteKeysForTarget(int targetId) {

@Override
public QueryData getQueryDataForTarget(int targetId) {
boolean isLimbo =
!(updatedInTargets.contains(targetId) || removedFromTargets.contains(targetId));
QueryPurpose purpose =
isLimbo ? QueryPurpose.LIMBO_RESOLUTION : QueryPurpose.LISTEN;
return queryData(targetId, purpose, doc.getKey().toString());
return activeTargets.contains(targetId)
? queryData(targetId, QueryPurpose.LISTEN, doc.getKey().toString())
: null;
}
});
aggregator.handleDocumentChange(change);
Expand Down