Skip to content

Commit bd30e83

Browse files
authored
Added regression tests for "number" alias in $$type operator. (#1692)
* Added regression tests for "number" alias in $$type operator. JAVA-5682 * Use static for alias
1 parent 58b51e3 commit bd30e83

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java

-2
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,6 @@ public static void applyCustomizations(final TestDef def) {
298298
.file("unified-test-format/tests/valid-pass", "kmsProviders-mixed_kms_credential_fields");
299299
def.skipJira("https://jira.mongodb.org/browse/JAVA-5672")
300300
.file("unified-test-format/tests/valid-pass", "operator-matchAsRoot");
301-
def.skipJira("https://jira.mongodb.org/browse/JAVA-5682")
302-
.file("unified-test-format/tests/valid-pass", "operator-type-number_alias");
303301

304302
// valid fail
305303

driver-sync/src/test/functional/com/mongodb/client/unified/ValueMatcher.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.List;
2525
import java.util.stream.Collectors;
2626

27+
import static java.util.Arrays.asList;
2728
import static java.util.Collections.singletonList;
2829
import static org.junit.Assert.assertEquals;
2930
import static org.junit.Assert.assertFalse;
@@ -34,6 +35,7 @@
3435
final class ValueMatcher {
3536
private final Entities entities;
3637
private final AssertionContext context;
38+
private static final List<String> NUMBER_TYPES = asList("int", "long", "double", "decimal");
3739

3840
ValueMatcher(final Entities entities, final AssertionContext context) {
3941
this.entities = entities;
@@ -158,7 +160,8 @@ private void assertValuesMatch(final BsonValue initialExpected, @Nullable final
158160
private void assertExpectedType(final BsonValue actualValue, final BsonValue expectedTypes) {
159161
List<String> types;
160162
if (expectedTypes.isString()) {
161-
types = singletonList(expectedTypes.asString().getValue());
163+
String expectedType = expectedTypes.asString().getValue();
164+
types = expectedType.equals("number") ? NUMBER_TYPES : singletonList(expectedType);
162165
} else if (expectedTypes.isArray()) {
163166
types = expectedTypes.asArray().stream().map(type -> type.asString().getValue()).collect(Collectors.toList());
164167
} else {

0 commit comments

Comments
 (0)