Skip to content

Commit e488706

Browse files
author
rstam
committed
CSHARP-797: Change unit tests affected by server version 2.6.0-rc2.
1 parent a91af6f commit e488706

File tree

2 files changed

+19
-30
lines changed

2 files changed

+19
-30
lines changed

MongoDB.DriverUnitTests/MongoCollectionTests.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2171,20 +2171,6 @@ public void TestInsertBatchSmallFinalSubbatch()
21712171
}
21722172
}
21732173

2174-
[Test]
2175-
public void TestInsertBatchZeroDocuments()
2176-
{
2177-
if (_primary.BuildInfo.Version >= new Version(2, 5, 5))
2178-
{
2179-
_collection.Drop();
2180-
var results = _collection.InsertBatch(new BsonDocument[0]);
2181-
var expectedResult = new ExpectedWriteConcernResult();
2182-
CheckExpectedResult(expectedResult, results.Single());
2183-
2184-
Assert.AreEqual(0, _collection.Count());
2185-
}
2186-
}
2187-
21882174
[Test]
21892175
public void TestInsertDuplicateKey()
21902176
{

MongoDB.DriverUnitTests/Operations/BulkWriteOperationTests.cs

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -800,25 +800,28 @@ public void TestUpdateUpdatesAllMatchingDocuments(bool ordered)
800800
[TestCase(true)]
801801
public void TestUpsertOneVeryLargeDocument(bool ordered)
802802
{
803-
_collection.Drop();
803+
if (_primary.BuildInfo.Version >= new Version(2, 6, 0))
804+
{
805+
_collection.Drop();
804806

805-
var bulk = InitializeBulkOperation(_collection, ordered);
806-
var bigString = new string('x', 16 * 1024 * 1024 - 30);
807-
bulk.Find(Query.EQ("key", 1)).Upsert().Update(Update.Set("x", bigString));
808-
var result = bulk.Execute();
807+
var bulk = InitializeBulkOperation(_collection, ordered);
808+
var bigString = new string('x', 16 * 1024 * 1024 - 22);
809+
bulk.Find(Query.EQ("_id", 1)).Upsert().Update(Update.Set("x", bigString)); // resulting document will be exactly 16MiB
810+
var result = bulk.Execute();
809811

810-
var expectedResult = new ExpectedResult
811-
{
812-
UpsertsCount = 1,
813-
IsModifiedCountAvailable = _primary.Supports(FeatureId.WriteCommands)
814-
};
815-
CheckExpectedResult(expectedResult, result);
812+
var expectedResult = new ExpectedResult
813+
{
814+
UpsertsCount = 1,
815+
IsModifiedCountAvailable = _primary.Supports(FeatureId.WriteCommands)
816+
};
817+
CheckExpectedResult(expectedResult, result);
816818

817-
var expectedDocuments = new BsonDocument[]
818-
{
819-
new BsonDocument { { "key", 1 }, { "x", bigString } }
820-
};
821-
Assert.That(_collection.FindAll().SetFields(Fields.Exclude("_id")), Is.EquivalentTo(expectedDocuments));
819+
var expectedDocuments = new BsonDocument[]
820+
{
821+
new BsonDocument { { "_id", 1 }, { "x", bigString } }
822+
};
823+
Assert.That(_collection.FindAll(), Is.EquivalentTo(expectedDocuments));
824+
}
822825
}
823826

824827
[Test]

0 commit comments

Comments
 (0)