Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -34,6 +35,7 @@
final class ValueMatcher {
private final Entities entities;
private final AssertionContext context;
private static final List<String> NUMBER_TYPES = asList("int", "long", "double", "decimal");

ValueMatcher(final Entities entities, final AssertionContext context) {
this.entities = entities;
Expand Down Expand Up @@ -158,7 +160,8 @@ private void assertValuesMatch(final BsonValue initialExpected, @Nullable final
private void assertExpectedType(final BsonValue actualValue, final BsonValue expectedTypes) {
List<String> 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 {
Expand Down