CSHARP-797: Changes in response to code review comments and getting tests to pass against server 2.4.

Author: rstam

MongoDB.Driver/Operations/BulkInsertOperationEmulator.cs

@@ -54,11 +54,15 @@ protected override BulkWriteBatchResult EmulateSingleRequest(MongoConnection con
                 _args.WriterSettings);
             var operation = new InsertOpcodeOperation(operationArgs);
 
-            WriteConcernResult writeConcernResult;
+            WriteConcernResult writeConcernResult = null;
             WriteConcernException writeConcernException = null;
             try
             {
-                writeConcernResult = operation.Execute(connection).First();
+                var operationResult = operation.Execute(connection);
+                if (operationResult != null)
+                {
+                    writeConcernResult = operationResult.First();
+                }
             }
             catch (WriteConcernException ex)
             {

MongoDB.Driver/Operations/BulkWriteBatchResult.cs

@@ -250,7 +250,7 @@ public static BulkWriteBatchResult Create(
         {
             var processedRequests = new[] { request };
             var unprocessedRequests = Enumerable.Empty<WriteRequest>();
-            var upsertId = writeConcernResult.Upserted;
+            var upsertId = (writeConcernResult == null) ? null : writeConcernResult.Upserted;
             var upserts = (upsertId == null) ? Enumerable.Empty<BulkWriteUpsert>() : new[] { new BulkWriteUpsert(0, upsertId) };
             var writeErrors = __noWriteErrors;
             WriteConcernError writeConcernError = null;
@@ -269,7 +269,7 @@ public static BulkWriteBatchResult Create(
                 }
             }
 
-            var documentsAffected = writeConcernResult.DocumentsAffected;
+            var documentsAffected = (writeConcernResult == null) ? 0 : writeConcernResult.DocumentsAffected;
             if (request.RequestType == WriteRequestType.Insert && writeErrors.Count == 0)
             {
                 documentsAffected = 1; // note: DocumentsAffected is 0 for inserts
@@ -289,7 +289,7 @@ public static BulkWriteBatchResult Create(
                     break;
                 case WriteRequestType.Update:
                     matchedCount = documentsAffected - upserts.Count();
-                    modifiedCount = documentsAffected - upserts.Count();
+                    modifiedCount = 0; // getLasterror does not report this value
                     break;
             }
 

MongoDB.DriverUnitTests/Builders/UpdateBuilderTests.cs

@@ -849,7 +849,7 @@ public void TestReplace()
             Assert.AreEqual(expected, update.ToJson());
         }
 
-        [Explicit]
+        [Ignore]
         [Test]
         public void TestReplaceWithInvalidFieldName()
         {

MongoDB.DriverUnitTests/MongoCollectionTests.cs

@@ -318,24 +318,35 @@ public void TestBulkWrite()
         [Test]
         public void TestBulkWriteCounts()
         {
-            _collection.Drop();
-            var result = _collection.BulkWrite(new BulkWriteArgs
+            using (_server.RequestStart(null, ReadPreference.Primary))
             {
-                IsOrdered = true,
-                WriteConcern = WriteConcern.Acknowledged,
-                Requests = new WriteRequest[]
+                var serverInstance = _server.RequestConnection.ServerInstance;
+
+                _collection.Drop();
+                var result = _collection.BulkWrite(new BulkWriteArgs
                 {
-                    new InsertRequest(typeof (BsonDocument), new BsonDocument("x", 1)),
-                    new UpdateRequest(Query.EQ("x", 1), Update.Set("x", 2)),
-                    new DeleteRequest(Query.EQ("x", 2))
+                    IsOrdered = true,
+                    WriteConcern = WriteConcern.Acknowledged,
+                    Requests = new WriteRequest[]
+                    {
+                        new InsertRequest(typeof (BsonDocument), new BsonDocument("x", 1)),
+                        new UpdateRequest(Query.EQ("x", 1), Update.Set("x", 2)),
+                        new DeleteRequest(Query.EQ("x", 2))
+                    }
+                });
+
+                var expectedModifiedCount = 1;
+                if (!serverInstance.Supports(FeatureId.WriteCommands))
+                {
+                    expectedModifiedCount = 0;
                 }
-            });
 
-            Assert.AreEqual(1, result.DeletedCount);
-            Assert.AreEqual(1, result.InsertedCount);
-            Assert.AreEqual(1, result.ModifiedCount);
-            Assert.AreEqual(3, result.RequestCount);
-            Assert.AreEqual(1, result.MatchedCount);
+                Assert.AreEqual(1, result.DeletedCount);
+                Assert.AreEqual(1, result.InsertedCount);
+                Assert.AreEqual(expectedModifiedCount, result.ModifiedCount);
+                Assert.AreEqual(3, result.RequestCount);
+                Assert.AreEqual(1, result.MatchedCount);
+            }
         }
 
         [Test]
@@ -361,9 +372,9 @@ public void TestBulkWriteCountsWithUpsert()
                 });
 
                 var expectedModifiedCount = 1;
-                if (serverInstance.BuildInfo.Version < new Version(2, 5, 5))
+                if (!serverInstance.Supports(FeatureId.WriteCommands))
                 {
-                    expectedModifiedCount = 2;
+                    expectedModifiedCount = 0;
                 }
 
                 Assert.AreEqual(0, result.DeletedCount);