CSHARP-1597: empty updates should throw exceptions so as not to inadvertantly overwrite entire documents.

Author: craiggwilson

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

@@ -61,6 +61,14 @@ public void Constructor_should_throw_when_update_is_null()
  act.ShouldThrow<ArgumentNullException>();
  }
 
+ [Test]
+ public void Constructor_should_throw_when_update_is_empty()
+ {
+ Action act = () => new FindOneAndUpdateOperation<BsonDocument>(_collectionNamespace, _filter, new BsonDocument(), BsonDocumentSerializer.Instance, _messageEncoderSettings);
+
+ act.ShouldThrow<ArgumentException>();
+ }
+
  [Test]
  public void Constructor_should_throw_when_result_serializer_is_null()
  {

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

@@ -0,0 +1,58 @@
+/* Copyright 2016 MongoDB Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using System;
+using FluentAssertions;
+using MongoDB.Bson;
+using NUnit.Framework;
+
+namespace MongoDB.Driver.Core.Operations
+{
+ [TestFixture]
+ public class UpdateRequestTests : OperationTestBase
+ {
+ [Test]
+ public void Constructor_should_throw_when_filter_is_null()
+ {
+ Action act = () => new UpdateRequest(UpdateType.Update, null, new BsonDocument());
+
+ act.ShouldThrow<ArgumentNullException>();
+ }
+
+ [Test]
+ public void Constructor_should_throw_when_update_is_null()
+ {
+ Action act = () => new UpdateRequest(UpdateType.Update, new BsonDocument(), null);
+
+ act.ShouldThrow<ArgumentNullException>();
+ }
+
+ [Test]
+ public void Constructor_should_throw_when_update_is_empty_and_update_type_is_Update()
+ {
+ Action act = () => new UpdateRequest(UpdateType.Update, new BsonDocument(), new BsonDocument());
+
+ act.ShouldThrow<ArgumentException>();
+ }
+
+ [Test]
+ public void Constructor_should_not_throw_when_update_is_empty_and_update_type_is_not_Update()
+ {
+ Action act = () => new UpdateRequest(UpdateType.Replacement, new BsonDocument(), new BsonDocument());
+
+ act.ShouldNotThrow<ArgumentException>();
+ }
+ }
+}

src/MongoDB.Driver.Core.Tests/MongoDB.Driver.Core.Tests.csproj

@@ -73,6 +73,7 @@
  <Compile Include="Core\Operations\AsyncCursorSourceEnumerableAdapterTests.cs" />
  <Compile Include="Core\Operations\AsyncCursorEnumerableOneTimeAdapterTests.cs" />
  <Compile Include="Core\Operations\CommandOperationBaseTests.cs" />
+ <Compile Include="Core\Operations\UpdateRequestTests.cs" />
  <Compile Include="Core\Operations\GeoSearchOperationTests.cs" />
  <Compile Include="Core\Operations\GeoNearOperationTests.cs" />
  <Compile Include="Core\Operations\CreateCollectionOperationTests.cs" />

src/MongoDB.Driver.Core/Core/Operations/FindOneAndUpdateOperation.cs

@@ -58,6 +58,10 @@ public FindOneAndUpdateOperation(CollectionNamespace collectionNamespace, BsonDo
  {
  _filter = Ensure.IsNotNull(filter, nameof(filter));
  _update = Ensure.IsNotNull(update, nameof(update));
+ if (_update.ElementCount == 0)
+ {
+ throw new ArgumentException("Updates must have at least 1 update operator.", nameof(update));
+ }
  _returnDocument = ReturnDocument.Before;
  }
 

src/MongoDB.Driver.Core/Core/Operations/UpdateRequest.cs

@@ -13,6 +13,7 @@
 * limitations under the License.
 */
 
+using System;
 using MongoDB.Bson;
 using MongoDB.Driver.Core.Misc;
 
@@ -43,6 +44,10 @@ public UpdateRequest(UpdateType updateType, BsonDocument filter, BsonDocument up
  _updateType = updateType;
  _filter = Ensure.IsNotNull(filter, nameof(filter));
  _update = Ensure.IsNotNull(update, nameof(update));
+ if (updateType == UpdateType.Update && _update.ElementCount == 0)
+ {
+ throw new ArgumentException("Updates must have at least 1 update operator.", nameof(update));
+ }
  }
 
  // properties

src/MongoDB.Driver.Tests/UpdateDefinitionBuilderTests.cs

@@ -160,6 +160,16 @@ public void Combine_with_overlapping_operators_and_duplicate_elements_using_exte
  Assert(update, "{$set: {a: 4, b: 2}}");
  }
 
+ [Test]
+ public void Combine_with_no_updates()
+ {
+ var subject = CreateSubject<BsonDocument>();
+
+ var update = subject.Combine();
+
+ Assert(update, "{ }");
+ }
+
  [Test]
  public void CurrentDate()
  {