Resync CRUD spec tests to use transaction spec test format

JAVA-3138

Author: jstewart148

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

@@ -84,8 +84,7 @@ public CrudTest(final String filename, final String description, final String da
     @Before
     public void setUp() {
         assumeFalse(skipTest);
-        // No runOn syntax for legacy CRUD, so skipping these manually for now
-        assumeFalse(isSharded() && description.startsWith("Aggregate with $currentOp"));
+        assumeFalse(isSharded());
 
         collectionHelper = new CollectionHelper<Document>(new DocumentCodec(), new MongoNamespace(databaseName, collectionName));
         collectionHelper.killAllSessions();
@@ -128,17 +127,16 @@ public void shouldPassAllOutcomes() {
         if (definition.containsKey("operation")) {
             runOperation(expectedOutcome, definition.getDocument("operation"),
                     expectedOutcome.containsKey("result") && expectedOutcome.isDocument("result")
-                            ? expectedOutcome.get("result").asDocument() : null);
+                            ? expectedOutcome.get("result") : null);
         } else {  // v2 test
             BsonArray operations = definition.getArray("operations");
             for (BsonValue operation : operations) {
-                runOperation(expectedOutcome, operation.asDocument(),
-                        operation.asDocument().containsKey("result") ? operation.asDocument().getDocument("result") : null);
+                runOperation(expectedOutcome, operation.asDocument(), operation.asDocument().get("result", null));
             }
         }
     }
 
-    private void runOperation(final BsonDocument expectedOutcome, final BsonDocument operation, final BsonDocument expectedResult) {
+    private void runOperation(final BsonDocument expectedOutcome, final BsonDocument operation, final BsonValue expectedResult) {
         BsonDocument outcome = null;
         boolean wasException = false;
         try {
@@ -189,7 +187,7 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
                 data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
                         testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
                         testDocument.getString("collection_name", new BsonString("test")).getValue(),
-                        testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
+                        testDocument.getArray("data", new BsonArray()), test.asDocument(), skipTest(testDocument, test.asDocument())});
             }
         }
         return data;

driver-core/src/test/resources/crud/db/db-aggregate.json

@@ -41,16 +41,6 @@
         }
       },
       "outcome": {
-        "result": [
-          {
-            "_id": 2,
-            "x": 22
-          },
-          {
-            "_id": 3,
-            "x": 33
-          }
-        ],
         "collection": {
           "name": "other_test_collection",
           "data": [
@@ -92,16 +82,6 @@
         }
       },
       "outcome": {
-        "result": [
-          {
-            "_id": 2,
-            "x": 22
-          },
-          {
-            "_id": 3,
-            "x": 33
-          }
-        ],
         "collection": {
           "name": "other_test_collection",
           "data": [

driver-core/src/test/resources/crud/read/aggregate-collation.json renamed to driver-core/src/test/resources/crud/v1/read/aggregate-collation.json

@@ -188,18 +188,6 @@
                 }
               }
             },
-            {
-              "name": "replaceOne",
-              "arguments": {
-                "filter": {
-                  "_id": 1
-                },
-                "replacement": {
-                  "_id": 1,
-                  "x": 11
-                }
-              }
-            },
             {
               "name": "replaceOne",
               "arguments": {
@@ -234,11 +222,11 @@
           "deletedCount": 0,
           "insertedCount": 0,
           "insertedIds": {},
-          "matchedCount": 2,
+          "matchedCount": 1,
           "modifiedCount": 1,
           "upsertedCount": 1,
           "upsertedIds": {
-            "3": 3
+            "2": 3
           }
         },
         "collection": {