Convert legacy retryable reads tests to unified format

* Use "mapReduce" instead of "mapreduce" for the command name, as documented, and as expected by the tests. JAVA-5344
mongodb · Mar 6, 2024 · 8563778 · 8563778
1 parent 03746fa
commit 8563778
Show file tree

Hide file tree

Showing 98 changed files with 24,825 additions and 18,841 deletions.
diff --git a/driver-core/src/main/com/mongodb/internal/operation/MapReduceToCollectionOperation.java b/driver-core/src/main/com/mongodb/internal/operation/MapReduceToCollectionOperation.java
@@ -300,7 +300,7 @@ private BsonDocument getCommand(@Nullable final ConnectionDescription descriptio
         if (getDatabaseName() != null) {
             outputDocument.put("db", new BsonString(getDatabaseName()));
         }
-        BsonDocument commandDocument = new BsonDocument("mapreduce", new BsonString(namespace.getCollectionName()))
+        BsonDocument commandDocument = new BsonDocument("mapReduce", new BsonString(namespace.getCollectionName()))
                                            .append("map", getMapFunction())
                                            .append("reduce", getReduceFunction())
                                            .append("out", outputDocument);

diff --git a/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java b/driver-core/src/main/com/mongodb/internal/operation/MapReduceWithInlineResultsOperation.java
@@ -231,7 +231,7 @@ private CommandCreator getCommandCreator(final SessionContext sessionContext) {
     }
 
     private BsonDocument getCommand(final SessionContext sessionContext, final int maxWireVersion) {
-        BsonDocument commandDocument = new BsonDocument("mapreduce", new BsonString(namespace.getCollectionName()))
+        BsonDocument commandDocument = new BsonDocument("mapReduce", new BsonString(namespace.getCollectionName()))
                                            .append("map", getMapFunction())
                                            .append("reduce", getReduceFunction())
                                            .append("out", new BsonDocument("inline", new BsonInt32(1)));

diff --git a/...ctional/com/mongodb/internal/operation/MapReduceToCollectionOperationSpecification.groovy b/...ctional/com/mongodb/internal/operation/MapReduceToCollectionOperationSpecification.groovy
@@ -247,7 +247,7 @@ class MapReduceToCollectionOperationSpecification extends OperationFunctionalSpe
 
         when:
         def operation =  new MapReduceToCollectionOperation(getNamespace(), mapF, reduceF, out, WriteConcern.MAJORITY)
-        def expectedCommand = new BsonDocument('mapreduce', new BsonString(getCollectionName()))
+        def expectedCommand = new BsonDocument('mapReduce', new BsonString(getCollectionName()))
                 .append('map', mapF)
                 .append('reduce', reduceF)
                 .append('out', BsonDocument.parse('{replace: "outCollection"}'))

diff --git a/...al/com/mongodb/internal/operation/MapReduceWithInlineResultsOperationSpecification.groovy b/...al/com/mongodb/internal/operation/MapReduceWithInlineResultsOperationSpecification.groovy
@@ -155,7 +155,7 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
         when:
         def operation = new MapReduceWithInlineResultsOperation<Document>(helper.namespace, new BsonJavaScript('function(){ }'),
                 new BsonJavaScript('function(key, values){ }'), bsonDocumentCodec)
-        def expectedCommand = new BsonDocument('mapreduce', new BsonString(helper.namespace.getCollectionName()))
+        def expectedCommand = new BsonDocument('mapReduce', new BsonString(helper.namespace.getCollectionName()))
             .append('map', operation.getMapFunction())
             .append('reduce', operation.getReduceFunction())
             .append('out', new BsonDocument('inline', new BsonInt32(1)))
@@ -235,7 +235,7 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
         source.retain() >> source
         source.getServerApi() >> null
         def commandDocument = BsonDocument.parse('''
-            { "mapreduce" : "coll",
+            { "mapReduce" : "coll",
               "map" : { "$code" : "function(){ }" },
               "reduce" : { "$code" : "function(key, values){ }" },
               "out" : { "inline" : 1 },
@@ -284,7 +284,7 @@ class MapReduceWithInlineResultsOperationSpecification extends OperationFunction
         source.getConnection(_) >> { it[0].onResult(connection, null) }
         source.retain() >> source
         def commandDocument = BsonDocument.parse('''
-            { "mapreduce" : "coll",
+            { "mapReduce" : "coll",
               "map" : { "$code" : "function(){ }" },
               "reduce" : { "$code" : "function(key, values){ }" },
               "out" : { "inline" : 1 },

diff --git a/driver-core/src/test/resources/retryable-reads/README.rst b/driver-core/src/test/resources/retryable-reads/README.rst
diff --git a/driver-core/src/test/resources/retryable-reads/aggregate-merge.json b/driver-core/src/test/resources/retryable-reads/aggregate-merge.json