Fix test

Author: katcharov

driver-core/src/test/functional/com/mongodb/client/model/expressions/AbstractExpressionsFunctionalTest.java

@@ -40,6 +40,7 @@
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
 import static com.mongodb.client.model.Aggregates.addFields;
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
+import static org.bson.conversions.Bson.DEFAULT_CODEC_REGISTRY;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public abstract class AbstractExpressionsFunctionalTest extends OperationTest {
@@ -70,7 +71,8 @@ protected void assertExpression(@Nullable final Object expected, final Expressio
             return;
         }
 
-        BsonValue expressionValue = ((MqlExpression<?>) expression).toBsonValue(fromProviders(new BsonValueCodecProvider()));
+        BsonValue expressionValue = ((MqlExpression<?>) expression).toBsonValue(
+                fromProviders(new BsonValueCodecProvider(), DEFAULT_CODEC_REGISTRY));
         BsonValue bsonValue = new BsonDocumentFragmentCodec().readValue(
                 new JsonReader(expectedMql),
                 DecoderContext.builder().build());

driver-core/src/test/functional/com/mongodb/client/model/expressions/ArrayExpressionsFunctionalTest.java

@@ -86,13 +86,15 @@ public void literalsTest() {
                 of(Document.parse("{a: 1}")),
                 of(Document.parse("{b: 2}")));
         assertExpression(
-                Arrays.asList(Collections.emptyList(), Collections.emptyList()), documentArray,
-                "[[], []]");
+                Arrays.asList(Document.parse("{a: 1}"), Document.parse("{b: 2}")),
+                documentArray,
+                "[{'$literal': {'a': 1}}, {'$literal': {'b': 2}}]");
 
         // Array
         ArrayExpression<ArrayExpression<Expression>> arrayArray = ofArray(ofArray(), ofArray());
         assertExpression(
-                Arrays.asList(Collections.emptyList(), Collections.emptyList()), arrayArray,
+                Arrays.asList(Collections.emptyList(), Collections.emptyList()),
+                arrayArray,
                 "[[], []]");
 
         // Mixed

driver-core/src/test/functional/com/mongodb/client/model/expressions/DocumentExpressionsFunctionalTest.java

@@ -25,11 +25,9 @@
 import java.time.Instant;
 import java.util.Arrays;
 
-import static com.mongodb.client.model.expressions.Expressions.of;
 import static com.mongodb.client.model.expressions.Expressions.of;
 import static com.mongodb.client.model.expressions.Expressions.ofIntegerArray;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @SuppressWarnings("ConstantConditions")
 class DocumentExpressionsFunctionalTest extends AbstractExpressionsFunctionalTest {
@@ -232,7 +230,7 @@ public void mergeTest() {
         assertExpression(
                 BsonDocument.parse("{a: null}"),
                 ofDoc("{a: 1}").merge(ofDoc("{a: null}")));
-        
+
         assertExpression(
                 BsonDocument.parse("{a: 1}"),
                 ofDoc("{a: null}").merge(ofDoc("{a: 1}")));