CSHARP-1529: New high level API should respect AssignIdOnInsert.

Author: rstam

src/MongoDB.Driver.Tests/MongoCollectionImplTests.cs

@@ -46,12 +46,10 @@ public void Setup()
             _operationExecutor = new MockOperationExecutor();
         }
 
-        private MongoCollectionImpl<TDocument> CreateSubject<TDocument>()
+        private MongoCollectionImpl<TDocument> CreateSubject<TDocument>(MongoCollectionSettings settings = null)
         {
-            var settings = new MongoCollectionSettings
-            {
-                ReadConcern = _readConcern
-            };
+            settings = settings ?? new MongoCollectionSettings();
+            settings.ReadConcern = _readConcern;
             var dbSettings = new MongoDatabaseSettings();
             dbSettings.ApplyDefaultValues(new MongoClientSettings());
             settings.ApplyDefaultValues(dbSettings);
@@ -1216,6 +1214,35 @@ public void InsertOne_should_throw_a_WriteException_when_an_error_occurs(
             action.ShouldThrow<MongoWriteException>();
         }
 
+        [Test]
+        public void InsertOne_should_respect_AssignIdOnInsert(
+            [Values(false, true)] bool assignIdOnInsert,
+            [Values(false, true)] bool async)
+        {
+            var document = BsonDocument.Parse("{ a : 1 }");
+            var expectedRequest = new InsertRequest(document) { CorrelationId = 0 };
+            var operationResult = new BulkWriteOperationResult.Unacknowledged(1, new[] { expectedRequest });
+            _operationExecutor.EnqueueResult<BulkWriteOperationResult>(operationResult);
+
+            var settings = new MongoCollectionSettings { AssignIdOnInsert = assignIdOnInsert };
+            var subject = CreateSubject<BsonDocument>(settings);
+
+            if (async)
+            {
+                subject.InsertOneAsync(document, cancellationToken: CancellationToken.None).GetAwaiter().GetResult();
+            }
+            else
+            {
+                subject.InsertOne(document, cancellationToken: CancellationToken.None);
+            }
+
+            var call = _operationExecutor.GetWriteCall<BulkWriteOperationResult>();
+            var operation = (BulkMixedWriteOperation)call.Operation;
+            var requests = operation.Requests.ToList(); // call ToList to force evaluation
+            document.Contains("_id").Should().Be(assignIdOnInsert);
+            VerifySingleWrite(expectedRequest, null, true, call);
+        }
+
         [Test]
         public void InsertMany_should_execute_the_BulkMixedOperation(
             [Values(null, false, true)] bool? bypassDocumentValidation,
@@ -1252,6 +1279,35 @@ public void InsertMany_should_execute_the_BulkMixedOperation(
             VerifyWrites(expectedRequests, bypassDocumentValidation, isOrdered, call);
         }
 
+        [Test]
+        public void InsertMany_should_respect_AssignIdOnInsert(
+            [Values(false, true)] bool assignIdOnInsert,
+            [Values(false, true)] bool async)
+        {
+            var document = BsonDocument.Parse("{ a : 1 }");
+            var expectedRequest = new InsertRequest(document) { CorrelationId = 0 };
+            var operationResult = new BulkWriteOperationResult.Unacknowledged(1, new[] { expectedRequest });
+            _operationExecutor.EnqueueResult<BulkWriteOperationResult>(operationResult);
+
+            var settings = new MongoCollectionSettings { AssignIdOnInsert = assignIdOnInsert };
+            var subject = CreateSubject<BsonDocument>(settings);
+
+            if (async)
+            {
+                subject.InsertManyAsync(new[] { document }, cancellationToken: CancellationToken.None).GetAwaiter().GetResult();
+            }
+            else
+            {
+                subject.InsertMany(new[] { document }, cancellationToken: CancellationToken.None);
+            }
+
+            var call = _operationExecutor.GetWriteCall<BulkWriteOperationResult>();
+            var operation = (BulkMixedWriteOperation)call.Operation;
+            var requests = operation.Requests.ToList(); // call ToList to force evaluation
+            document.Contains("_id").Should().Be(assignIdOnInsert);
+            VerifySingleWrite(expectedRequest, null, true, call);
+        }
+
         [Test]
         public void MapReduce_with_inline_output_mode_should_execute_the_MapReduceOperation(
             [Values(false, true)] bool async)

src/MongoDB.Driver/MongoCollectionImpl.cs

@@ -419,7 +419,10 @@ private WriteRequest ConvertWriteModelToWriteRequest(WriteModel<TDocument> model
             {
                 case WriteModelType.InsertOne:
                     var insertOneModel = (InsertOneModel<TDocument>)model;
-                    AssignId(insertOneModel.Document);
+                    if (_settings.AssignIdOnInsert)
+                    {
+                        AssignId(insertOneModel.Document);
+                    }
                     return new InsertRequest(new BsonDocumentWrapper(insertOneModel.Document, _documentSerializer))
                     {
                         CorrelationId = index