Skip to content

Commit ecbce07

Browse files
jyeminjyemin
committed
Use database specified in spec test files rather than default database
1 parent 095965c commit ecbce07

File tree

7 files changed

+50
-21
lines changed

7 files changed

+50
-21
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262

6363
import static com.mongodb.ClusterFixture.getMultiMongosConnectionString;
6464
import static com.mongodb.async.client.Fixture.getConnectionString;
65-
import static com.mongodb.async.client.Fixture.getDefaultDatabaseName;
6665
import static com.mongodb.async.client.Fixture.isSharded;
6766
import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
6867
import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
@@ -96,15 +95,17 @@ public abstract class AbstractUnifiedTest {
9695
private HashMap<String, BsonDocument> lsidMap;
9796
private boolean useMultipleMongoses = false;
9897
private ConnectionString connectionString;
99-
private final String collectionName = "test";
98+
private final String collectionName;
10099

101100
private static final long MIN_HEARTBEAT_FREQUENCY_MS = 50L;
102101

103-
public AbstractUnifiedTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
102+
public AbstractUnifiedTest(final String filename, final String description, final String databaseName,
103+
final String collectionName, final BsonArray data, final BsonDocument definition,
104104
final boolean skipTest) {
105105
this.filename = filename;
106106
this.description = description;
107-
this.databaseName = getDefaultDatabaseName();
107+
this.databaseName = databaseName;
108+
this.collectionName = collectionName;
108109
this.data = data;
109110
this.definition = definition;
110111
this.commandListener = new TestCommandListener();

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.bson.BsonArray;
2020
import org.bson.BsonDocument;
21+
import org.bson.BsonString;
2122
import org.bson.BsonValue;
2223
import org.junit.runner.RunWith;
2324
import org.junit.runners.Parameterized;
@@ -31,13 +32,15 @@
3132
import java.util.List;
3233

3334
import static com.mongodb.JsonTestServerVersionChecker.skipTest;
35+
import static com.mongodb.async.client.Fixture.getDefaultDatabaseName;
3436

3537
// See https://github.com/mongodb/specifications/tree/master/source/transactions/tests
3638
@RunWith(Parameterized.class)
3739
public class MainTransactionsTest extends AbstractUnifiedTest {
38-
public MainTransactionsTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
40+
public MainTransactionsTest(final String filename, final String description, final String databaseName,
41+
final String collectionName, final BsonArray data, final BsonDocument definition,
3942
final boolean skipTest) {
40-
super(filename, description, data, definition, skipTest);
43+
super(filename, description, databaseName, collectionName, data, definition, skipTest);
4144
}
4245

4346
@Parameterized.Parameters(name = "{0}: {1}")
@@ -47,6 +50,9 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
4750
BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
4851
for (BsonValue test : testDocument.getArray("tests")) {
4952
data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
53+
testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
54+
testDocument.getString("collection_name",
55+
new BsonString(file.getName().substring(0, file.getName().lastIndexOf(".")))).getValue(),
5056
testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
5157
}
5258
}

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.bson.BsonArray;
2020
import org.bson.BsonDocument;
21+
import org.bson.BsonString;
2122
import org.bson.BsonValue;
2223
import org.junit.runner.RunWith;
2324
import org.junit.runners.Parameterized;
@@ -31,13 +32,14 @@
3132
import java.util.List;
3233

3334
import static com.mongodb.JsonTestServerVersionChecker.skipTest;
35+
import static com.mongodb.async.client.Fixture.getDefaultDatabaseName;
3436

3537
// See https://github.com/mongodb/specifications/tree/master/source/sessions/tests
3638
@RunWith(Parameterized.class)
3739
public class SessionsTest extends AbstractUnifiedTest {
38-
public SessionsTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
39-
final boolean skipTest) {
40-
super(filename, description, data, definition, skipTest);
40+
public SessionsTest(final String filename, final String description, final String databaseName, final String collectionName,
41+
final BsonArray data, final BsonDocument definition, final boolean skipTest) {
42+
super(filename, description, databaseName, collectionName, data, definition, skipTest);
4143
}
4244

4345
@Parameterized.Parameters(name = "{0}: {1}")
@@ -47,6 +49,9 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
4749
BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
4850
for (BsonValue test : testDocument.getArray("tests")) {
4951
data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
52+
testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
53+
testDocument.getString("collection_name",
54+
new BsonString(file.getName().substring(0, file.getName().lastIndexOf(".")))).getValue(),
5055
testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
5156
}
5257
}

‎driver-sync/src/test/functional/com/mongodb/client/AbstractUnifiedTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
import static com.mongodb.ClusterFixture.isSharded;
6565
import static com.mongodb.client.CommandMonitoringTestHelper.assertEventsEquality;
6666
import static com.mongodb.client.CommandMonitoringTestHelper.getExpectedEvents;
67-
import static com.mongodb.client.Fixture.getDefaultDatabaseName;
6867
import static com.mongodb.client.Fixture.getMongoClientSettingsBuilder;
6968
import static java.util.Collections.singletonList;
7069
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -94,15 +93,16 @@ public abstract class AbstractUnifiedTest {
9493
private Map<String, BsonDocument> lsidMap;
9594
private boolean useMultipleMongoses = false;
9695
private ConnectionString connectionString = null;
97-
private final String collectionName = "test";
96+
private final String collectionName;
9897

9998
private static final long MIN_HEARTBEAT_FREQUENCY_MS = 50L;
10099

101-
public AbstractUnifiedTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
102-
final boolean skipTest) {
100+
public AbstractUnifiedTest(final String filename, final String description, final String databaseName, final String collectionName,
101+
final BsonArray data, final BsonDocument definition, final boolean skipTest) {
103102
this.filename = filename;
104103
this.description = description;
105-
this.databaseName = getDefaultDatabaseName();
104+
this.databaseName = databaseName;
105+
this.collectionName = collectionName;
106106
this.data = data;
107107
this.definition = definition;
108108
this.commandListener = new TestCommandListener();

‎driver-sync/src/test/functional/com/mongodb/client/MainTransactionsTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.bson.BsonArray;
2020
import org.bson.BsonDocument;
21+
import org.bson.BsonString;
2122
import org.bson.BsonValue;
2223
import org.junit.runner.RunWith;
2324
import org.junit.runners.Parameterized;
@@ -31,13 +32,15 @@
3132
import java.util.List;
3233

3334
import static com.mongodb.JsonTestServerVersionChecker.skipTest;
35+
import static com.mongodb.client.Fixture.getDefaultDatabaseName;
3436

3537
// See https://github.com/mongodb/specifications/tree/master/source/transactions/tests
3638
@RunWith(Parameterized.class)
3739
public class MainTransactionsTest extends AbstractUnifiedTest {
38-
public MainTransactionsTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
40+
public MainTransactionsTest(final String filename, final String description, final String databaseName,
41+
final String collectionName, final BsonArray data, final BsonDocument definition,
3942
final boolean skipTest) {
40-
super(filename, description, data, definition, skipTest);
43+
super(filename, description, databaseName, collectionName, data, definition, skipTest);
4144
}
4245

4346
@Parameterized.Parameters(name = "{0}: {1}")
@@ -48,6 +51,9 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
4851

4952
for (BsonValue test : testDocument.getArray("tests")) {
5053
data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
54+
testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
55+
testDocument.getString("collection_name",
56+
new BsonString(file.getName().substring(0, file.getName().lastIndexOf(".")))).getValue(),
5157
testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
5258
}
5359
}

‎driver-sync/src/test/functional/com/mongodb/client/SessionsTest.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.bson.BsonArray;
2020
import org.bson.BsonDocument;
21+
import org.bson.BsonString;
2122
import org.bson.BsonValue;
2223
import org.junit.runner.RunWith;
2324
import org.junit.runners.Parameterized;
@@ -31,13 +32,14 @@
3132
import java.util.List;
3233

3334
import static com.mongodb.JsonTestServerVersionChecker.skipTest;
35+
import static com.mongodb.client.Fixture.getDefaultDatabaseName;
3436

3537
// See https://github.com/mongodb/specifications/tree/master/source/sessions/tests
3638
@RunWith(Parameterized.class)
3739
public class SessionsTest extends AbstractUnifiedTest {
38-
public SessionsTest(final String filename, final String description, final BsonArray data, final BsonDocument definition,
39-
final boolean skipTest) {
40-
super(filename, description, data, definition, skipTest);
40+
public SessionsTest(final String filename, final String description, final String databaseName, final String collectionName,
41+
final BsonArray data, final BsonDocument definition, final boolean skipTest) {
42+
super(filename, description, databaseName, collectionName, data, definition, skipTest);
4143
}
4244

4345
@Parameterized.Parameters(name = "{0}: {1}")
@@ -48,6 +50,9 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
4850

4951
for (BsonValue test : testDocument.getArray("tests")) {
5052
data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
53+
testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
54+
testDocument.getString("collection_name",
55+
new BsonString(file.getName().substring(0, file.getName().lastIndexOf(".")))).getValue(),
5156
testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
5257
}
5358
}

‎driver-sync/src/test/functional/com/mongodb/client/WithTransactionHelperTransactionsTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import org.bson.BsonArray;
2020
import org.bson.BsonDocument;
21+
import org.bson.BsonString;
2122
import org.bson.BsonValue;
2223
import org.junit.runner.RunWith;
2324
import org.junit.runners.Parameterized;
@@ -31,13 +32,15 @@
3132
import java.util.List;
3233

3334
import static com.mongodb.JsonTestServerVersionChecker.skipTest;
35+
import static com.mongodb.client.Fixture.getDefaultDatabaseName;
3436

3537
// See https://github.com/mongodb/specifications/tree/master/source/transactions-convenient-api/tests
3638
@RunWith(Parameterized.class)
3739
public class WithTransactionHelperTransactionsTest extends AbstractUnifiedTest {
38-
public WithTransactionHelperTransactionsTest(final String filename, final String description, final BsonArray data,
40+
public WithTransactionHelperTransactionsTest(final String filename, final String description, final String databaseName,
41+
final String collectionName, final BsonArray data,
3942
final BsonDocument definition, final boolean skipTest) {
40-
super(filename, description, data, definition, skipTest);
43+
super(filename, description, databaseName, collectionName, data, definition, skipTest);
4144
}
4245

4346
@Parameterized.Parameters(name = "{0}: {1}")
@@ -47,6 +50,9 @@ public static Collection<Object[]> data() throws URISyntaxException, IOException
4750
BsonDocument testDocument = JsonPoweredTestHelper.getTestDocument(file);
4851
for (BsonValue test : testDocument.getArray("tests")) {
4952
data.add(new Object[]{file.getName(), test.asDocument().getString("description").getValue(),
53+
testDocument.getString("database_name", new BsonString(getDefaultDatabaseName())).getValue(),
54+
testDocument.getString("collection_name",
55+
new BsonString(file.getName().substring(0, file.getName().lastIndexOf(".")))).getValue(),
5056
testDocument.getArray("data"), test.asDocument(), skipTest(testDocument, test.asDocument())});
5157
}
5258
}

0 commit comments

Comments
 (0)