SERVER-30384 tests should specify a sort when expecting an ordering for a query

This refactors several tests in core to not rely on an implicit sort
order, which allows them to be unblacklisted from the causally
consistent jscore passthroughs.

1 files changed, 36 insertions, 30 deletions

diff --git a/jstests/core/find4.js b/jstests/core/find4.js
index 204e7c511e2..ad482916a19 100644
--- a/jstests/core/find4.js
+++ b/jstests/core/find4.js
@@ -1,36 +1,42 @@
+(function() {
+    "use strict";
 
-t = db.find4;
-t.drop();
+    const coll = db.find4;
+    coll.drop();
 
-t.save({a: 1123, b: 54332});
+    assert.writeOK(coll.insert({a: 1123, b: 54332}));
 
-o = t.find({}, {})[0];
-assert.eq(1123, o.a, "A");
-assert.eq(54332, o.b, "B");
-assert(o._id.str, "C");
+    let o = coll.findOne();
+    assert.eq(1123, o.a, "A");
+    assert.eq(54332, o.b, "B");
+    assert(o._id.str, "C");
 
-o = t.find({}, {a: 1})[0];
-assert.eq(1123, o.a, "D");
-assert(o._id.str, "E");
-assert(!o.b, "F");
+    o = coll.findOne({}, {a: 1});
+    assert.eq(1123, o.a, "D");
+    assert(o._id.str, "E");
+    assert(!o.b, "F");
 
-o = t.find({}, {b: 1})[0];
-assert.eq(54332, o.b, "G");
-assert(o._id.str, "H");
-assert(!o.a, "I");
+    o = coll.findOne({}, {b: 1});
+    assert.eq(54332, o.b, "G");
+    assert(o._id.str, "H");
+    assert(!o.a, "I");
 
-t.drop();
-t.save({a: 1, b: 1});
-t.save({a: 2, b: 2});
-assert.eq("1-1,2-2",
-          t.find()
-              .map(function(z) {
-                  return z.a + "-" + z.b;
-              })
-              .toString());
-assert.eq("1-undefined,2-undefined",
-          t.find({}, {a: 1})
-              .map(function(z) {
-                  return z.a + "-" + z.b;
-              })
-              .toString());
+    assert(coll.drop());
+
+    assert.writeOK(coll.insert({a: 1, b: 1}));
+    assert.writeOK(coll.insert({a: 2, b: 2}));
+    assert.eq("1-1,2-2",
+              coll.find()
+                  .sort({a: 1})
+                  .map(function(z) {
+                      return z.a + "-" + z.b;
+                  })
+                  .toString());
+    assert.eq("1-undefined,2-undefined",
+              coll.find({}, {a: 1})
+                  .sort({a: 1})
+                  .map(function(z) {
+                      return z.a + "-" + z.b;
+                  })
+                  .toString());
+}());