SERVER-13439 Do not fall through Switch case to Bool case in options conversion

1 files changed, 57 insertions, 8 deletions

diff --git a/jstests/dur/journaling_options.js b/jstests/dur/journaling_options.js
index 9d2c418d494..ab6af2c17fa 100644
--- a/jstests/dur/journaling_options.js
+++ b/jstests/dur/journaling_options.js
@@ -64,14 +64,6 @@ expectedResult = {
 testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/enable_journal.json" },
                          expectedResult);
 
-jsTest.log("Testing with no explicit journal setting");
-expectedResult = {
-    "parsed" : {
-        "storage" : { }
-    }
-};
-testGetCmdLineOptsMongod({}, expectedResult);
-
 // Test that we preserve switches explicitly set to false in config files.  See SERVER-13439.
 jsTest.log("Testing explicitly disabled \"journal\" config file option");
 expectedResult = {
@@ -129,4 +121,61 @@ expectedResult = {
 testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/disable_nodur.ini" },
                          expectedResult);
 
+// Test that switches in old config files with no value have an implicit value of true
+jsTest.log("Testing implicitly enabled \"journal\" config file option");
+expectedResult = {
+    "parsed" : {
+        "config" : "jstests/libs/config_files/implicitly_enable_journal.ini",
+        "storage" : {
+            "journal" : {
+                "enabled" : true
+            }
+        }
+    }
+};
+testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/implicitly_enable_journal.ini" },
+                         expectedResult);
+
+jsTest.log("Testing implicitly enabled \"nojournal\" config file option");
+expectedResult = {
+    "parsed" : {
+        "config" : "jstests/libs/config_files/implicitly_enable_nojournal.ini",
+        "storage" : {
+            "journal" : {
+                "enabled" : false
+            }
+        }
+    }
+};
+testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/implicitly_enable_nojournal.ini" },
+                         expectedResult);
+
+jsTest.log("Testing implicitly enabled \"dur\" config file option");
+expectedResult = {
+    "parsed" : {
+        "config" : "jstests/libs/config_files/implicitly_enable_dur.ini",
+        "storage" : {
+            "journal" : {
+                "enabled" : true
+            }
+        }
+    }
+};
+testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/implicitly_enable_dur.ini" },
+                         expectedResult);
+
+jsTest.log("Testing implicitly enabled \"nodur\" config file option");
+expectedResult = {
+    "parsed" : {
+        "config" : "jstests/libs/config_files/implicitly_enable_nodur.ini",
+        "storage" : {
+            "journal" : {
+                "enabled" : false
+            }
+        }
+    }
+};
+testGetCmdLineOptsMongod({ config : "jstests/libs/config_files/implicitly_enable_nodur.ini" },
+                         expectedResult);
+
 print(baseName + " succeeded.");