tighten mongoast testing by using extended format (#96)

NathanQingyangXu · web-flow · commit 776a5ebaf5cf · 2025-05-22T09:25:26.000-04:00
diff --git a/src/main/java/com/mongodb/hibernate/internal/MongoConstants.java b/src/main/java/com/mongodb/hibernate/internal/MongoConstants.java
@@ -16,10 +16,16 @@
 
 package com.mongodb.hibernate.internal;
 
+import org.bson.json.JsonMode;
+import org.bson.json.JsonWriterSettings;
+
 public final class MongoConstants {
 
     private MongoConstants() {}
 
+    public static final JsonWriterSettings EXTENDED_JSON_WRITER_SETTINGS =
+            JsonWriterSettings.builder().outputMode(JsonMode.EXTENDED).build();
+
     public static final String MONGO_DBMS_NAME = "MongoDB";
     public static final String MONGO_JDBC_DRIVER_NAME = "MongoDB Java Driver JDBC Adapter";
     public static final String ID_FIELD_NAME = "_id";
diff --git a/src/main/java/com/mongodb/hibernate/internal/translate/AbstractMqlTranslator.java b/src/main/java/com/mongodb/hibernate/internal/translate/AbstractMqlTranslator.java
@@ -18,6 +18,7 @@
 
 import static com.mongodb.hibernate.internal.MongoAssertions.assertNotNull;
 import static com.mongodb.hibernate.internal.MongoAssertions.assertTrue;
+import static com.mongodb.hibernate.internal.MongoConstants.EXTENDED_JSON_WRITER_SETTINGS;
 import static com.mongodb.hibernate.internal.MongoConstants.ID_FIELD_NAME;
 import static com.mongodb.hibernate.internal.MongoConstants.MONGO_DBMS_NAME;
 import static com.mongodb.hibernate.internal.translate.AstVisitorValueDescriptor.COLLECTION_AGGREGATE;
@@ -76,9 +77,7 @@
 import org.bson.BsonInt64;
 import org.bson.BsonString;
 import org.bson.BsonValue;
-import org.bson.json.JsonMode;
 import org.bson.json.JsonWriter;
-import org.bson.json.JsonWriterSettings;
 import org.bson.types.Decimal128;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.internal.util.collections.Stack;
@@ -178,8 +177,6 @@
 import org.jspecify.annotations.Nullable;
 
 abstract class AbstractMqlTranslator<T extends JdbcOperation> implements SqlAstTranslator<T> {
-    private static final JsonWriterSettings JSON_WRITER_SETTINGS =
-            JsonWriterSettings.builder().outputMode(JsonMode.EXTENDED).build();
 
     private final SessionFactoryImplementor sessionFactory;
 
@@ -233,7 +230,7 @@ List<JdbcParameterBinder> getParameterBinders() {
 
     static String renderMongoAstNode(AstNode rootAstNode) {
         try (var stringWriter = new StringWriter();
-                var jsonWriter = new JsonWriter(stringWriter, JSON_WRITER_SETTINGS)) {
+                var jsonWriter = new JsonWriter(stringWriter, EXTENDED_JSON_WRITER_SETTINGS)) {
             rootAstNode.render(jsonWriter);
             jsonWriter.flush();
             return stringWriter.toString();
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/AstNodeAssertions.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/AstNodeAssertions.java
@@ -16,6 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast;
 
+import static com.mongodb.hibernate.internal.MongoConstants.EXTENDED_JSON_WRITER_SETTINGS;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
@@ -26,17 +27,17 @@ public final class AstNodeAssertions {
 
     private AstNodeAssertions() {}
 
-    public static void assertRender(String expectedJson, AstNode node) {
-        doAssertRender(expectedJson, node, false);
+    public static void assertRendering(String expectedJson, AstNode node) {
+        doAssertRendering(expectedJson, node, false);
     }
 
-    public static void assertElementRender(String expectedJson, AstNode node) {
-        doAssertRender(expectedJson, node, true);
+    public static void assertElementRendering(String expectedJson, AstNode node) {
+        doAssertRendering(expectedJson, node, true);
     }
 
-    private static void doAssertRender(String expectedJson, AstNode node, boolean isElement) {
+    private static void doAssertRendering(String expectedJson, AstNode node, boolean isElement) {
         try (var stringWriter = new StringWriter();
-                var jsonWriter = new JsonWriter(stringWriter)) {
+                var jsonWriter = new JsonWriter(stringWriter, EXTENDED_JSON_WRITER_SETTINGS)) {
             if (isElement) {
                 jsonWriter.writeStartDocument();
             }
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/AstDeleteCommandTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/AstDeleteCommandTests.java
@@ -16,7 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.command;
 
-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRendering;
 import static com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperator.EQ;
 
 import com.mongodb.hibernate.internal.translate.mongoast.AstLiteralValue;
@@ -38,9 +38,9 @@ void testRendering() {
 
         var expectedJson =
                 """
-                {"delete": "books", "deletes": [{"q": {"isbn": {"$eq": "978-3-16-148410-0"}}, "limit": 0}]}\
+                {"delete": "books", "deletes": [{"q": {"isbn": {"$eq": "978-3-16-148410-0"}}, "limit": {"$numberInt": "0"}}]}\
                 """;
 
-        assertRender(expectedJson, deleteCommand);
+        assertRendering(expectedJson, deleteCommand);
     }
 }
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/AstInsertCommandTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/AstInsertCommandTests.java
@@ -16,7 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.command;
 
-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRendering;
 
 import com.mongodb.hibernate.internal.translate.mongoast.AstDocument;
 import com.mongodb.hibernate.internal.translate.mongoast.AstElement;
@@ -41,8 +41,8 @@ void testRendering() {
 
         var expectedJson =
                 """
-                {"insert": "books", "documents": [{"title": "War and Peace", "year": 1867, "_id": {"$undefined": true}}]}\
+                {"insert": "books", "documents": [{"title": "War and Peace", "year": {"$numberInt": "1867"}, "_id": {"$undefined": true}}]}\
                 """;
-        assertRender(expectedJson, insertCommand);
+        assertRendering(expectedJson, insertCommand);
     }
 }
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/AstUpdateCommandTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/AstUpdateCommandTests.java
@@ -16,7 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.command;
 
-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRendering;
 
 import com.mongodb.hibernate.internal.translate.mongoast.AstFieldUpdate;
 import com.mongodb.hibernate.internal.translate.mongoast.AstLiteralValue;
@@ -48,8 +48,8 @@ void testRendering() {
 
         final String expectedJson =
                 """
-                {"update": "books", "updates": [{"q": {"_id": {"$eq": 12345}}, "u": {"$set": {"title": "War and Peace", "author": "Leo Tolstoy"}}, "multi": true}]}\
+                {"update": "books", "updates": [{"q": {"_id": {"$eq": {"$numberLong": "12345"}}}, "u": {"$set": {"title": "War and Peace", "author": "Leo Tolstoy"}}, "multi": true}]}\
                 """;
-        assertRender(expectedJson, updateCommand);
+        assertRendering(expectedJson, updateCommand);
     }
 }
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstAggregateCommandTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstAggregateCommandTests.java
@@ -16,7 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.command.aggregate;
 
-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRendering;
 
 import com.mongodb.hibernate.internal.translate.mongoast.AstLiteralValue;
 import com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperation;
@@ -38,8 +38,8 @@ void testRendering() {
         var aggregateCommand = new AstAggregateCommand("books", List.of(matchStage, projectStage));
         var expectedJson =
                 """
-                {"aggregate": "books", "pipeline": [{"$match": {"_id": {"$eq": 1}}}, {"$project": {"title": true}}]}\
+                {"aggregate": "books", "pipeline": [{"$match": {"_id": {"$eq": {"$numberInt": "1"}}}}, {"$project": {"title": true}}]}\
                 """;
-        assertRender(expectedJson, aggregateCommand);
+        assertRendering(expectedJson, aggregateCommand);
     }
 }
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstMatchStageTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstMatchStageTests.java
@@ -16,7 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.command.aggregate;
 
-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRendering;
 import static com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperator.EQ;
 
 import com.mongodb.hibernate.internal.translate.mongoast.AstLiteralValue;
@@ -36,6 +36,6 @@ void testRendering() {
         var expectedJson = """
                 {"$match": {"title": {"$eq": "Jane Eyre"}}}\
                 """;
-        assertRender(expectedJson, astMatchStage);
+        assertRendering(expectedJson, astMatchStage);
     }
 }
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstProjectStageIncludeSpecificationTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstProjectStageIncludeSpecificationTests.java
@@ -16,7 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.command.aggregate;
 
-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertElementRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertElementRendering;
 
 import org.junit.jupiter.api.Test;
 
@@ -28,6 +28,6 @@ void testRendering() {
         var expectedJson = """
                            {"name": true}\
                            """;
-        assertElementRender(expectedJson, projectStageIncludeSpecification);
+        assertElementRendering(expectedJson, projectStageIncludeSpecification);
     }
 }
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstProjectStageTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/command/aggregate/AstProjectStageTests.java
@@ -16,7 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.command.aggregate;
 
-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRendering;
 import static java.util.Collections.singletonList;
 
 import org.junit.jupiter.api.Test;
@@ -29,6 +29,6 @@ void testRendering() {
         var expectedJson = """
                            {"$project": {"title": true}}\
                            """;
-        assertRender(expectedJson, astProjectStage);
+        assertRendering(expectedJson, astProjectStage);
     }
 }
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstComparisonFilterOperationTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstComparisonFilterOperationTests.java
@@ -16,7 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.filter;
 
-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRendering;
 
 import com.mongodb.hibernate.internal.translate.mongoast.AstLiteralValue;
 import org.bson.BsonInt32;
@@ -31,9 +31,9 @@ void testRendering(AstComparisonFilterOperator operator) {
         var operation = new AstComparisonFilterOperation(operator, new AstLiteralValue(new BsonInt32(1)));
 
         var expectedJson = """
-                           {"%s": 1}\
+                           {"%s": {"$numberInt": "1"}}\
                            """
                 .formatted(operator.getOperatorName());
-        assertRender(expectedJson, operation);
+        assertRendering(expectedJson, operation);
     }
 }
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstFieldOperationFilterTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstFieldOperationFilterTests.java
@@ -16,7 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.filter;
 
-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRendering;
 import static com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperator.EQ;
 
 import com.mongodb.hibernate.internal.translate.mongoast.AstLiteralValue;
@@ -32,8 +32,8 @@ void testRendering() {
                 "fieldName", new AstComparisonFilterOperation(EQ, new AstLiteralValue(new BsonInt32(1))));
 
         var expectedJson = """
-                           {"fieldName": {"$eq": 1}}\
-                           """;
-        assertRender(expectedJson, astFieldOperationFilter);
+                {"fieldName": {"$eq": {"$numberInt": "1"}}}\
+                """;
+        assertRendering(expectedJson, astFieldOperationFilter);
     }
 }
diff --git a/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstLogicalFilterTests.java b/src/test/java/com/mongodb/hibernate/internal/translate/mongoast/filter/AstLogicalFilterTests.java
@@ -16,7 +16,7 @@
 
 package com.mongodb.hibernate.internal.translate.mongoast.filter;
 
-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;
+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRendering;
 import static com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperator.EQ;
 
 import com.mongodb.hibernate.internal.translate.mongoast.AstLiteralValue;
@@ -41,9 +41,9 @@ void testRendering(AstLogicalFilterOperator operator) {
 
         var expectedJson =
                 """
-                {"%s": [{"field1": {"$eq": 1}}, {"field2": {"$eq": "1"}}]}\
+                {"%s": [{"field1": {"$eq": {"$numberInt": "1"}}}, {"field2": {"$eq": "1"}}]}\
                 """
                         .formatted(operator.getOperatorName());
-        assertRender(expectedJson, astLogicalFilter);
+        assertRendering(expectedJson, astLogicalFilter);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`package com.mongodb.hibernate.internal.translate.mongoast.command.aggregate;`
`18`	`18`
`19`		`-import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRender;`
	`19`	`+import static com.mongodb.hibernate.internal.translate.mongoast.AstNodeAssertions.assertRendering;`
`20`	`20`	`import static com.mongodb.hibernate.internal.translate.mongoast.filter.AstComparisonFilterOperator.EQ;`
`21`	`21`
`22`	`22`	`import com.mongodb.hibernate.internal.translate.mongoast.AstLiteralValue;`
`@@ -36,6 +36,6 @@ void testRendering() {`
`36`	`36`	`var expectedJson = """`
`37`	`37`	`{"$match": {"title": {"$eq": "Jane Eyre"}}}\`
`38`	`38`	`""";`
`39`		`- assertRender(expectedJson, astMatchStage);`
	`39`	`+ assertRendering(expectedJson, astMatchStage);`
`40`	`40`	`}`
`41`	`41`	`}`