1 files changed, 86 insertions, 0 deletions
diff --git a/jstests/updatei.js b/jstests/updatei.js
new file mode 100644
index 00000000000..e45b3fde5bb
--- /dev/null
+++ b/jstests/updatei.js
@@ -0,0 +1,86 @@
+// Test new (optional) update syntax
+// SERVER-4176
+t = db.updatei;
+
+// Using a multi update
+
+t.drop();
+
+for (i=0; i<10; i++) { 
+    t.save({ _id : i, k: "x", a: [] }); 
+}
+
+t.update({ k: "x" }, { $push: { a: "y" }}, { multi: true });
+t.find({ k : "x" }).forEach(function(z) {
+    assert.eq([ "y" ], z.a, "multi update using object arg");
+});
+
+t.drop();
+
+// Using a single update
+
+for (i=0; i<10; i++) { 
+    t.save({ _id : i, k: "x", a: [] }); 
+}
+
+t.update({ k: "x" }, { $push: { a: "y" }}, { multi: false });
+assert.eq(1, t.find({ "a": "y" }).count(), "update using object arg");
+
+t.drop();
+
+// Using upsert, found
+
+for (i=0; i<10; i++) { 
+    t.save({ _id : i, k: "x", a: [] }); 
+}
+
+t.update({ k: "x" }, { $push: { a: "y" }}, { upsert: true });
+assert.eq(1, t.find({ "k": "x", "a": "y" }).count(), "upsert (found) using object arg");
+
+t.drop();
+
+// Using upsert + multi, found
+
+for (i=0; i<10; i++) { 
+    t.save({ _id : i, k: "x", a: [] }); 
+}
+
+t.update({ k: "x" }, { $push: { a: "y" }}, { upsert: true, multi: true });
+t.find({ k : "x" }).forEach(function(z) {
+    assert.eq([ "y" ], z.a, "multi + upsert (found) using object arg");
+});
+
+t.drop();
+
+// Using upsert, not found
+
+for (i=0; i<10; i++) { 
+    t.save({ _id : i, k: "x", a: [] }); 
+}
+
+t.update({ k: "y" }, { $push: { a: "y" }}, { upsert: true });
+assert.eq(1, t.find({ "k": "y", "a": "y" }).count(), "upsert (not found) using object arg");
+
+t.drop();
+
+// Without upsert, found
+
+for (i=0; i<10; i++) { 
+    t.save({ _id : i, k: "x", a: [] }); 
+}
+
+t.update({ k: "x" }, { $push: { a: "y" }}, { upsert: false });
+assert.eq(1, t.find({ "a": "y" }).count(), "no upsert (found) using object arg");
+
+t.drop();
+
+// Without upsert, not found
+
+for (i=0; i<10; i++) { 
+    t.save({ _id : i, k: "x", a: [] }); 
+}
+
+t.update({ k: "y" }, { $push: { a: "y" }}, { upsert: false });
+assert.eq(0, t.find({ "a": "y" }).count(), "no upsert (not found) using object arg");
+
+t.drop();