diff options
Diffstat (limited to 'jstests/aggregation/expressions')
21 files changed, 94 insertions, 94 deletions
diff --git a/jstests/aggregation/expressions/arrayToObject.js b/jstests/aggregation/expressions/arrayToObject.js index df78b9f1aaf..409bd8aee1f 100644 --- a/jstests/aggregation/expressions/arrayToObject.js +++ b/jstests/aggregation/expressions/arrayToObject.js @@ -9,7 +9,7 @@ let coll = db.array_to_object_expr; coll.drop(); // Write one document so that the aggregations which use $const produce a result. -assert.writeOK(coll.insert({_id: "sentinel", a: 1})); +assert.commandWorked(coll.insert({_id: "sentinel", a: 1})); /* * Check that the collapsed, object form of 'expanded' (which is computed using $arrayToObject) diff --git a/jstests/aggregation/expressions/collation_expressions.js b/jstests/aggregation/expressions/collation_expressions.js index dc959791f2f..c8445eb5b60 100644 --- a/jstests/aggregation/expressions/collation_expressions.js +++ b/jstests/aggregation/expressions/collation_expressions.js @@ -96,7 +96,7 @@ testExpressionWithCollation(coll, {$split: ["abc", "B"]}, ["abc"], caseInsensiti // Test that an $and which can be optimized out respects the collation. coll.drop(); -assert.writeOK(coll.insert({_id: 1, str: "A"})); +assert.commandWorked(coll.insert({_id: 1, str: "A"})); results = coll.aggregate([{$project: {out: {$and: [{$eq: ["$str", "a"]}, {$eq: ["b", "B"]}]}}}], {collation: caseInsensitive}) .toArray(); @@ -105,7 +105,7 @@ assert.eq(true, results[0].out); // Test that an $and which cannot be optimized out respects the collation. coll.drop(); -assert.writeOK(coll.insert({_id: 1, str: "A", str2: "B"})); +assert.commandWorked(coll.insert({_id: 1, str: "A", str2: "B"})); results = coll.aggregate([{$project: {out: {$and: [{$eq: ["$str", "a"]}, {$eq: ["$str2", "b"]}]}}}], {collation: caseInsensitive}) .toArray(); @@ -114,7 +114,7 @@ assert.eq(true, results[0].out); // Test that an $or which can be optimized out respects the collation. coll.drop(); -assert.writeOK(coll.insert({_id: 1, str: "A"})); +assert.commandWorked(coll.insert({_id: 1, str: "A"})); results = coll.aggregate([{$project: {out: {$or: [{$eq: ["$str", "a"]}, {$eq: ["b", "c"]}]}}}], {collation: caseInsensitive}) .toArray(); @@ -123,7 +123,7 @@ assert.eq(true, results[0].out); // Test that an $or which cannot be optimized out respects the collation. coll.drop(); -assert.writeOK(coll.insert({_id: 1, str: "A", str2: "B"})); +assert.commandWorked(coll.insert({_id: 1, str: "A", str2: "B"})); results = coll.aggregate([{$project: {out: {$or: [{$eq: ["$str", "c"]}, {$eq: ["$str2", "b"]}]}}}], {collation: caseInsensitive}) .toArray(); @@ -174,7 +174,7 @@ testExpressionWithCollation( // Test that $group stage's _id expressions respect the collation. coll.drop(); -assert.writeOK(coll.insert({_id: 1})); +assert.commandWorked(coll.insert({_id: 1})); results = coll.aggregate([{$group: {_id: {a: {$eq: ["a", "A"]}, b: {$eq: ["b", "B"]}}}}], {collation: caseInsensitive}) .toArray(); @@ -199,9 +199,9 @@ testExpressionWithCollation( // Test that $switch's subexpressions respect the collation. coll.drop(); -assert.writeOK(coll.insert({_id: 1, a: "A"})); -assert.writeOK(coll.insert({_id: 2, b: "B"})); -assert.writeOK(coll.insert({_id: 3, c: "C"})); +assert.commandWorked(coll.insert({_id: 1, a: "A"})); +assert.commandWorked(coll.insert({_id: 2, b: "B"})); +assert.commandWorked(coll.insert({_id: 3, c: "C"})); results = coll.aggregate([{ $project: { out: { @@ -224,7 +224,7 @@ assert.eq("baz", results[2].out); // Test that a $zip's subexpressions respect the collation. coll.drop(); -assert.writeOK(coll.insert({_id: 0, evens: [0, 2, 4], odds: [1, 3]})); +assert.commandWorked(coll.insert({_id: 0, evens: [0, 2, 4], odds: [1, 3]})); results = coll.aggregate([{ $project: { out: { diff --git a/jstests/aggregation/expressions/convert.js b/jstests/aggregation/expressions/convert.js index 4e56bf16265..395ab5d9e93 100644 --- a/jstests/aggregation/expressions/convert.js +++ b/jstests/aggregation/expressions/convert.js @@ -9,7 +9,7 @@ function populateCollection(documentList) { coll.drop(); var bulk = coll.initializeOrderedBulkOp(); documentList.forEach(doc => bulk.insert(doc)); - assert.writeOK(bulk.execute()); + assert.commandWorked(bulk.execute()); } // diff --git a/jstests/aggregation/expressions/date_expressions_with_timezones.js b/jstests/aggregation/expressions/date_expressions_with_timezones.js index 076800a5384..3d8e3a06ac3 100644 --- a/jstests/aggregation/expressions/date_expressions_with_timezones.js +++ b/jstests/aggregation/expressions/date_expressions_with_timezones.js @@ -5,7 +5,7 @@ const coll = db.date_expressions_with_time_zones; coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ // Three sales on 2017-06-16 in UTC. {_id: 0, date: new ISODate("2017-06-16T00:00:00.000Z"), sales: 1}, {_id: 1, date: new ISODate("2017-06-16T12:02:21.013Z"), sales: 2}, diff --git a/jstests/aggregation/expressions/date_from_string.js b/jstests/aggregation/expressions/date_from_string.js index 56c52de0f7e..2703fde98b6 100644 --- a/jstests/aggregation/expressions/date_from_string.js +++ b/jstests/aggregation/expressions/date_from_string.js @@ -9,7 +9,7 @@ const coll = db.date_from_string; /* Normal format tests. */ coll.drop(); -assert.writeOK(coll.insert({_id: 0})); +assert.commandWorked(coll.insert({_id: 0})); let testCases = [ { @@ -76,7 +76,7 @@ testCases.forEach(function(testCase) { /* Normal format tests with timezone. */ coll.drop(); -assert.writeOK(coll.insert({_id: 0})); +assert.commandWorked(coll.insert({_id: 0})); testCases = [ { @@ -132,7 +132,7 @@ testCases.forEach(function(testCase) { /* Normal format tests with UTC offset. */ coll.drop(); -assert.writeOK(coll.insert({_id: 0})); +assert.commandWorked(coll.insert({_id: 0})); testCases = [ { @@ -186,7 +186,7 @@ testCases.forEach(function(testCase) { /* Normal format tests from data. */ coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, dateString: "2017-07-06T12:35:37Z", format: "%Y-%m-%dT%H:%M:%SZ"}, {_id: 1, dateString: "2017-07-06T12:35:37.513Z", format: "%Y-%m-%dT%H:%M:%S.%LZ"}, {_id: 2, dateString: "2017-07-06T12:35:37", format: "%Y-%m-%dT%H:%M:%S"}, @@ -252,7 +252,7 @@ assert.eq( /* Normal format tests from data, with time zone. */ coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, dateString: "2017-07-06T12:35:37.513", timezone: "GMT"}, {_id: 1, dateString: "2017-07-06T12:35:37.513", timezone: "UTC"}, {_id: 2, dateString: "1960-07-10T12:35:37.513", timezone: "America/New_York"}, @@ -305,7 +305,7 @@ assert.eq(expectedResults, /* dateString from data with timezone as constant */ coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, dateString: "2017-07-06T12:35:37"}, ])); @@ -326,7 +326,7 @@ assert.eq( /* dateString from constant with timezone from data */ coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, timezone: "Europe/London"}, {_id: 1, timezone: "America/New_York"}, {_id: 2, timezone: "-05:00"}, @@ -355,7 +355,7 @@ assert.eq( /* BI format tests. */ coll.drop(); -assert.writeOK(coll.insert({_id: 0})); +assert.commandWorked(coll.insert({_id: 0})); let pipelines = [ { @@ -397,7 +397,7 @@ pipelines.forEach(function(pipeline) { /* Tests with additional timezone information . */ coll.drop(); -assert.writeOK(coll.insert({_id: 0})); +assert.commandWorked(coll.insert({_id: 0})); testCases = [ // GMT based variants @@ -445,7 +445,7 @@ testCases.forEach(function(testCase) { /* BI format tests from data. */ coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, dateString: "2017-01-01 00:00:00"}, {_id: 1, dateString: "2017-07-01 00:00:00"}, {_id: 2, dateString: "2017-07-06"}, @@ -477,7 +477,7 @@ assert.eq( /* Wacky format tests from data. */ coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, dateString: "July 4th, 2017"}, {_id: 1, dateString: "July 4th, 2017 12:39:30 BST"}, {_id: 2, dateString: "July 4th, 2017 11am"}, @@ -513,7 +513,7 @@ assert.eq( /* Tests formats that aren't supported with the normal $dateFromString parser. */ coll.drop(); -assert.writeOK(coll.insert({_id: 0})); +assert.commandWorked(coll.insert({_id: 0})); testCases = [ {inputString: "05 12 1988", format: "%d %m %Y", expect: "1988-12-05T00:00:00Z"}, @@ -573,7 +573,7 @@ testCases.forEach(function(testCase) { coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0}, ])); @@ -594,7 +594,7 @@ pipelines.forEach(function(pipeline) { coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0}, ])); @@ -612,7 +612,7 @@ pipelines.forEach(function(pipeline) { /* NULL returns. */ coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, date: new ISODate("2017-06-19T15:13:25.713Z")}, {_id: 1, date: new ISODate("2017-06-19T15:13:25.713Z"), tz: null}, {_id: 2, date: new ISODate("2017-06-19T15:13:25.713Z"), tz: undefined}, @@ -635,7 +635,7 @@ pipelines.forEach(function(pipeline) { }); coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0}, {_id: 1, format: null}, {_id: 2, format: undefined}, diff --git a/jstests/aggregation/expressions/date_from_string_on_error.js b/jstests/aggregation/expressions/date_from_string_on_error.js index c944074657e..51936da86ea 100644 --- a/jstests/aggregation/expressions/date_from_string_on_error.js +++ b/jstests/aggregation/expressions/date_from_string_on_error.js @@ -10,7 +10,7 @@ const onErrorValue = ISODate("2017-07-04T11:56:02Z"); const coll = db.date_from_string_on_error; coll.drop(); -assert.writeOK(coll.insert({_id: 0})); +assert.commandWorked(coll.insert({_id: 0})); // Test that the 'onError' value is returned when 'dateString' is not a valid date/time. for (let inputDate of ["July 4th", diff --git a/jstests/aggregation/expressions/date_from_string_on_null.js b/jstests/aggregation/expressions/date_from_string_on_null.js index caf7cf1216d..be99897d5cb 100644 --- a/jstests/aggregation/expressions/date_from_string_on_null.js +++ b/jstests/aggregation/expressions/date_from_string_on_null.js @@ -8,7 +8,7 @@ const onNullValue = ISODate("2017-07-04T11:56:02Z"); const coll = db.date_from_string_on_null; coll.drop(); -assert.writeOK(coll.insert({_id: 0})); +assert.commandWorked(coll.insert({_id: 0})); // Test that the 'onNull' value is returned when the 'dateString' is nullish. for (let inputDate of [null, undefined, "$missing"]) { diff --git a/jstests/aggregation/expressions/date_to_parts.js b/jstests/aggregation/expressions/date_to_parts.js index 47344f5deda..30416f28610 100644 --- a/jstests/aggregation/expressions/date_to_parts.js +++ b/jstests/aggregation/expressions/date_to_parts.js @@ -7,7 +7,7 @@ const coll = db.dateToParts; coll.drop(); /* --------------------------------------------------------------------------------------- */ -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, date: new ISODate("2017-06-19T15:13:25.713Z"), tz: "UTC"}, {_id: 1, date: new ISODate("2017-06-19T15:13:25.713Z"), tz: "Europe/London"}, {_id: 2, date: new ISODate("2017-06-19T15:13:25.713Z"), tz: "America/New_York", iso: true}, @@ -195,7 +195,7 @@ assert.eq( /* Tests with timestamp */ assert(coll.drop()); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ { _id: ObjectId("58c7cba47bbadf523cf2c313"), date: new ISODate("2017-06-19T15:13:25.713Z"), @@ -272,7 +272,7 @@ assert.eq( /* --------------------------------------------------------------------------------------- */ assert(coll.drop()); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, date: ISODate("2017-06-27T12:00:20Z")}, ])); @@ -286,7 +286,7 @@ assert.eq( /* --------------------------------------------------------------------------------------- */ assert(coll.drop()); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, date: ISODate("2017-06-27T12:00:20Z")}, ])); @@ -300,7 +300,7 @@ assert.eq( /* --------------------------------------------------------------------------------------- */ assert(coll.drop()); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, tz: "Europe/London"}, ])); diff --git a/jstests/aggregation/expressions/date_to_string.js b/jstests/aggregation/expressions/date_to_string.js index b1cc145b627..b618c81e383 100644 --- a/jstests/aggregation/expressions/date_to_string.js +++ b/jstests/aggregation/expressions/date_to_string.js @@ -8,7 +8,7 @@ coll.drop(); /* --------------------------------------------------------------------------------------- */ -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, date: new ISODate("2017-07-04T14:56:42.911Z"), tz: "UTC"}, {_id: 1, date: new ISODate("2017-07-04T14:56:42.911Z"), tz: "Europe/London"}, {_id: 2, date: new ISODate("2017-07-04T14:56:42.911Z"), tz: "America/New_York"}, @@ -47,7 +47,7 @@ assert.eq( /* --------------------------------------------------------------------------------------- */ coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, date: new ISODate("2017-01-04T15:08:51.911Z")}, {_id: 1, date: new ISODate("2017-07-04T15:09:12.911Z")}, {_id: 2, date: new ISODate("2017-12-04T15:09:14.911Z")}, @@ -78,7 +78,7 @@ assert.eq( /* --------------------------------------------------------------------------------------- */ coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, date: new ISODate("2017-01-04T15:08:51.911Z")}, {_id: 1, date: new ISODate("2017-07-04T15:09:12.911Z")}, {_id: 2, date: new ISODate("2017-12-04T15:09:14.911Z")}, @@ -105,7 +105,7 @@ assert.eq( /* --------------------------------------------------------------------------------------- */ coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, date: new ISODate("2017-01-01T15:08:51.911Z")}, {_id: 1, date: new ISODate("2017-07-04T15:09:12.911Z")}, {_id: 2, date: new ISODate("2017-12-04T15:09:14.911Z")}, @@ -133,7 +133,7 @@ assert.eq( /* Test that missing expressions, turn into BSON null values */ coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, date: new ISODate("2017-01-04T15:08:51.911Z")}, {_id: 1, date: new ISODate("2017-01-04T15:08:51.911Z"), timezone: null}, {_id: 2, date: new ISODate("2017-01-04T15:08:51.911Z"), timezone: undefined}, @@ -171,7 +171,7 @@ assert.eq( /* Test that the default format is "%Y-%m-%dT%H:%M:%S.%LZ" if none specified. */ coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, date: new ISODate("2017-01-04T15:08:51.911Z")}, {_id: 1, date: new ISODate("2017-07-04T15:09:12.911Z")}, {_id: 2, date: new ISODate("2017-12-04T15:09:14.911Z")}, @@ -192,7 +192,7 @@ assert.eq( /* --------------------------------------------------------------------------------------- */ /* Test that null is returned when 'format' evaluates to nullish. */ coll.drop(); -assert.writeOK(coll.insert({_id: 0})); +assert.commandWorked(coll.insert({_id: 0})); assert.eq([{_id: 0, date: null}], coll.aggregate({ diff --git a/jstests/aggregation/expressions/date_to_string_on_null.js b/jstests/aggregation/expressions/date_to_string_on_null.js index 7b3bdc07538..15db75bee75 100644 --- a/jstests/aggregation/expressions/date_to_string_on_null.js +++ b/jstests/aggregation/expressions/date_to_string_on_null.js @@ -8,7 +8,7 @@ const onNullValue = ISODate("2017-07-04T11:56:02Z"); const coll = db.date_to_string_on_null; coll.drop(); -assert.writeOK(coll.insert({_id: 0})); +assert.commandWorked(coll.insert({_id: 0})); for (let nullishValue of [null, undefined, "$missing"]) { // Test that the 'onNull' value is returned when the 'date' is nullish. diff --git a/jstests/aggregation/expressions/in.js b/jstests/aggregation/expressions/in.js index 63ba02f1b4e..698a6212b42 100644 --- a/jstests/aggregation/expressions/in.js +++ b/jstests/aggregation/expressions/in.js @@ -32,7 +32,7 @@ function testExpressionCollectionCollation(options, collationSpec) { function testExpressionInternal(options) { var pipeline = {$project: {included: {$in: ["$elementField", {$literal: options.array}]}}}; - assert.writeOK(coll.insert({elementField: options.element})); + assert.commandWorked(coll.insert({elementField: options.element})); var res = coll.aggregate(pipeline).toArray(); assert.eq(res.length, 1); assert.eq(res[0].included, options.elementIsIncluded); diff --git a/jstests/aggregation/expressions/indexof_array.js b/jstests/aggregation/expressions/indexof_array.js index a32376b1f9d..450e450fa16 100644 --- a/jstests/aggregation/expressions/indexof_array.js +++ b/jstests/aggregation/expressions/indexof_array.js @@ -9,7 +9,7 @@ var coll = db.indexofarray; coll.drop(); // Insert a dummy document to ensure something flows through the pipeline. -assert.writeOK(coll.insert({})); +assert.commandWorked(coll.insert({})); testExpression(coll, {$indexOfArray: [[1, 2, 3], 2]}, 1); diff --git a/jstests/aggregation/expressions/indexof_bytes.js b/jstests/aggregation/expressions/indexof_bytes.js index 14bcead5293..7632d0177c0 100644 --- a/jstests/aggregation/expressions/indexof_bytes.js +++ b/jstests/aggregation/expressions/indexof_bytes.js @@ -36,7 +36,7 @@ var coll = db.indexofbytes; coll.drop(); // Insert a dummy document so something flows through the pipeline. -assert.writeOK(coll.insert({})); +assert.commandWorked(coll.insert({})); testExpressionBytes(coll, {$indexOfBytes: ["abc", "b"]}, 1); diff --git a/jstests/aggregation/expressions/indexof_codepoints.js b/jstests/aggregation/expressions/indexof_codepoints.js index acc4a3b072d..56d43547564 100644 --- a/jstests/aggregation/expressions/indexof_codepoints.js +++ b/jstests/aggregation/expressions/indexof_codepoints.js @@ -34,7 +34,7 @@ var coll = db.indexofcp; coll.drop(); // Insert a dummy document so something flows through the pipeline. -assert.writeOK(coll.insert({})); +assert.commandWorked(coll.insert({})); testExpressionCodePoints(coll, {$indexOfCP: ["∫aƒ", "ƒ"]}, 2); diff --git a/jstests/aggregation/expressions/merge_objects.js b/jstests/aggregation/expressions/merge_objects.js index e6d38ccc6a4..995299f3e6c 100644 --- a/jstests/aggregation/expressions/merge_objects.js +++ b/jstests/aggregation/expressions/merge_objects.js @@ -9,7 +9,7 @@ let coll = db.merge_object_expr; coll.drop(); // Test merging two objects together. -assert.writeOK(coll.insert({_id: 0, subObject: {b: 1, c: 1}})); +assert.commandWorked(coll.insert({_id: 0, subObject: {b: 1, c: 1}})); let result = coll.aggregate([ {$match: {_id: 0}}, {$project: {mergedDocument: {$mergeObjects: ["$subObject", {d: 1}]}}} @@ -18,7 +18,7 @@ let result = coll.aggregate([ assert.eq(result, [{_id: 0, mergedDocument: {b: 1, c: 1, d: 1}}]); // Test merging the root document with a new field. -assert.writeOK(coll.insert({_id: 1, a: 0, b: 1})); +assert.commandWorked(coll.insert({_id: 1, a: 0, b: 1})); result = coll.aggregate([ {$match: {_id: 1}}, {$project: {mergedDocument: {$mergeObjects: ["$$ROOT", {newField: "newValue"}]}}} @@ -27,7 +27,7 @@ result = coll.aggregate([ assert.eq(result, [{_id: 1, mergedDocument: {_id: 1, a: 0, b: 1, newField: "newValue"}}]); // Test replacing a field in the root. -assert.writeOK(coll.insert({_id: 2, a: 0, b: 1})); +assert.commandWorked(coll.insert({_id: 2, a: 0, b: 1})); result = coll.aggregate([ {$match: {_id: 2}}, {$project: {mergedDocument: {$mergeObjects: ["$$ROOT", {a: "newValue"}]}}} @@ -36,7 +36,7 @@ result = coll.aggregate([ assert.eq(result, [{_id: 2, mergedDocument: {_id: 2, a: "newValue", b: 1}}]); // Test overriding a document with root. -assert.writeOK(coll.insert({_id: 3, a: 0, b: 1})); +assert.commandWorked(coll.insert({_id: 3, a: 0, b: 1})); result = coll.aggregate([ {$match: {_id: 3}}, {$project: {mergedDocument: {$mergeObjects: [{a: "defaultValue"}, "$$ROOT"]}}} @@ -45,7 +45,7 @@ result = coll.aggregate([ assert.eq(result, [{_id: 3, mergedDocument: {a: 0, _id: 3, b: 1}}]); // Test replacing root with merged document. -assert.writeOK(coll.insert({_id: 4, a: 0, subObject: {b: 1, c: 2}})); +assert.commandWorked(coll.insert({_id: 4, a: 0, subObject: {b: 1, c: 2}})); result = coll.aggregate([ {$match: {_id: 4}}, {$replaceRoot: {newRoot: {$mergeObjects: ["$$ROOT", "$subObject"]}}} @@ -54,7 +54,7 @@ result = coll.aggregate([ assert.eq(result, [{_id: 4, a: 0, subObject: {b: 1, c: 2}, b: 1, c: 2}]); // Test merging with an embedded object. -assert.writeOK(coll.insert({_id: 5, subObject: {b: 1, c: 1}})); +assert.commandWorked(coll.insert({_id: 5, subObject: {b: 1, c: 1}})); result = coll.aggregate([ {$match: {_id: 5}}, @@ -67,18 +67,18 @@ result = assert.eq(result, [{_id: 5, mergedDocument: {b: 1, c: 1, subObject1: {d: 1}, e: 1}}]); // Test for errors on non-document types. -assert.writeOK(coll.insert({_id: 6, a: "string"})); +assert.commandWorked(coll.insert({_id: 6, a: "string"})); assertErrorCode( coll, [{$match: {_id: 6}}, {$project: {mergedDocument: {$mergeObjects: ["$a", {a: "newString"}]}}}], 40400); -assert.writeOK(coll.insert({_id: 7, a: {b: 1}, c: 1})); +assert.commandWorked(coll.insert({_id: 7, a: {b: 1}, c: 1})); assertErrorCode( coll, [{$match: {_id: 7}}, {$project: {mergedDocument: {$mergeObjects: ["$a", "$c"]}}}], 40400); // Test outputs with null values. -assert.writeOK(coll.insert({_id: 8, a: {b: 1}})); +assert.commandWorked(coll.insert({_id: 8, a: {b: 1}})); result = coll.aggregate( [{$match: {_id: 8}}, {$project: {mergedDocument: {$mergeObjects: ["$a", {b: null}]}}}]) @@ -86,7 +86,7 @@ result = assert.eq(result, [{_id: 8, mergedDocument: {b: null}}]); // Test output with undefined values. -assert.writeOK(coll.insert({_id: 9, a: {b: 1}})); +assert.commandWorked(coll.insert({_id: 9, a: {b: 1}})); result = coll.aggregate([ {$match: {_id: 9}}, {$project: {mergedDocument: {$mergeObjects: ["$a", {b: undefined}]}}} @@ -95,7 +95,7 @@ result = coll.aggregate([ assert.eq(result, [{_id: 9, mergedDocument: {b: undefined}}]); // Test output with missing values. -assert.writeOK(coll.insert({_id: 10, a: {b: 1}})); +assert.commandWorked(coll.insert({_id: 10, a: {b: 1}})); result = coll.aggregate([ {$match: {_id: 10}}, {$project: {mergedDocument: {$mergeObjects: ["$a", {b: "$nonExistentField"}]}}} @@ -103,7 +103,7 @@ result = coll.aggregate([ .toArray(); assert.eq(result, [{_id: 10, mergedDocument: {b: 1}}]); -assert.writeOK(coll.insert({_id: 11, a: {b: 1}})); +assert.commandWorked(coll.insert({_id: 11, a: {b: 1}})); result = coll.aggregate( [{$match: {_id: 11}}, {$project: {mergedDocument: {$mergeObjects: ["$a", {b: ""}]}}}]) @@ -111,7 +111,7 @@ result = assert.eq(result, [{_id: 11, mergedDocument: {b: ""}}]); // Test outputs with empty values. -assert.writeOK(coll.insert({_id: 12, b: 1, c: 1})); +assert.commandWorked(coll.insert({_id: 12, b: 1, c: 1})); result = coll.aggregate([{$match: {_id: 12}}, {$project: {mergedDocument: {$mergeObjects: [{}]}}}]) .toArray(); assert.eq(result, [{_id: 12, mergedDocument: {}}]); @@ -122,10 +122,10 @@ result = assert.eq(result, [{_id: 12, mergedDocument: {}}]); // Test merge within a $group stage. -assert.writeOK(coll.insert({_id: 13, group: 1, obj: {}})); -assert.writeOK(coll.insert({_id: 14, group: 1, obj: {a: 2, b: 2}})); -assert.writeOK(coll.insert({_id: 15, group: 1, obj: {a: 1, c: 3}})); -assert.writeOK(coll.insert({_id: 16, group: 2, obj: {a: 1, b: 1}})); +assert.commandWorked(coll.insert({_id: 13, group: 1, obj: {}})); +assert.commandWorked(coll.insert({_id: 14, group: 1, obj: {a: 2, b: 2}})); +assert.commandWorked(coll.insert({_id: 15, group: 1, obj: {a: 1, c: 3}})); +assert.commandWorked(coll.insert({_id: 16, group: 2, obj: {a: 1, b: 1}})); result = coll.aggregate([ {$match: {_id: {$in: [13, 14, 15, 16]}}}, {$sort: {_id: 1}}, @@ -137,7 +137,7 @@ assert.eq(result, [{_id: 1, mergedDocument: {a: 1, b: 2, c: 3}}, {_id: 2, mergedDocument: {a: 1, b: 1}}]); // Test merge with $$REMOVE operator. -assert.writeOK(coll.insert({_id: 17, a: {b: 2}})); +assert.commandWorked(coll.insert({_id: 17, a: {b: 2}})); result = coll.aggregate([ {$match: {_id: 17}}, {$project: {mergedDocument: {$mergeObjects: ["$a", {b: "$$REMOVE"}]}}} diff --git a/jstests/aggregation/expressions/objectToArray.js b/jstests/aggregation/expressions/objectToArray.js index 0ec4a40c2c0..704aacd62a6 100644 --- a/jstests/aggregation/expressions/objectToArray.js +++ b/jstests/aggregation/expressions/objectToArray.js @@ -11,16 +11,16 @@ coll.drop(); let object_to_array_expr = {$project: {expanded: {$objectToArray: "$subDoc"}}}; // $objectToArray correctly converts a document to an array of key-value pairs. -assert.writeOK(coll.insert({_id: 0, subDoc: {"a": 1, "b": 2, "c": "foo"}})); +assert.commandWorked(coll.insert({_id: 0, subDoc: {"a": 1, "b": 2, "c": "foo"}})); let result = coll.aggregate([{$match: {_id: 0}}, object_to_array_expr]).toArray(); assert.eq(result, [{_id: 0, expanded: [{"k": "a", "v": 1}, {"k": "b", "v": 2}, {"k": "c", "v": "foo"}]}]); -assert.writeOK(coll.insert({_id: 1, subDoc: {"y": []}})); +assert.commandWorked(coll.insert({_id: 1, subDoc: {"y": []}})); result = coll.aggregate([{$match: {_id: 1}}, object_to_array_expr]).toArray(); assert.eq(result, [{_id: 1, expanded: [{"k": "y", "v": []}]}]); -assert.writeOK(coll.insert({_id: 2, subDoc: {"a": 1, "b": {"d": "string"}, "c": [1, 2]}})); +assert.commandWorked(coll.insert({_id: 2, subDoc: {"a": 1, "b": {"d": "string"}, "c": [1, 2]}})); result = coll.aggregate([{$match: {_id: 2}}, object_to_array_expr]).toArray(); assert.eq( result, [{ @@ -28,12 +28,12 @@ assert.eq( expanded: [{"k": "a", "v": 1}, {"k": "b", "v": {"d": "string"}}, {"k": "c", "v": [1, 2]}] }]); -assert.writeOK(coll.insert({_id: 3, subDoc: {}})); +assert.commandWorked(coll.insert({_id: 3, subDoc: {}})); result = coll.aggregate([{$match: {_id: 3}}, object_to_array_expr]).toArray(); assert.eq(result, [{_id: 3, expanded: []}]); // Turns to array from the root of the document. -assert.writeOK(coll.insert({_id: 4, "a": 1, "b": 2, "c": 3})); +assert.commandWorked(coll.insert({_id: 4, "a": 1, "b": 2, "c": 3})); result = coll.aggregate([{$match: {_id: 4}}, {$project: {document: {$objectToArray: "$$ROOT"}}}]) .toArray(); assert.eq( @@ -42,7 +42,7 @@ assert.eq( document: [{"k": "_id", "v": 4}, {"k": "a", "v": 1}, {"k": "b", "v": 2}, {"k": "c", "v": 3}] }]); -assert.writeOK(coll.insert({_id: 5, "date": ISODate("2017-01-24T00:00:00")})); +assert.commandWorked(coll.insert({_id: 5, "date": ISODate("2017-01-24T00:00:00")})); result = coll.aggregate([ {$match: {_id: 5}}, {$project: {document: {$objectToArray: {dayOfWeek: {$dayOfWeek: "$date"}}}}} @@ -51,40 +51,40 @@ result = coll.aggregate([ assert.eq(result, [{_id: 5, document: [{"k": "dayOfWeek", "v": 3}]}]); // $objectToArray errors on non-document types. -assert.writeOK(coll.insert({_id: 6, subDoc: "string"})); +assert.commandWorked(coll.insert({_id: 6, subDoc: "string"})); assertErrorCode(coll, [{$match: {_id: 6}}, object_to_array_expr], 40390); -assert.writeOK(coll.insert({_id: 7, subDoc: ObjectId()})); +assert.commandWorked(coll.insert({_id: 7, subDoc: ObjectId()})); assertErrorCode(coll, [{$match: {_id: 7}}, object_to_array_expr], 40390); -assert.writeOK(coll.insert({_id: 8, subDoc: NumberLong(0)})); +assert.commandWorked(coll.insert({_id: 8, subDoc: NumberLong(0)})); assertErrorCode(coll, [{$match: {_id: 8}}, object_to_array_expr], 40390); -assert.writeOK(coll.insert({_id: 9, subDoc: []})); +assert.commandWorked(coll.insert({_id: 9, subDoc: []})); assertErrorCode(coll, [{$match: {_id: 9}}, object_to_array_expr], 40390); -assert.writeOK(coll.insert({_id: 10, subDoc: [0]})); +assert.commandWorked(coll.insert({_id: 10, subDoc: [0]})); assertErrorCode(coll, [{$match: {_id: 10}}, object_to_array_expr], 40390); -assert.writeOK(coll.insert({_id: 11, subDoc: ["string"]})); +assert.commandWorked(coll.insert({_id: 11, subDoc: ["string"]})); assertErrorCode(coll, [{$match: {_id: 11}}, object_to_array_expr], 40390); -assert.writeOK(coll.insert({_id: 12, subDoc: [{"a": "b"}]})); +assert.commandWorked(coll.insert({_id: 12, subDoc: [{"a": "b"}]})); assertErrorCode(coll, [{$match: {_id: 12}}, object_to_array_expr], 40390); -assert.writeOK(coll.insert({_id: 13, subDoc: NaN})); +assert.commandWorked(coll.insert({_id: 13, subDoc: NaN})); assertErrorCode(coll, [{$match: {_id: 13}}, object_to_array_expr], 40390); // $objectToArray outputs null on null-ish types. -assert.writeOK(coll.insert({_id: 14, subDoc: null})); +assert.commandWorked(coll.insert({_id: 14, subDoc: null})); result = coll.aggregate([{$match: {_id: 14}}, object_to_array_expr]).toArray(); assert.eq(result, [{_id: 14, expanded: null}]); -assert.writeOK(coll.insert({_id: 15, subDoc: undefined})); +assert.commandWorked(coll.insert({_id: 15, subDoc: undefined})); result = coll.aggregate([{$match: {_id: 15}}, object_to_array_expr]).toArray(); assert.eq(result, [{_id: 15, expanded: null}]); -assert.writeOK(coll.insert({_id: 16})); +assert.commandWorked(coll.insert({_id: 16})); result = coll.aggregate([{$match: {_id: 16}}, object_to_array_expr]).toArray(); assert.eq(result, [{_id: 16, expanded: null}]); }()); diff --git a/jstests/aggregation/expressions/object_ids_for_date_expressions.js b/jstests/aggregation/expressions/object_ids_for_date_expressions.js index bff8ab587b3..63bada5d893 100644 --- a/jstests/aggregation/expressions/object_ids_for_date_expressions.js +++ b/jstests/aggregation/expressions/object_ids_for_date_expressions.js @@ -11,7 +11,7 @@ let testOpCount = 0; coll.drop(); // Seed collection so that the pipeline will execute. -assert.writeOK(coll.insert({})); +assert.commandWorked(coll.insert({})); function makeObjectIdFromDate(dt) { try { diff --git a/jstests/aggregation/expressions/round_trunc.js b/jstests/aggregation/expressions/round_trunc.js index 735c2b54477..1e03eb47e68 100644 --- a/jstests/aggregation/expressions/round_trunc.js +++ b/jstests/aggregation/expressions/round_trunc.js @@ -9,7 +9,7 @@ load("jstests/aggregation/extras/utils.js"); var coll = db.server19548; coll.drop(); // Seed collection so that the pipeline will execute. -assert.writeOK(coll.insert({})); +assert.commandWorked(coll.insert({})); // Helper for testing that op returns expResult. function testOp(op, expResult) { diff --git a/jstests/aggregation/expressions/size.js b/jstests/aggregation/expressions/size.js index 4e21c71bf4e..3aa1c5d61eb 100644 --- a/jstests/aggregation/expressions/size.js +++ b/jstests/aggregation/expressions/size.js @@ -8,15 +8,15 @@ load("jstests/aggregation/extras/utils.js"); const coll = db.expression_size; coll.drop(); -assert.writeOK(coll.insert({_id: 0, arr: []})); -assert.writeOK(coll.insert({_id: 1, arr: [1]})); -assert.writeOK(coll.insert({_id: 2, arr: ["asdf", "asdfasdf"]})); -assert.writeOK(coll.insert({_id: 3, arr: [1, "asdf", 1234, 4.3, {key: 23}]})); -assert.writeOK(coll.insert({_id: 4, arr: [3, [31, 31, 13, 13]]})); +assert.commandWorked(coll.insert({_id: 0, arr: []})); +assert.commandWorked(coll.insert({_id: 1, arr: [1]})); +assert.commandWorked(coll.insert({_id: 2, arr: ["asdf", "asdfasdf"]})); +assert.commandWorked(coll.insert({_id: 3, arr: [1, "asdf", 1234, 4.3, {key: 23}]})); +assert.commandWorked(coll.insert({_id: 4, arr: [3, [31, 31, 13, 13]]})); const result = coll.aggregate([{$sort: {_id: 1}}, {$project: {_id: 0, length: {$size: "$arr"}}}]); assert.eq(result.toArray(), [{length: 0}, {length: 1}, {length: 2}, {length: 5}, {length: 2}]); -assert.writeOK(coll.insert({arr: 231})); +assert.commandWorked(coll.insert({arr: 231})); assertErrorCode(coll, {$project: {_id: 0, length: {$size: "$arr"}}}, 17124); }()); diff --git a/jstests/aggregation/expressions/split.js b/jstests/aggregation/expressions/split.js index 86200334395..bdece4ae583 100644 --- a/jstests/aggregation/expressions/split.js +++ b/jstests/aggregation/expressions/split.js @@ -7,7 +7,7 @@ load("jstests/aggregation/extras/utils.js"); // For assertErrorCode and testExp var coll = db.split; coll.drop(); -assert.writeOK(coll.insert({})); +assert.commandWorked(coll.insert({})); testExpression(coll, {$split: ["abc", "b"]}, ["a", "c"]); testExpression(coll, {$split: ["aaa", "b"]}, ["aaa"]); diff --git a/jstests/aggregation/expressions/trim.js b/jstests/aggregation/expressions/trim.js index af197adca5a..821e15ea4a3 100644 --- a/jstests/aggregation/expressions/trim.js +++ b/jstests/aggregation/expressions/trim.js @@ -28,7 +28,7 @@ testExpressionWithCollation(coll, {$ltrim: {input: "xXx", chars: "x"}}, "Xx", ca // Test using inputs from documents. coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, name: ", Charlie"}, {_id: 1, name: "Obama\t, Barack"}, {_id: 2, name: " Ride, Sally "} @@ -43,7 +43,7 @@ assert.eq( [{_id: 0, firstName: "Charlie"}, {_id: 1, firstName: "Barack"}, {_id: 2, firstName: "Sally"}]); coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, poorlyParsedWebTitle: "The title of my document"}, {_id: 1, poorlyParsedWebTitle: "\u2001\u2002 Odd unicode indentation"}, {_id: 2, poorlyParsedWebTitle: "\u2001\u2002 Odd unicode indentation\u200A"}, @@ -59,7 +59,7 @@ assert.eq( ]); coll.drop(); -assert.writeOK(coll.insert([ +assert.commandWorked(coll.insert([ {_id: 0, proof: "Left as an exercise for the reader∎"}, {_id: 1, proof: "∎∃ proof∎"}, {_id: 2, proof: "Just view the problem as a continuous DAG whose elements are taylor series∎"}, |