SERVER-19528 Change validationState to validationAction

This reinstates 1264122b4fd9d05a9d38ec87e066f5f614fb2bc3
with a compile fix for windows

1 files changed, 4 insertions, 4 deletions

diff --git a/jstests/core/doc_validation_options.js b/jstests/core/doc_validation_options.js
index 6057aaf0c10..cfc9263d376 100644
--- a/jstests/core/doc_validation_options.js
+++ b/jstests/core/doc_validation_options.js
@@ -23,7 +23,7 @@
 
     // check we can do a bad update in warn mode
     assert.commandWorked(t.runCommand("collMod",
-                                      {validationState: "warn"}));
+                                      {validationAction: "warn"}));
     t.update({}, {$set: {a:2}});
     assert.eq(1, t.find({a:2}).itcount());
 
@@ -31,11 +31,11 @@
 
     // make sure persisted
     var info = db.getCollectionInfos({name: t.getName()})[0];
-    assert.eq("warn", info.options.validationState, tojson(info));
+    assert.eq("warn", info.options.validationAction, tojson(info));
     
     // check we can go back to enforce strict
     assert.commandWorked(t.runCommand("collMod",
-                                      {validationState: "enforce",
+                                      {validationAction: "error",
                                        validationLevel: "strict"}));
     assertFailsValidation(t.update({}, {$set: {a:3}}));
     assert.eq(1, t.find({a:2}).itcount());
@@ -50,7 +50,7 @@
     t.drop();
     assert.commandWorked(db.createCollection(t.getName(),
                                              {validator: {a : 1},
-                                              validationState: "warn"}));
+                                              validationAction: "warn"}));
     
     t.insert({a:2});
     t.insert({a:1});