SERVER-13389 Migrate assert.gleXXX in jscore test suite

(cherry picked from commit 6412fa7eca5c834f29490ab6cdd1cb13b3d99c97)

3 files changed, 78 insertions, 72 deletions

diff --git a/jstests/core/fts_explain.js b/jstests/core/fts_explain.js
index 0d9c1fd7a9d..9f9d2a37d2e 100644
--- a/jstests/core/fts_explain.js
+++ b/jstests/core/fts_explain.js
@@ -1,13 +1,14 @@
 // Test $text explain.  SERVER-12037.
 
 var coll = db.fts_explain;
+var res;
 
 coll.drop();
-coll.ensureIndex({content: "text"}, {default_language: "none"});
-assert.gleSuccess(db);
+res = coll.ensureIndex({content: "text"}, {default_language: "none"});
+assert.commandWorked(res);
 
-coll.insert({content: "some data"});
-assert.gleSuccess(db);
+res = coll.insert({content: "some data"});
+assert.writeOK(res);
 
 var explain = coll.find({$text:{$search: "\"a\" -b -\"c\""}}).explain(true);
 assert.eq(explain.cursor, "TextCursor");
diff --git a/jstests/core/geo_s2indexversion1.js b/jstests/core/geo_s2indexversion1.js
index 8524faeddbd..bfb70e3a16c 100644
--- a/jstests/core/geo_s2indexversion1.js
+++ b/jstests/core/geo_s2indexversion1.js
@@ -8,68 +8,69 @@ coll.drop();
 // Index build should fail for invalid values of "2dsphereIndexVersion".
 //
 
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": -1});
-assert.gleError(db);
+var res;
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": -1});
+assert.commandFailed(res);
 coll.drop();
 
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": 0});
-assert.gleError(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": 0});
+assert.commandFailed(res);
 coll.drop();
 
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": 3});
-assert.gleError(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": 3});
+assert.commandFailed(res);
 coll.drop();
 
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": Infinity});
-assert.gleError(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": Infinity});
+assert.commandFailed(res);
 coll.drop();
 
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": "foo"});
-assert.gleError(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": "foo"});
+assert.commandFailed(res);
 coll.drop();
 
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": {a: 1}});
-assert.gleError(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": {a: 1}});
+assert.commandFailed(res);
 coll.drop();
 
 //
 // Index build should succeed for valid values of "2dsphereIndexVersion".
 //
 
-coll.ensureIndex({geo: "2dsphere"});
-assert.gleSuccess(db);
+res = coll.ensureIndex({geo: "2dsphere"});
+assert.commandWorked(res);
 coll.drop();
 
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": 1});
-assert.gleSuccess(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": 1});
+assert.commandWorked(res);
 coll.drop();
 
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": NumberInt(1)});
-assert.gleSuccess(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": NumberInt(1)});
+assert.commandWorked(res);
 coll.drop();
 
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": NumberLong(1)});
-assert.gleSuccess(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": NumberLong(1)});
+assert.commandWorked(res);
 coll.drop();
 
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": 2});
-assert.gleSuccess(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": 2});
+assert.commandWorked(res);
 coll.drop();
 
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": NumberInt(2)});
-assert.gleSuccess(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": NumberInt(2)});
+assert.commandWorked(res);
 coll.drop();
 
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": NumberLong(2)});
-assert.gleSuccess(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": NumberLong(2)});
+assert.commandWorked(res);
 coll.drop();
 
 //
 // {2dsphereIndexVersion: 2} should be the default for new indexes.
 //
 
-coll.ensureIndex({geo: "2dsphere"});
-assert.gleSuccess(db);
+res = coll.ensureIndex({geo: "2dsphere"});
+assert.commandWorked(res);
 var specObj = coll.getDB().system.indexes.findOne({ns: coll.getFullName(), name: "geo_2dsphere"});
 assert.eq(2, specObj["2dsphereIndexVersion"]);
 coll.drop();
@@ -112,39 +113,39 @@ var geometryCollectionDoc = {geo: {type: "GeometryCollection",
                                                                 [-73.97036, 40.76811]]]}]}};
 
 // {2dsphereIndexVersion: 2} indexes allow all supported GeoJSON objects.
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": 2});
-assert.gleSuccess(db);
-coll.insert(pointDoc);
-assert.gleSuccess(db);
-coll.insert(lineStringDoc);
-assert.gleSuccess(db);
-coll.insert(polygonDoc);
-assert.gleSuccess(db);
-coll.insert(multiPointDoc);
-assert.gleSuccess(db);
-coll.insert(multiLineStringDoc);
-assert.gleSuccess(db);
-coll.insert(multiPolygonDoc);
-assert.gleSuccess(db);
-coll.insert(geometryCollectionDoc);
-assert.gleSuccess(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": 2});
+assert.commandWorked(res);
+res = coll.insert(pointDoc);
+assert.writeOK(res);
+res = coll.insert(lineStringDoc);
+assert.writeOK(res);
+res = coll.insert(polygonDoc);
+assert.writeOK(res);
+res = coll.insert(multiPointDoc);
+assert.writeOK(res);
+res = coll.insert(multiLineStringDoc);
+assert.writeOK(res);
+res = coll.insert(multiPolygonDoc);
+assert.writeOK(res);
+res = coll.insert(geometryCollectionDoc);
+assert.writeOK(res);
 coll.drop();
 
 // {2dsphereIndexVersion: 1} indexes allow only Point, LineString, and Polygon.
-coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": 1});
-assert.gleSuccess(db);
-coll.insert(pointDoc);
-assert.gleSuccess(db);
-coll.insert(lineStringDoc);
-assert.gleSuccess(db);
-coll.insert(polygonDoc);
-assert.gleSuccess(db);
-coll.insert(multiPointDoc);
-assert.gleError(db);
-coll.insert(multiLineStringDoc);
-assert.gleError(db);
-coll.insert(multiPolygonDoc);
-assert.gleError(db);
-coll.insert(geometryCollectionDoc);
-assert.gleError(db);
+res = coll.ensureIndex({geo: "2dsphere"}, {"2dsphereIndexVersion": 1});
+assert.commandWorked(res);
+res = coll.insert(pointDoc);
+assert.writeOK(res);
+res = coll.insert(lineStringDoc);
+assert.writeOK(res);
+res = coll.insert(polygonDoc);
+assert.writeOK(res);
+res = coll.insert(multiPointDoc);
+assert.writeError(res);
+res = coll.insert(multiLineStringDoc);
+assert.writeError(res);
+res = coll.insert(multiPolygonDoc);
+assert.writeError(res);
+res = coll.insert(geometryCollectionDoc);
+assert.writeError(res);
 coll.drop();
diff --git a/jstests/core/insert_illegal_doc.js b/jstests/core/insert_illegal_doc.js
index 2b4d326e9ce..0d92653d3a0 100644
--- a/jstests/core/insert_illegal_doc.js
+++ b/jstests/core/insert_illegal_doc.js
@@ -4,19 +4,23 @@ var coll = db.insert_illegal_doc;
 coll.drop();
 coll.ensureIndex({a: 1, b: 1});
 
+var res;
 // test upsert
-coll.update({}, {_id: 1, a: [1, 2, 3], b: [4, 5, 6]}, true);
-assert.gleErrorCode(db, 10088);
+res = coll.update({}, {_id: 1, a: [1, 2, 3], b: [4, 5, 6]}, true);
+assert.writeError(res);
+assert.eq(res.getWriteError().code, 10088);
 assert.eq(0, coll.find().itcount(), "should not be a doc");
 
 // test insert
-coll.insert({_id: 1, a: [1, 2, 3], b: [4, 5, 6]});
-assert.gleErrorCode(db, 10088);
+res = coll.insert({_id: 1, a: [1, 2, 3], b: [4, 5, 6]});
+assert.writeError(res);
+assert.eq(res.getWriteError().code, 10088);
 assert.eq(0, coll.find().itcount(), "should not be a doc");
 
 // test update
-coll.insert({_id: 1});
-assert.gleSuccess(db, "insert failed");
-coll.update({_id: 1}, {$set : { a : [1, 2, 3], b: [4, 5, 6]}});
-assert.gleErrorCode(db, 10088);
+res = coll.insert({_id: 1});
+assert.writeOK(res, "insert failed");
+res = coll.update({_id: 1}, {$set : { a : [1, 2, 3], b: [4, 5, 6]}});
+assert.writeError(res);
+assert.eq(res.getWriteError().code, 10088);
 assert.eq(undefined, coll.findOne().a, "update should have failed");