JAVA-2815: Add transaction tests for runCommand

Author: jyemin

driver-async/src/main/com/mongodb/async/client/MongoDatabaseImpl.java

@@ -17,6 +17,7 @@
 package com.mongodb.async.client;
 
 import com.mongodb.Function;
+import com.mongodb.MongoClientException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
@@ -220,6 +221,9 @@ private <TResult> void executeCommand(@Nullable final ClientSession clientSessio
                                           final SingleResultCallback<TResult> callback) {
         notNull("command", command);
         notNull("readPreference", readPreference);
+        if (clientSession != null && clientSession.hasActiveTransaction() && !readPreference.equals(ReadPreference.primary())) {
+            throw new MongoClientException("Read preference in a transaction must be primary");
+        }
         executor.execute(new CommandReadOperation<TResult>(getName(), toBsonDocument(command), codecRegistry.get(resultClass)),
                 readPreference, readConcern, clientSession, callback);
     }

driver-async/src/test/functional/com/mongodb/async/client/CrudTest.java

@@ -62,7 +62,7 @@ public void setUp() {
         super.setUp();
         collection = Fixture.initializeCollection(new MongoNamespace(getDefaultDatabaseName(), getClass().getName()))
                 .withDocumentClass(BsonDocument.class);
-        helper = new JsonPoweredCrudTestHelper(description, collection);
+        helper = new JsonPoweredCrudTestHelper(description, getDefaultDatabase(), collection);
         new MongoOperation<Void>() {
             @Override
             public void execute() {

driver-async/src/test/functional/com/mongodb/async/client/JsonPoweredCrudTestHelper.java

@@ -68,10 +68,13 @@
 
 public class JsonPoweredCrudTestHelper {
     private final String description;
+    private final MongoDatabase database;
     private final MongoCollection<BsonDocument> baseCollection;
 
-    public JsonPoweredCrudTestHelper(final String description, final MongoCollection<BsonDocument> collection) {
+    public JsonPoweredCrudTestHelper(final String description, final MongoDatabase database,
+                                     final MongoCollection<BsonDocument> collection) {
         this.description = description;
+        this.database = database;
         this.baseCollection = collection;
     }
 
@@ -649,6 +652,34 @@ BsonDocument toResult(@Nullable final BsonValue results) {
         return new BsonDocument("result", results != null ? results : BsonNull.VALUE);
     }
 
+    BsonDocument getRunCommandResult(final BsonDocument arguments, @Nullable final ClientSession clientSession) {
+        BsonDocument command = arguments.getDocument("command");
+        ReadPreference readPreference = arguments.containsKey("readPreference") ? getReadPreference(arguments) : null;
+
+        FutureResultCallback<BsonDocument> futureResultCallback = new FutureResultCallback<BsonDocument>();
+
+        if (clientSession == null) {
+            if (readPreference == null) {
+                database.runCommand(command, BsonDocument.class, futureResultCallback);
+            } else {
+                database.runCommand(command, readPreference, BsonDocument.class, futureResultCallback);
+            }
+        } else {
+            if (readPreference == null) {
+                database.runCommand(clientSession, command, BsonDocument.class, futureResultCallback);
+            } else {
+                database.runCommand(clientSession, command, readPreference, BsonDocument.class, futureResultCallback);
+            }
+        }
+        BsonDocument response = futureResult(futureResultCallback);
+        response.remove("ok");
+        response.remove("operationTime");
+        response.remove("opTime");
+        response.remove("electionId");
+        response.remove("$clusterTime");
+        return toResult(response);
+    }
+
     BsonDocument getAggregateResult(final BsonDocument arguments, @Nullable final ClientSession clientSession) {
         List<BsonDocument> pipeline = new ArrayList<BsonDocument>();
         for (BsonValue stage : arguments.getArray("pipeline")) {

driver-async/src/test/functional/com/mongodb/async/client/RetryableWritesTest.java

@@ -127,8 +127,9 @@ public void setUp() {
         collectionHelper.drop();
         collectionHelper.insertDocuments(documents);
 
-        collection = mongoClient.getDatabase(databaseName).getCollection(collectionName, BsonDocument.class);
-        helper = new JsonPoweredCrudTestHelper(description, collection);
+        MongoDatabase database = mongoClient.getDatabase(databaseName);
+        collection = database.getCollection(collectionName, BsonDocument.class);
+        helper = new JsonPoweredCrudTestHelper(description, database, collection);
         setFailPoint();
     }
 

driver-async/src/test/functional/com/mongodb/async/client/TransactionsTest.java

@@ -138,7 +138,7 @@ public void apply(final SocketSettings.Builder builder) {
                 .build());
 
         MongoDatabase database = mongoClient.getDatabase(databaseName);
-        helper = new JsonPoweredCrudTestHelper(description, database.getCollection(collectionName, BsonDocument.class));
+        helper = new JsonPoweredCrudTestHelper(description, database, database.getCollection(collectionName, BsonDocument.class));
 
         ClientSession sessionZero = createSession("session0");
         ClientSession sessionOne = createSession("session1");

driver-core/src/test/resources/transactions/README.rst

@@ -98,7 +98,14 @@ For each YAML file, for each element in ``tests``:
    - Enter a "try" block or your programming language's closest equivalent.
    - If ``name`` is "startTransaction", "commitTransaction", or
      "abortTransaction", call the named method on ``session0`` or
-     ``session1``, depending on the "session" argument.
+     ``session1``, depending on the "session" argument. 
+   - If ``name`` is "runCommand", call the runCommand method on the database
+     specified in the test. Pass the argument named "command" to the runCommand 
+     method. Pass ``session0`` or ``session1`` to the runCommand method, depending 
+     on which session's name is in the arguments list. If ``arguments`` 
+     contains no "session", pass no explicit session to the method. If ``arguments`` 
+     includes "readPreference", also pass the read preference to the runCommand 
+     method.    
    - Otherwise, ``name`` refers to a CRUD method, such as ``insertOne``.
      Execute the named method on the "transactions-tests" database on the "test"
      collection, passing the arguments listed. Pass ``session0`` or ``session1``