SERVER-12746: Fix assert() calls with constant-value args

These calls were mostly mistakes that should have been assert.eq().

assert() will now trip if passed a non-string msg, or too many params.

1 files changed, 13 insertions, 4 deletions

diff --git a/jstests/core/distinct4.js b/jstests/core/distinct4.js
index 5e4a1fd85a2..1fa2763bf40 100644
--- a/jstests/core/distinct4.js
+++ b/jstests/core/distinct4.js
@@ -15,7 +15,7 @@
     //first argument should be a string or error
 
     // from shell helper
-    assert.throws( t.distinct, [{a:1}] );
+    assert.throws( function () { t.distinct({a:1}); } );
 
     // from command interface
     assert.commandFailedWithCode(t.runCommand("distinct", {"key": {a: 1}}),
@@ -25,7 +25,7 @@
     //second argument should be a document or error
 
     // from shell helper
-    assert.throws( t.distinct, ['a', '1'] );
+    assert.throws( function () { t.distinct('a', '1'); } );
 
     // from command interface
     assert.commandFailedWithCode(t.runCommand("distinct", {"key": "a", "query": "a"}),
@@ -34,8 +34,17 @@
 
 
     // empty query clause should not cause error
-    assert( t.runCommand( "distinct", { "key" : "a" } ) );
 
-    assert( t.distinct, ['a'] );
+    // from shell helper
+    var a = assert.doesNotThrow( function () { return t.distinct('a'); } );
+    // [ null, 1, 2, 3 ]
+    assert.eq(4, a.length, tojson(a));
+    assert.contains(null, a);
+    assert.contains(1, a);
+    assert.contains(2, a);
+    assert.contains(3, a);
+
+    // from command interface
+    assert.commandWorked( t.runCommand( "distinct", { "key" : "a" } ) );
 
 })();