Add two test for FindAndModify and fix case where operates was wrapped in $set operator.

lanwin · lanwin · commit 3efbbe24d303 · 2011-03-10T08:47:22.000+01:00
diff --git a/source/MongoDB.Tests/IntegrationTests/TestCollection_1.cs b/source/MongoDB.Tests/IntegrationTests/TestCollection_1.cs
@@ -408,5 +408,44 @@ public void SaveUpdatesExistsingDocument(){
             Assert.IsNotNull(result);
             Assert.AreEqual(result["Existing"], 2.0);
         }
+
+        public class Sequence
+        {
+            public string Name { get; set; }
+            public int Value { get; set; }
+        }
+
+        [Test]
+        public void FindAndModifyWithoutOperatorWorks()
+        {
+            var collection = DB.GetCollection<Sequence>();
+
+            collection.Remove(new Document());
+            collection.Insert(new Sequence { Name = "test", Value = 1 });
+
+            var spec = new Document().Add("Name", "test");
+            var update = new Document("Value", 10);
+
+            var document = collection.FindAndModify(update, spec, true);
+
+            Assert.AreEqual("test", document.Name);
+            Assert.AreEqual(10, document.Value);
+        }
+
+        [Test]
+        public void FindAndModifyIncOperatorWorks()
+        {
+            var collection = DB.GetCollection<Sequence>();
+
+            collection.Remove(new Document());
+            collection.Insert(new Sequence { Name = "test", Value = 1 });
+
+            var spec = new Document().Add("Name", "test");
+            var update = Mo.Inc("Value", 1);
+
+            var document = collection.FindAndModify(update, spec, true);
+            
+            Assert.AreEqual(2, document.Value);
+        }
     }
 }
diff --git a/source/MongoDB/MongoCollection_1.cs b/source/MongoDB/MongoCollection_1.cs
@@ -610,16 +610,13 @@ private object EnsureUpdateDocument(object document)
         {
             var descriptor = _configuration.SerializationFactory.GetObjectDescriptor(typeof(T));
 
-            var foundOp = descriptor.GetMongoPropertyNames(document)
-                .Any(name => name.IndexOf('$') == 0);
+            var foundOp = document is Document && ( (Document)document ).Keys.Any(k => k.Contains("$"));
 
             if(foundOp == false)
-            {
-                //wrap document in a $set.
-                return new Document().Add("$set", document);
-            }
+                foundOp = descriptor.GetMongoPropertyNames(document)
+                    .Any(name => name.Contains('$'));
 
-            return document;
+            return foundOp == false ? new Document().Add("$set", document) : document;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -610,16 +610,13 @@ private object EnsureUpdateDocument(object document)`
`610`	`610`	`{`
`611`	`611`	`var descriptor = _configuration.SerializationFactory.GetObjectDescriptor(typeof(T));`
`612`	`612`
`613`		`- var foundOp = descriptor.GetMongoPropertyNames(document)`
`614`		`- .Any(name => name.IndexOf('$') == 0);`
	`613`	`+ var foundOp = document is Document && ( (Document)document ).Keys.Any(k => k.Contains("$"));`
`615`	`614`
`616`	`615`	`if(foundOp == false)`
`617`		`- {`
`618`		`- //wrap document in a $set.`
`619`		`- return new Document().Add("$set", document);`
`620`		`- }`
	`616`	`+ foundOp = descriptor.GetMongoPropertyNames(document)`
	`617`	`+ .Any(name => name.Contains('$'));`
`621`	`618`
`622`		`- return document;`
	`619`	`+ return foundOp == false ? new Document().Add("$set", document) : document;`
`623`	`620`	`}`
`624`	`621`	`}`
`625`	`622`	`}`