SERVER-22732 assert.contains() has unreachable code after return

(cherry picked from commit 4e87684433692889660c57763fa5c188651b646d)

2 files changed, 21 insertions, 23 deletions

diff --git a/jstests/sharding/replset_config/basic_sharding_params.js b/jstests/sharding/replset_config/basic_sharding_params.js
index 80a617e9987..7b23666e702 100644
--- a/jstests/sharding/replset_config/basic_sharding_params.js
+++ b/jstests/sharding/replset_config/basic_sharding_params.js
@@ -30,12 +30,12 @@ function shardingTestUsingObjects() {
     var rs1_d0 = rs1.nodes[0];
     var rs1_a1 = rs1.nodes[1];
 
-    assert.contains( "-vvvvvv", s0.commandLine );
-    assert.contains( "-vvvvv", s1.commandLine );
-    assert.contains( "-vvvv", c0.commandLine );
-    assert.contains( "-vvv", d0.commandLine );
-    assert.contains( "-vv", rs1_d0.commandLine );
-    assert.contains( "-v", rs1_a1.commandLine );
+    assert(s0.commandLine.hasOwnProperty("vvvvvv"));
+    assert(s1.commandLine.hasOwnProperty("vvvvv"));
+    assert(c0.commandLine.hasOwnProperty("vvvv"));
+    assert(d0.commandLine.hasOwnProperty("vvv"));
+    assert(rs1_d0.commandLine.hasOwnProperty("vv"));
+    assert(rs1_a1.commandLine.hasOwnProperty("v"));
 
     st.stop();
 }
@@ -62,11 +62,11 @@ function shardingTestUsingArrays() {
     var d1 = st.d1;
     assert.eq( d1, st._connections[1] );
 
-    assert.contains( "-vvvvv", s0.commandLine );
-    assert.contains( "-vvvv", s1.commandLine );
-    assert.contains( "-vvv", c0.commandLine );
-    assert.contains( "-vv", d0.commandLine );
-    assert.contains( "-v", d1.commandLine );
+    assert(s0.commandLine.hasOwnProperty("vvvvv"));
+    assert(s1.commandLine.hasOwnProperty("vvvv"));
+    assert(c0.commandLine.hasOwnProperty("vvv"));
+    assert(d0.commandLine.hasOwnProperty("vv"));
+    assert(d1.commandLine.hasOwnProperty("v"));
 
     st.stop();
 }
diff --git a/src/mongo/shell/assert.js b/src/mongo/shell/assert.js
index ca6c049dd15..d3fd72ffcd2 100644
--- a/src/mongo/shell/assert.js
+++ b/src/mongo/shell/assert.js
@@ -127,22 +127,20 @@ assert.neq = function(a, b, msg){
 
 assert.contains = function(o, arr, msg){
     var wasIn = false;
-
-    if(! arr.length){
-        for(var i in arr){
-            wasIn = arr[i] == o || ((arr[i] != null && o != null) && friendlyEqual(arr[i], o));
-                return;
-            if(wasIn) break;
-        }
+    if (!Array.isArray(arr)) {
+        throw new Error("The second argument to assert.contains must be an array.");
     }
-    else {
-        for(var i = 0; i < arr.length; i++){
-            wasIn = arr[i] == o || ((arr[i] != null && o != null) && friendlyEqual(arr[i], o));
-            if(wasIn) break;
+
+    for(var i = 0; i < arr.length; i++){
+        wasIn = arr[i] == o || ((arr[i] != null && o != null) && friendlyEqual(arr[i], o));
+        if(wasIn) {
+            break;
         }
     }
 
-    if(! wasIn) doassert(tojson(o) + " was not in " + tojson(arr) + " : " + msg);
+    if(!wasIn) {
+        doassert(tojson(o) + " was not in " + tojson(arr) + " : " + msg);
+    }
 };
 
 assert.repeat = function(f, msg, timeout, interval) {