Skip to content

Commit 66bfff9

Browse files
committed
skip invalid_base64_bitmap spec test
1 parent 9bebd98 commit 66bfff9

File tree

4 files changed

+12
-21
lines changed

4 files changed

+12
-21
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -478,14 +478,8 @@ private BloomFilter parseBloomFilter(JSONObject obj) throws JSONException {
478478
if (bits.has("padding")) {
479479
bitSequence.setPadding(bits.getInt("padding"));
480480
}
481-
if (bits.has("bitmap")) {
482-
try {
483-
bitSequence.setBitmap(
484-
ByteString.copyFrom(Base64.decode(bits.getString("bitmap"), Base64.DEFAULT)));
485-
} catch (Exception e) {
486-
bitSequence.setBitmap(ByteString.EMPTY);
487-
}
488-
}
481+
bitSequence.setBitmap(
482+
ByteString.copyFrom(Base64.decode(bits.getString("bitmap"), Base64.DEFAULT)));
489483

490484
BloomFilter.Builder bloomFilter = BloomFilter.newBuilder();
491485
bloomFilter.setBits(bitSequence);

firebase-firestore/src/test/resources/json/existence_filter_spec_test.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6413,6 +6413,8 @@
64136413
"describeName": "Existence Filters:",
64146414
"itName": "Full re-query is triggered when bloom filter bitmap is invalid",
64156415
"tags": [
6416+
"no-ios",
6417+
"no-android"
64166418
],
64176419
"config": {
64186420
"numClients": 1,

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
public class TestTargetMetadataProvider implements WatchChangeAggregator.TargetMetadataProvider {
3131
final Map<Integer, ImmutableSortedSet<DocumentKey>> syncedKeys = new HashMap<>();
3232
final Map<Integer, TargetData> queryData = new HashMap<>();
33-
DatabaseId databaseId = null;
3433

3534
@Override
3635
public ImmutableSortedSet<DocumentKey> getRemoteKeysForTarget(int targetId) {
@@ -45,17 +44,12 @@ public TargetData getTargetDataForTarget(int targetId) {
4544

4645
@Override
4746
public DatabaseId getDatabaseId() {
48-
return databaseId;
47+
return DatabaseId.forProject("test-project");
4948
}
5049

5150
/** Sets or replaces the local state for the provided query data. */
5251
public void setSyncedKeys(TargetData targetData, ImmutableSortedSet<DocumentKey> keys) {
5352
this.queryData.put(targetData.getTargetId(), targetData);
5453
this.syncedKeys.put(targetData.getTargetId(), keys);
5554
}
56-
57-
/** Sets or replaces the databaseId */
58-
public void setDatabaseId(DatabaseId databaseId) {
59-
this.databaseId = databaseId;
60-
}
6155
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ public class TestUtil {
108108

109109
public static final long ARBITRARY_SEQUENCE_NUMBER = 2;
110110

111+
private static final DatabaseId TEST_PROJECT = DatabaseId.forProject("project");
112+
111113
@SuppressWarnings("unchecked")
112114
public static <T> Map<String, T> map(Object... entries) {
113115
Map<String, T> res = new LinkedHashMap<>();
@@ -140,8 +142,7 @@ public static FieldMask fieldMask(String... fields) {
140142
public static final Map<String, Object> EMPTY_MAP = new HashMap<>();
141143

142144
public static Value wrap(Object value) {
143-
DatabaseId databaseId = DatabaseId.forProject("project");
144-
UserDataReader dataReader = new UserDataReader(databaseId);
145+
UserDataReader dataReader = new UserDataReader(TEST_PROJECT);
145146
// HACK: We use parseQueryValue() since it accepts scalars as well as arrays / objects, and
146147
// our tests currently use wrap() pretty generically so we don't know the intent.
147148
return dataReader.parseQueryValue(value);
@@ -491,7 +492,7 @@ public TargetData getTargetDataForTarget(int targetId) {
491492

492493
@Override
493494
public DatabaseId getDatabaseId() {
494-
return DatabaseId.forProject("test-project");
495+
return TEST_PROJECT;
495496
}
496497
});
497498

@@ -543,15 +544,15 @@ public TargetData getTargetDataForTarget(int targetId) {
543544

544545
@Override
545546
public DatabaseId getDatabaseId() {
546-
return DatabaseId.forProject("test-project");
547+
return TEST_PROJECT;
547548
}
548549
});
549550
aggregator.handleDocumentChange(change);
550551
return aggregator.createRemoteEvent(doc.getVersion());
551552
}
552553

553554
public static SetMutation setMutation(String path, Map<String, Object> values) {
554-
UserDataReader dataReader = new UserDataReader(DatabaseId.forProject("project"));
555+
UserDataReader dataReader = new UserDataReader(TEST_PROJECT);
555556
ParsedSetData parsed = dataReader.parseSetData(values);
556557

557558
// The order of the transforms doesn't matter, but we sort them so tests can assume a particular
@@ -584,7 +585,7 @@ private static PatchMutation patchMutationHelper(
584585
}
585586
}
586587

587-
UserDataReader dataReader = new UserDataReader(DatabaseId.forProject("project"));
588+
UserDataReader dataReader = new UserDataReader(TEST_PROJECT);
588589
ParsedUpdateData parsed = dataReader.parseUpdateData(values);
589590

590591
// `mergeMutation()` provides an update mask for the merged fields, whereas `patchMutation()`

0 commit comments

Comments
 (0)