diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java index 2d4d4f49b2..74b98fcfbe 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java +++ b/driver-sync/src/test/functional/com/mongodb/client/unified/UnifiedTestModifications.java @@ -298,8 +298,6 @@ public static void applyCustomizations(final TestDef def) { .file("unified-test-format/tests/valid-pass", "kmsProviders-mixed_kms_credential_fields"); def.skipJira("https://jira.mongodb.org/browse/JAVA-5672") .file("unified-test-format/tests/valid-pass", "operator-matchAsRoot"); - def.skipJira("https://jira.mongodb.org/browse/JAVA-5682") - .file("unified-test-format/tests/valid-pass", "operator-type-number_alias"); // valid fail diff --git a/driver-sync/src/test/functional/com/mongodb/client/unified/ValueMatcher.java b/driver-sync/src/test/functional/com/mongodb/client/unified/ValueMatcher.java index 899769d2d9..ba887ff0fd 100644 --- a/driver-sync/src/test/functional/com/mongodb/client/unified/ValueMatcher.java +++ b/driver-sync/src/test/functional/com/mongodb/client/unified/ValueMatcher.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.stream.Collectors; +import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -34,6 +35,7 @@ final class ValueMatcher { private final Entities entities; private final AssertionContext context; + private static final List NUMBER_TYPES = asList("int", "long", "double", "decimal"); ValueMatcher(final Entities entities, final AssertionContext context) { this.entities = entities; @@ -158,7 +160,8 @@ private void assertValuesMatch(final BsonValue initialExpected, @Nullable final private void assertExpectedType(final BsonValue actualValue, final BsonValue expectedTypes) { List types; if (expectedTypes.isString()) { - types = singletonList(expectedTypes.asString().getValue()); + String expectedType = expectedTypes.asString().getValue(); + types = expectedType.equals("number") ? NUMBER_TYPES : singletonList(expectedType); } else if (expectedTypes.isArray()) { types = expectedTypes.asArray().stream().map(type -> type.asString().getValue()).collect(Collectors.toList()); } else {