Fix embedded CRUD test runner

JAVA-3138

Author: jstewart148

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

@@ -20,6 +20,7 @@
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import org.bson.BsonArray;
+import org.bson.BsonBoolean;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 import org.bson.BsonValue;
@@ -70,6 +71,7 @@ public CrudTest(final String filename, final String description, final String da
     @Before
     public void setUp() {
         assumeFalse(skipTest);
+        assumeFalse(description.startsWith("Aggregate with $listLocalSessions"));
         database = getMongoClient().getDatabase(databaseName);
         collection = database.getCollection(getClass().getName(), BsonDocument.class);
         if (!data.isEmpty()) {
@@ -91,30 +93,51 @@ public void tearDown() {
 
     @Test
     public void shouldPassAllOutcomes() {
-        BsonDocument outcome = helper.getOperationResults(definition.getDocument("operation"));
-        BsonDocument expectedOutcome = definition.getDocument("outcome");
-
-        if (expectedOutcome.containsKey("error")) {
-            assertEquals("Expected error", expectedOutcome.getBoolean("error"), outcome.get("error"));
+        BsonDocument expectedOutcome = definition.getDocument("outcome", null);
+        // check if v1 test
+        if (definition.containsKey("operation")) {
+            runOperation(expectedOutcome, definition.getDocument("operation"),
+                    expectedOutcome != null && expectedOutcome.containsKey("result") && expectedOutcome.isDocument("result")
+                            ? expectedOutcome.get("result") : null);
+        } else {  // v2 test
+            BsonArray operations = definition.getArray("operations");
+            for (BsonValue operation : operations) {
+                runOperation(expectedOutcome, operation.asDocument(), operation.asDocument().get("result", null));
+            }
         }
+    }
 
-        // Hack to workaround the lack of upsertedCount
-        BsonValue expectedResult = expectedOutcome.get("result");
-        BsonValue actualResult = outcome.get("result");
-        if (actualResult.isDocument()
-                && actualResult.asDocument().containsKey("upsertedCount")
-                && actualResult.asDocument().getNumber("upsertedCount").intValue() == 0
-                && !expectedResult.asDocument().containsKey("upsertedCount")) {
-            expectedResult.asDocument().append("upsertedCount", actualResult.asDocument().get("upsertedCount"));
+    private void runOperation(final BsonDocument expectedOutcome, final BsonDocument operation, final BsonValue expectedResult) {
+        BsonDocument outcome = null;
+        boolean wasException = false;
+        try {
+            outcome = helper.getOperationResults(operation);
+        } catch (Exception e) {
+            wasException = true;
         }
 
-        // Hack to workaround the lack of insertedIds
-        if (expectedResult.isDocument()
-                && !expectedResult.asDocument().containsKey("insertedIds")) {
-            actualResult.asDocument().remove("insertedIds");
+        if (operation.getBoolean("error", BsonBoolean.FALSE).getValue()) {
+            assertEquals(operation.containsKey("error"), wasException);
         }
 
-        assertEquals(description, expectedResult, actualResult);
+        if (expectedResult != null) {
+            // Hack to workaround the lack of upsertedCount
+            BsonValue actualResult = outcome.get("result");
+            if (actualResult.isDocument()
+                    && actualResult.asDocument().containsKey("upsertedCount")
+                    && actualResult.asDocument().getNumber("upsertedCount").intValue() == 0
+                    && !expectedResult.asDocument().containsKey("upsertedCount")) {
+                expectedResult.asDocument().append("upsertedCount", actualResult.asDocument().get("upsertedCount"));
+            }
+
+            // Hack to workaround the lack of insertedIds
+            if (expectedResult.isDocument()
+                    && !expectedResult.asDocument().containsKey("insertedIds")) {
+                actualResult.asDocument().remove("insertedIds");
+            }
+
+            assertEquals(description, expectedResult, actualResult);
+        }
 
         if (expectedOutcome.containsKey("collection")) {
             assertCollectionEquals(expectedOutcome.getDocument("collection"));
@@ -133,7 +156,8 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
             for (BsonValue test: testDocument.getArray("tests")) {
                 data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
                         testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
-                        testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument(), getServerVersion())});
+                        testDocument.getArray("data", new BsonArray()), test.asDocument(),
+                        skipTest(testDocument, test.asDocument(), getServerVersion())});
             }
         }
         return data;