Merge branch 'main' into JAVA-5842

Author: vbabanin

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

@@ -76,10 +76,6 @@ public static void applyCustomizations(final TestDef def) {
                 .test("client-side-operations-timeout", "timeoutMS behaves correctly for GridFS download operations",
                       "timeoutMS applied to entire download, not individual parts");
 
-        def.skipJira("https://jira.mongodb.org/browse/JAVA-5820")
-                .test("client-side-operations-timeout", "timeoutMS behaves correctly for tailable awaitData cursors",
-                        "apply maxAwaitTimeMS if less than remaining timeout");
-
         def.skipJira("https://jira.mongodb.org/browse/JAVA-5815")
                 .test("client-side-operations-timeout", "WaitQueueTimeoutError does not clear the pool",
                         "WaitQueueTimeoutError does not clear the pool");
@@ -298,8 +294,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
 

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<String> 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<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 {