Skip to content

Commit f8297b9

Browse files
committed
Change tests that use dropDatabase to use small databases.
1 parent f52f3e8 commit f8297b9

File tree

3 files changed

+27
-15
lines changed

3 files changed

+27
-15
lines changed

src/MongoDB.Driver.Core.Tests/Core/Operations/ListIndexesOperationTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public class ListIndexesOperationTests
3535
[TestFixtureSetUp]
3636
public void TestFixtureSetUp()
3737
{
38-
_collectionNamespace = CoreTestConfiguration.GetCollectionNamespaceForTestFixture();
38+
var databaseNamespace = CoreTestConfiguration.GetDatabaseNamespaceForTestFixture();
39+
_collectionNamespace = new CollectionNamespace(databaseNamespace, "ListIndexesOperationTests");
3940
_messageEncoderSettings = CoreTestConfiguration.MessageEncoderSettings;
4041
}
4142

src/MongoDB.Driver.Legacy.Tests/MongoDatabaseTests.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public void Setup()
3636
_server = LegacyTestConfiguration.Server;
3737
_primary = LegacyTestConfiguration.Server.Primary;
3838
_database = LegacyTestConfiguration.Database;
39-
_database.Drop();
39+
// TODO: DropDatabase
40+
//_database.Drop();
4041
}
4142

4243
// TODO: more tests for MongoDatabase
@@ -251,11 +252,13 @@ public void TestGetCollectionGeneric()
251252
[Test]
252253
public void TestGetCollectionNames()
253254
{
254-
_database.Drop();
255-
_database.GetCollection("a").Insert(new BsonDocument("a", 1));
256-
_database.GetCollection("b").Insert(new BsonDocument("b", 1));
257-
_database.GetCollection("c").Insert(new BsonDocument("c", 1));
258-
var collectionNames = _database.GetCollectionNames();
255+
var databaseNamespace = CoreTestConfiguration.GetDatabaseNamespaceForTestFixture();
256+
var database = _server.GetDatabase(databaseNamespace.DatabaseName);
257+
database.Drop();
258+
database.GetCollection("a").Insert(new BsonDocument("a", 1));
259+
database.GetCollection("b").Insert(new BsonDocument("b", 1));
260+
database.GetCollection("c").Insert(new BsonDocument("c", 1));
261+
var collectionNames = database.GetCollectionNames();
259262
Assert.AreEqual(new[] { "a", "b", "c" }, collectionNames.Where(n => n != "system.indexes"));
260263
}
261264

src/MongoDB.Driver.Legacy.Tests/MongoServerTests.cs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,14 @@ public void TestDatabaseExists()
8888
{
8989
if (!_isMasterSlavePair)
9090
{
91-
_database.Drop();
92-
Assert.IsFalse(_server.DatabaseExists(_database.Name));
93-
_collection.Insert(new BsonDocument("x", 1));
94-
Assert.IsTrue(_server.DatabaseExists(_database.Name));
91+
var databaseNamespace = CoreTestConfiguration.GetDatabaseNamespaceForTestFixture();
92+
var database = _server.GetDatabase(databaseNamespace.DatabaseName);
93+
var collection = database.GetCollection("test");
94+
95+
database.Drop();
96+
Assert.IsFalse(_server.DatabaseExists(database.Name));
97+
collection.Insert(new BsonDocument("x", 1));
98+
Assert.IsTrue(_server.DatabaseExists(database.Name));
9599
}
96100
}
97101

@@ -100,13 +104,17 @@ public void TestDropDatabase()
100104
{
101105
if (!_isMasterSlavePair)
102106
{
103-
_collection.Insert(new BsonDocument());
107+
var databaseNamespace = CoreTestConfiguration.GetDatabaseNamespaceForTestFixture();
108+
var database = _server.GetDatabase(databaseNamespace.DatabaseName);
109+
var collection = database.GetCollection("test");
110+
111+
collection.Insert(new BsonDocument());
104112
var databaseNames = _server.GetDatabaseNames();
105-
Assert.IsTrue(databaseNames.Contains(_database.Name));
113+
Assert.IsTrue(databaseNames.Contains(database.Name));
106114

107-
_server.DropDatabase(_database.Name);
115+
_server.DropDatabase(database.Name);
108116
databaseNames = _server.GetDatabaseNames();
109-
Assert.IsFalse(databaseNames.Contains(_database.Name));
117+
Assert.IsFalse(databaseNames.Contains(database.Name));
110118
}
111119
}
112120

0 commit comments

Comments
 (0)