Skip to content

Commit 71adf9a

Browse files
authored
Port null/NaN validation text from iOS (#613)
* Update Firestore run configuration for Android Studio 3.4.1 * Port null/NaN validation text from iOS From firebase/firebase-ios-sdk#2670
1 parent d50472a commit 71adf9a

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

.idea/runConfigurations/Firestore_Integration_Tests__Firestore_Emulator_.xml

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,10 @@ public void queriesWithNullOrNaNFiltersOtherThanEqualityFail() {
400400
CollectionReference collection = testCollection();
401401
expectError(
402402
() -> collection.whereGreaterThan("a", null),
403-
"Invalid Query. You can only perform equality comparisons on null (via whereEqualTo()).");
403+
"Invalid Query. Null supports only equality comparisons (via whereEqualTo()).");
404404
expectError(
405405
() -> collection.whereArrayContains("a", null),
406-
"Invalid Query. You can only perform equality comparisons on null (via whereEqualTo()).");
406+
"Invalid Query. Null supports only equality comparisons (via whereEqualTo()).");
407407
expectError(
408408
() -> collection.whereArrayContainsAny("a", null),
409409
"Invalid Query. A non-empty array is required for 'array_contains_any' filters.");
@@ -413,10 +413,10 @@ public void queriesWithNullOrNaNFiltersOtherThanEqualityFail() {
413413

414414
expectError(
415415
() -> collection.whereGreaterThan("a", Double.NaN),
416-
"Invalid Query. You can only perform equality comparisons on NaN (via whereEqualTo()).");
416+
"Invalid Query. NaN supports only equality comparisons (via whereEqualTo()).");
417417
expectError(
418418
() -> collection.whereArrayContains("a", Double.NaN),
419-
"Invalid Query. You can only perform equality comparisons on NaN (via whereEqualTo()).");
419+
"Invalid Query. NaN supports only equality comparisons (via whereEqualTo()).");
420420
}
421421

422422
@Test

firebase-firestore/src/main/java/com/google/firebase/firestore/core/FieldFilter.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,13 @@ public static FieldFilter create(FieldPath path, Operator operator, FieldValue v
8282
} else if (value.equals(NullValue.nullValue())) {
8383
if (operator != Filter.Operator.EQUAL) {
8484
throw new IllegalArgumentException(
85-
"Invalid Query. You can only perform equality comparisons on null (via "
86-
+ "whereEqualTo()).");
85+
"Invalid Query. Null supports only equality comparisons (via whereEqualTo()).");
8786
}
8887
return new FieldFilter(path, operator, value);
8988
} else if (value.equals(DoubleValue.NaN)) {
9089
if (operator != Filter.Operator.EQUAL) {
9190
throw new IllegalArgumentException(
92-
"Invalid Query. You can only perform equality comparisons on NaN (via "
93-
+ "whereEqualTo()).");
91+
"Invalid Query. NaN supports only equality comparisons (via whereEqualTo()).");
9492
}
9593
return new FieldFilter(path, operator, value);
9694
} else if (operator == Operator.ARRAY_CONTAINS) {

0 commit comments

Comments
 (0)