Use database specified in spec test files rather than default database

mongodb · May 22, 2020 · ecbce07 · ecbce07
1 parent 095965c
commit ecbce07
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 21 deletions.
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/AbstractUnifiedTest.java b/driver-async/src/test/functional/com/mongodb/async/client/AbstractUnifiedTest.java
@@ -62,7 +62,6 @@
 
 import static com.mongodb.ClusterFixture.getMultiMongosConnectionString;
 import static com.mongodb.async.client.Fixture.getConnectionString;
-import static com.mongodb.async.client.Fixture.getDefaultDatabaseName;
 import static com.mongodb.async.client.Fixture.isSharded;
 import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
 import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
@@ -96,15 +95,17 @@ public abstract class AbstractUnifiedTest {
     private HashMap<String, BsonDocument> lsidMap;
     private boolean useMultipleMongoses = false;
     private ConnectionString connectionString;
-    private final String collectionName = "test";
+    private final String collectionName;
 
     private static final long MIN_HEARTBEAT_FREQUENCY_MS = 50L;
 
-    public AbstractUnifiedTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
+    public AbstractUnifiedTest(final String filename, final String description, final String databaseName,
+                               final String collectionName, final BsonArray data, final BsonDocument definition,
                                final boolean skipTest) {
         this.filename = filename;
         this.description = description;
-        this.databaseName = getDefaultDatabaseName();
+        this.databaseName = databaseName;
+        this.collectionName = collectionName;
         this.data = data;
         this.definition = definition;
         this.commandListener = new TestCommandListener();

diff --git a/driver-async/src/test/functional/com/mongodb/async/client/MainTransactionsTest.java b/driver-async/src/test/functional/com/mongodb/async/client/MainTransactionsTest.java
@@ -18,6 +18,7 @@
 
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
+import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -31,13 +32,15 @@
 import java.util.List;
 
 import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.async.client.Fixture.getDefaultDatabaseName;
 
 // See https://github.com/mongodb/specifications/tree/master/source/transactions/tests
 @RunWith(Parameterized.class)
 public class MainTransactionsTest extends AbstractUnifiedTest {
-    public MainTransactionsTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
+    public MainTransactionsTest(final String filename, final String description, final String databaseName,
+                                final String collectionName, final BsonArray data, final BsonDocument definition,
                                 final boolean skipTest) {
-        super(filename, description, data, definition, skipTest);
+        super(filename, description, databaseName, collectionName, data, definition, skipTest);
     }
 
     @Parameterized.Parameters(name = "{0}: {1}")
@@ -47,6 +50,9 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
             BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
             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.getString("collection_name",
+                                new BsonString(file.getName().substring(0, file.getName().lastIndexOf(".")))).getValue(),
                         testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
             }
         }

diff --git a/driver-async/src/test/functional/com/mongodb/async/client/SessionsTest.java b/driver-async/src/test/functional/com/mongodb/async/client/SessionsTest.java
@@ -18,6 +18,7 @@
 
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
+import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -31,13 +32,14 @@
 import java.util.List;
 
 import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.async.client.Fixture.getDefaultDatabaseName;
 
 // See https://github.com/mongodb/specifications/tree/master/source/sessions/tests
 @RunWith(Parameterized.class)
 public class SessionsTest extends AbstractUnifiedTest {
-    public SessionsTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
-                        final boolean skipTest) {
-        super(filename, description, data, definition, skipTest);
+    public SessionsTest(final String filename, final String description, final String databaseName, final String collectionName,
+                        final BsonArray data, final BsonDocument definition, final boolean skipTest) {
+        super(filename, description, databaseName, collectionName, data, definition, skipTest);
     }
 
     @Parameterized.Parameters(name = "{0}: {1}")
@@ -47,6 +49,9 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
             BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
             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.getString("collection_name",
+                                new BsonString(file.getName().substring(0, file.getName().lastIndexOf(".")))).getValue(),
                         testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
             }
         }

diff --git a/driver-sync/src/test/functional/com/mongodb/client/AbstractUnifiedTest.java b/driver-sync/src/test/functional/com/mongodb/client/AbstractUnifiedTest.java
@@ -64,7 +64,6 @@
 import static com.mongodb.ClusterFixture.isSharded;
 import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
 import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
-import static com.mongodb.client.Fixture.getDefaultDatabaseName;
 import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
 import static java.util.Collections.singletonList;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -94,15 +93,16 @@ public abstract class AbstractUnifiedTest {
     private Map<String, BsonDocument> lsidMap;
     private boolean useMultipleMongoses = false;
     private ConnectionString connectionString = null;
-    private final String collectionName = "test";
+    private final String collectionName;
 
     private static final long MIN_HEARTBEAT_FREQUENCY_MS = 50L;
 
-    public AbstractUnifiedTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
-                               final boolean skipTest) {
+    public AbstractUnifiedTest(final String filename, final String description, final String databaseName, final String collectionName,
+                               final BsonArray data, final BsonDocument definition, final boolean skipTest) {
         this.filename = filename;
         this.description = description;
-        this.databaseName = getDefaultDatabaseName();
+        this.databaseName = databaseName;
+        this.collectionName = collectionName;
         this.data = data;
         this.definition = definition;
         this.commandListener = new TestCommandListener();

diff --git a/driver-sync/src/test/functional/com/mongodb/client/MainTransactionsTest.java b/driver-sync/src/test/functional/com/mongodb/client/MainTransactionsTest.java
@@ -18,6 +18,7 @@
 
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
+import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -31,13 +32,15 @@
 import java.util.List;
 
 import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
 
 // See https://github.com/mongodb/specifications/tree/master/source/transactions/tests
 @RunWith(Parameterized.class)
 public class MainTransactionsTest extends AbstractUnifiedTest {
-    public MainTransactionsTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
+    public MainTransactionsTest(final String filename, final String description, final String databaseName,
+                                final String collectionName, final BsonArray data, final BsonDocument definition,
                                 final boolean skipTest) {
-        super(filename, description, data, definition, skipTest);
+        super(filename, description, databaseName, collectionName, data, definition, skipTest);
     }
 
     @Parameterized.Parameters(name = "{0}: {1}")
@@ -48,6 +51,9 @@ 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.getString("collection_name",
+                                new BsonString(file.getName().substring(0, file.getName().lastIndexOf(".")))).getValue(),
                         testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
             }
         }

diff --git a/driver-sync/src/test/functional/com/mongodb/client/SessionsTest.java b/driver-sync/src/test/functional/com/mongodb/client/SessionsTest.java
@@ -18,6 +18,7 @@
 
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
+import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -31,13 +32,14 @@
 import java.util.List;
 
 import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
 
 // See https://github.com/mongodb/specifications/tree/master/source/sessions/tests
 @RunWith(Parameterized.class)
 public class SessionsTest extends AbstractUnifiedTest {
-    public SessionsTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
-                        final boolean skipTest) {
-        super(filename, description, data, definition, skipTest);
+    public SessionsTest(final String filename, final String description, final String databaseName, final String collectionName,
+                        final BsonArray data, final BsonDocument definition, final boolean skipTest) {
+        super(filename, description, databaseName, collectionName, data, definition, skipTest);
     }
 
     @Parameterized.Parameters(name = "{0}: {1}")
@@ -48,6 +50,9 @@ 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.getString("collection_name",
+                                new BsonString(file.getName().substring(0, file.getName().lastIndexOf(".")))).getValue(),
                         testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
             }
         }

diff --git a/...er-sync/src/test/functional/com/mongodb/client/WithTransactionHelperTransactionsTest.java b/...er-sync/src/test/functional/com/mongodb/client/WithTransactionHelperTransactionsTest.java
@@ -18,6 +18,7 @@
 
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
+import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -31,13 +32,15 @@
 import java.util.List;
 
 import static com.mongodb.JsonTestServerVersionChecker.skipTest;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
 
 // See https://github.com/mongodb/specifications/tree/master/source/transactions-convenient-api/tests
 @RunWith(Parameterized.class)
 public class WithTransactionHelperTransactionsTest extends AbstractUnifiedTest {
-    public WithTransactionHelperTransactionsTest(final String filename, final String description, final BsonArray data,
+    public WithTransactionHelperTransactionsTest(final String filename, final String description, final String databaseName,
+                                                 final String collectionName, final BsonArray data,
                                                  final BsonDocument definition, final boolean skipTest) {
-        super(filename, description, data, definition, skipTest);
+        super(filename, description, databaseName, collectionName, data, definition, skipTest);
     }
 
     @Parameterized.Parameters(name = "{0}: {1}")
@@ -47,6 +50,9 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
             BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
             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.getString("collection_name",
+                                new BsonString(file.getName().substring(0, file.getName().lastIndexOf(".")))).getValue(),
                         testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
             }
         }