update some tests to use new wc option

HanaPearlman · nbbeeken · commit 5f04cfc81b64 · 2020-11-30T12:14:55.000-05:00
diff --git a/src/operations/map_reduce.ts b/src/operations/map_reduce.ts
@@ -23,9 +23,6 @@ const exclusionList = [
   'readConcern',
   'session',
   'bypassDocumentValidation',
-  'w',
-  'wtimeout',
-  'j',
   'writeConcern',
   'raw',
   'fieldsAsRaw',
diff --git a/test/examples/transactions.js b/test/examples/transactions.js
@@ -234,9 +234,15 @@ describe('examples(transactions):', function () {
 
       // Prereq: Create collections.
 
-      await client.db('mydb1').collection('foo').insertOne({ abc: 0 }, { w: 'majority' });
-
-      await client.db('mydb2').collection('bar').insertOne({ xyz: 0 }, { w: 'majority' });
+      await client
+        .db('mydb1')
+        .collection('foo')
+        .insertOne({ abc: 0 }, { writeConcern: { w: 'majority' } });
+
+      await client
+        .db('mydb2')
+        .collection('bar')
+        .insertOne({ xyz: 0 }, { writeConcern: { w: 'majority' } });
 
       // Step 1: Start a Client Session
       const session = client.startSession();
diff --git a/test/functional/aggregation.test.js b/test/functional/aggregation.test.js
@@ -53,7 +53,7 @@ describe('Aggregation', function () {
         // Create a collection
         var collection = db.collection('shouldCorrectlyExecuteSimpleAggregationPipelineUsingArray');
         // Insert the docs
-        collection.insert(docs, { w: 1 }, function (err, result) {
+        collection.insert(docs, { writeConcern: { w: 1 } }, function (err, result) {
           expect(result).to.exist;
           expect(err).to.not.exist;
 
@@ -172,7 +172,7 @@ describe('Aggregation', function () {
           'shouldCorrectlyExecuteSimpleAggregationPipelineUsingArguments'
         );
         // Insert the docs
-        collection.insert(docs, { w: 1 }, function (err, result) {
+        collection.insert(docs, { writeConcern: { w: 1 } }, function (err, result) {
           expect(result).to.exist;
           expect(err).to.not.exist;
 
@@ -260,7 +260,7 @@ describe('Aggregation', function () {
           'shouldCorrectlyExecuteSimpleAggregationPipelineUsingArguments'
         );
         // Insert the docs
-        collection.insert(docs, { w: 1 }, function (err, result) {
+        collection.insert(docs, { writeConcern: { w: 1 } }, function (err, result) {
           expect(result).to.exist;
           expect(err).to.not.exist;
 
@@ -346,7 +346,7 @@ describe('Aggregation', function () {
         // Create a collection
         var collection = db.collection('shouldCorrectlyDoAggWithCursorGet');
         // Insert the docs
-        collection.insert(docs, { w: 1 }, function (err, result) {
+        collection.insert(docs, { writeConcern: { w: 1 } }, function (err, result) {
           expect(err).to.not.exist;
           expect(result).to.exist;
 
@@ -426,7 +426,7 @@ describe('Aggregation', function () {
         // Create a collection
         var collection = db.collection('shouldCorrectlyDoAggWithCursorGet');
         // Insert the docs
-        collection.insert(docs, { w: 1 }, function (err, result) {
+        collection.insert(docs, { writeConcern: { w: 1 } }, function (err, result) {
           expect(result).to.exist;
           expect(err).to.not.exist;
 
@@ -515,7 +515,7 @@ describe('Aggregation', function () {
         // Create a collection
         const collection = db.collection('shouldCorrectlyDoAggWithCursorGet');
         // Insert the docs
-        collection.insert(docs, { w: 1 }, (err, result) => {
+        collection.insert(docs, { writeConcern: { w: 1 } }, (err, result) => {
           expect(result).to.exist;
           expect(err).to.not.exist;
 
@@ -604,7 +604,7 @@ describe('Aggregation', function () {
         // Create a collection
         var collection = db.collection('shouldCorrectlyDoAggWithCursorGet');
         // Insert the docs
-        collection.insert(docs, { w: 1 }, function (err, result) {
+        collection.insert(docs, { writeConcern: { w: 1 } }, function (err, result) {
           expect(result).to.exist;
           expect(err).to.not.exist;
 
@@ -689,7 +689,7 @@ describe('Aggregation', function () {
         // Create a collection
         var collection = db.collection('shouldCorrectlyDoAggWithCursorGet');
         // Insert the docs
-        collection.insert(docs, { w: 1 }, function (err, result) {
+        collection.insert(docs, { writeConcern: { w: 1 } }, function (err, result) {
           expect(result).to.exist;
           expect(err).to.not.exist;
 
@@ -885,7 +885,7 @@ describe('Aggregation', function () {
         // Create a collection
         var collection = db.collection('shouldCorrectlyDoAggWithCursorGetStream');
         // Insert the docs
-        collection.insert(docs, { w: 1 }, function (err, result) {
+        collection.insert(docs, { writeConcern: { w: 1 } }, function (err, result) {
           expect(result).to.exist;
           expect(err).to.not.exist;
 
@@ -1027,7 +1027,7 @@ describe('Aggregation', function () {
           // Create a collection
           const collection = db.collection('shouldCorrectlyDoAggWithCursorMaxTimeMSSet');
           // Insert the docs
-          collection.insert(docs, { w: 1 }, (err, result) => {
+          collection.insert(docs, { writeConcern: { w: 1 } }, (err, result) => {
             expect(result).to.exist;
             expect(err).to.not.exist;
 
@@ -1197,7 +1197,7 @@ describe('Aggregation', function () {
         // Create a collection
         var collection = db.collection('shouldCorrectlyQueryUsingISODate');
         // Insert the docs
-        collection.insertMany(docs, { w: 1 }, function (err, result) {
+        collection.insertMany(docs, { writeConcern: { w: 1 } }, function (err, result) {
           expect(result).to.exist;
           expect(err).to.not.exist;
 
@@ -1249,7 +1249,10 @@ describe('Aggregation', function () {
         // Create a collection
         var collection = db.collection('shouldCorrectlyQueryUsingISODate3');
         // Insert the docs
-        collection.insertMany([{ a: 1 }, { b: 1 }], { w: 1 }, function (err, result) {
+        collection.insertMany([{ a: 1 }, { b: 1 }], { writeConcern: { w: 1 } }, function (
+          err,
+          result
+        ) {
           expect(result).to.exist;
           expect(err).to.not.exist;
 
diff --git a/test/functional/apm.test.js b/test/functional/apm.test.js
@@ -358,7 +358,9 @@ describe('APM', function () {
             // Insert test documents
             return db
               .collection('apm_test_2')
-              .insertMany([{ a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }], { w: 1 });
+              .insertMany([{ a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }], {
+                writeConcern: { w: 1 }
+              });
           })
           .then(r => {
             expect(r.insertedCount).to.equal(6);
@@ -529,7 +531,9 @@ describe('APM', function () {
           .then(() =>
             db
               .collection('apm_test_2')
-              .insertMany([{ a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }], { w: 1 })
+              .insertMany([{ a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }, { a: 1 }], {
+                writeConcern: { w: 1 }
+              })
           )
           .then(r => {
             expect(r.insertedCount).to.equal(6);
diff --git a/test/functional/causal_consistency.test.js b/test/functional/causal_consistency.test.js
@@ -203,7 +203,7 @@ describe('Causal Consistency', function () {
 
         return db
           .collection('causal_test')
-          .insert({}, { session: session, w: 0 })
+          .insert({}, { session: session, writeConcern: { w: 0 } })
           .then(() => {
             expect(session.operationTime).to.be.null;
           });
diff --git a/test/functional/change_stream.test.js b/test/functional/change_stream.test.js
@@ -31,14 +31,18 @@ function withChangeStream(dbName, collectionName, callback) {
   return withClient((client, done) => {
     const db = client.db(dbName);
     db.dropCollection(collectionName, () => {
-      db.createCollection(collectionName, { w: 'majority' }, (err, collection) => {
-        if (err) return done(err);
-        withCursor(
-          collection.watch(),
-          (cursor, done) => callback(collection, cursor, done),
-          err => collection.drop(dropErr => done(err || dropErr))
-        );
-      });
+      db.createCollection(
+        collectionName,
+        { writeConcern: { w: 'majority' } },
+        (err, collection) => {
+          if (err) return done(err);
+          withCursor(
+            collection.watch(),
+            (cursor, done) => callback(collection, cursor, done),
+            err => collection.drop(dropErr => done(err || dropErr))
+          );
+        }
+      );
     });
   });
 }
@@ -2537,7 +2541,7 @@ describe('Change Streams', function () {
         coll = client.db('integration_tests').collection('setupAfterTest');
         const changeStream = coll.watch();
         waitForStarted(changeStream, () => {
-          coll.insertOne({ x: 1 }, { w: 'majority', j: true }, err => {
+          coll.insertOne({ x: 1 }, { writeConcern: { w: 'majority', j: true } }, err => {
             expect(err).to.not.exist;
 
             coll.drop(err => {
@@ -2565,7 +2569,7 @@ describe('Change Streams', function () {
         const changeStream = coll.watch([], { startAfter });
         this.defer(() => changeStream.close());
 
-        coll.insertOne({ x: 2 }, { w: 'majority', j: true }, err => {
+        coll.insertOne({ x: 2 }, { writeConcern: { w: 'majority', j: true } }, err => {
           expect(err).to.not.exist;
           changeStream.once('change', change => {
             expect(change).to.containSubset({
@@ -2585,7 +2589,7 @@ describe('Change Streams', function () {
         const changeStream = coll.watch([], { startAfter });
         this.defer(() => changeStream.close());
 
-        coll.insertOne({ x: 2 }, { w: 'majority', j: true }, err => {
+        coll.insertOne({ x: 2 }, { writeConcern: { w: 'majority', j: true } }, err => {
           expect(err).to.not.exist;
           exhaust(changeStream, (err, bag) => {
             expect(err).to.not.exist;
@@ -2630,7 +2634,7 @@ describe('Change Streams', function () {
         waitForStarted(changeStream, () => {
           triggerResumableError(changeStream, () => {
             events.push('error');
-            coll.insertOne({ x: 2 }, { w: 'majority', j: true });
+            coll.insertOne({ x: 2 }, { writeConcern: { w: 'majority', j: true } });
           });
         });
       }
@@ -2670,8 +2674,8 @@ describe('Change Streams', function () {
         waitForStarted(changeStream, () =>
           this.defer(
             coll
-              .insertOne({ x: 2 }, { w: 'majority', j: true })
-              .then(() => coll.insertOne({ x: 3 }, { w: 'majority', j: true }))
+              .insertOne({ x: 2 }, { writeConcern: { w: 'majority', j: true } })
+              .then(() => coll.insertOne({ x: 3 }, { writeConcern: { w: 'majority', j: true } }))
           )
         );
       }
diff --git a/test/functional/change_stream_spec.test.js b/test/functional/change_stream_spec.test.js
@@ -37,7 +37,9 @@ describe('Change Stream Spec', function () {
         const sDB = suite.database_name;
         const sColl = suite.collection_name;
         const configuration = this.configuration;
-        return Promise.all(ALL_DBS.map(db => gc.db(db).dropDatabase({ w: 'majority' })))
+        return Promise.all(
+          ALL_DBS.map(db => gc.db(db).dropDatabase({ writeConcern: { w: 'majority' } }))
+        )
           .then(() => gc.db(sDB).createCollection(sColl))
           .then(() => {
             if (suite.database2_name && suite.collection2_name) {
diff --git a/test/functional/collection.test.js b/test/functional/collection.test.js
@@ -493,23 +493,28 @@ describe('Collection', function () {
         expect(err).to.not.exist;
 
         // Index name happens to be the same as collection name
-        db.createIndex(testCollection, 'collection_124', { w: 1 }, (err, indexName) => {
-          expect(err).to.not.exist;
-          expect(indexName).to.equal('collection_124_1');
-
-          db.listCollections().toArray((err, documents) => {
+        db.createIndex(
+          testCollection,
+          'collection_124',
+          { writeConcern: { w: 1 } },
+          (err, indexName) => {
             expect(err).to.not.exist;
-            expect(documents.length > 1).to.be.true;
-            let found = false;
+            expect(indexName).to.equal('collection_124_1');
 
-            documents.forEach(document => {
-              if (document.name === testCollection) found = true;
-            });
+            db.listCollections().toArray((err, documents) => {
+              expect(err).to.not.exist;
+              expect(documents.length > 1).to.be.true;
+              let found = false;
 
-            expect(found).to.be.true;
-            done();
-          });
-        });
+              documents.forEach(document => {
+                if (document.name === testCollection) found = true;
+              });
+
+              expect(found).to.be.true;
+              done();
+            });
+          }
+        );
       });
     });
 
@@ -630,15 +635,15 @@ describe('Collection', function () {
           ) {
             collection.createIndex(
               { createdAt: 1 },
-              { expireAfterSeconds: 1, w: 1 },
+              { expireAfterSeconds: 1, writeConcern: { w: 1 } },
               errorCallBack
             );
           } else if (
             test.title === 'should correctly create TTL collection with index using ensureIndex'
           ) {
             collection.ensureIndex(
               { createdAt: 1 },
-              { expireAfterSeconds: 1, w: 1 },
+              { expireAfterSeconds: 1, writeConcern: { w: 1 } },
               errorCallBack
             );
           }
diff --git a/test/functional/connection.test.js b/test/functional/connection.test.js
@@ -42,18 +42,22 @@ describe('Connection', function () {
         expect(err).to.not.exist;
         var db = client.db(configuration.db);
 
-        db.collection('domainSocketCollection0').insert({ a: 1 }, { w: 1 }, function (err) {
-          expect(err).to.not.exist;
+        db.collection('domainSocketCollection0').insert(
+          { a: 1 },
+          { writeConcern: { w: 1 } },
+          function (err) {
+            expect(err).to.not.exist;
 
-          db.collection('domainSocketCollection0')
-            .find({ a: 1 })
-            .toArray(function (err, items) {
-              expect(err).to.not.exist;
-              test.equal(1, items.length);
+            db.collection('domainSocketCollection0')
+              .find({ a: 1 })
+              .toArray(function (err, items) {
+                expect(err).to.not.exist;
+                test.equal(1, items.length);
 
-              client.close(done);
-            });
-        });
+                client.close(done);
+              });
+          }
+        );
       });
     }
   });
@@ -106,18 +110,22 @@ describe('Connection', function () {
         expect(err).to.not.exist;
         var db = client.db(configuration.db);
 
-        db.collection('domainSocketCollection1').insert({ x: 1 }, { w: 1 }, function (err) {
-          expect(err).to.not.exist;
+        db.collection('domainSocketCollection1').insert(
+          { x: 1 },
+          { writeConcern: { w: 1 } },
+          function (err) {
+            expect(err).to.not.exist;
 
-          db.collection('domainSocketCollection1')
-            .find({ x: 1 })
-            .toArray(function (err, items) {
-              expect(err).to.not.exist;
-              test.equal(1, items.length);
+            db.collection('domainSocketCollection1')
+              .find({ x: 1 })
+              .toArray(function (err, items) {
+                expect(err).to.not.exist;
+                test.equal(1, items.length);
 
-              client.close(done);
-            });
-        });
+                client.close(done);
+              });
+          }
+        );
       });
     }
   });
@@ -135,7 +143,7 @@ describe('Connection', function () {
       db.collection(testName, function (err, collection) {
         expect(err).to.not.exist;
 
-        collection.insert({ foo: 123 }, { w: 1 }, function (err) {
+        collection.insert({ foo: 123 }, { writeConcern: { w: 1 } }, function (err) {
           expect(err).to.not.exist;
 
           db.dropDatabase(function (err, dropped) {
diff --git a/test/functional/spec-runner/index.js b/test/functional/spec-runner/index.js
