Use write concern majority in client side encryption tests

JAVA-3464

Author: jyemin

driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionBsonSizeLimitsSpecification.groovy

@@ -20,6 +20,7 @@ import com.mongodb.AutoEncryptionSettings
 import com.mongodb.ClientEncryptionSettings
 import com.mongodb.MongoNamespace
 import com.mongodb.MongoWriteException
+import com.mongodb.WriteConcern
 import com.mongodb.async.FutureResultCallback
 import com.mongodb.async.client.vault.ClientEncryption
 import com.mongodb.async.client.vault.ClientEncryptions
@@ -60,7 +61,8 @@ class ClientSideEncryptionBsonSizeLimitsSpecification extends FunctionalSpecific
         Fixture.drop(autoEncryptingCollectionNamespace)
 
         new CollectionHelper<>(new BsonDocumentCodec(), keyVaultNamespace).insertDocuments(
-                getTestDocument('/client-side-encryption-limits/limits-key.json'))
+                [getTestDocument('/client-side-encryption-limits/limits-key.json')],
+                WriteConcern.MAJORITY)
 
         def providerProperties =
                 ['local': ['key': Base64.getDecoder().decode('Mng0NCt4ZHVUYUJCa1kxNkVyNUR1QURhZ2h2UzR2d2RrZzh0cFBwM3R6NmdWMDFBMUN'

driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionCorpusTest.java

@@ -20,6 +20,7 @@
 import com.mongodb.ClientEncryptionSettings;
 import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoException;
+import com.mongodb.WriteConcern;
 import com.mongodb.async.FutureResultCallback;
 import com.mongodb.async.client.vault.ClientEncryption;
 import com.mongodb.async.client.vault.ClientEncryptions;
@@ -101,7 +102,8 @@ public void setUp() throws IOException, URISyntaxException {
 
         // Step 3: Drop and create admin.datakeys
         MongoDatabase adminDatabase = client.getDatabase("admin");
-        MongoCollection<BsonDocument> dataKeysCollection = adminDatabase.getCollection("datakeys", BsonDocument.class);
+        MongoCollection<BsonDocument> dataKeysCollection = adminDatabase.getCollection("datakeys", BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY);
 
         voidCallback = new FutureResultCallback<Void>();
         dataKeysCollection.drop(voidCallback);

driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionExternalKeyVaultTest.java

@@ -21,6 +21,7 @@
 import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoCredential;
 import com.mongodb.MongoSecurityException;
+import com.mongodb.WriteConcern;
 import com.mongodb.async.FutureResultCallback;
 import com.mongodb.async.client.vault.ClientEncryption;
 import com.mongodb.async.client.vault.ClientEncryptions;
@@ -74,7 +75,8 @@ public void setUp() throws IOException, URISyntaxException {
         /* Step 1: get unencrypted client and recreate keys collection */
         client = getMongoClient();
         MongoDatabase admin = client.getDatabase("admin");
-        MongoCollection<BsonDocument> datakeys = admin.getCollection("datakeys", BsonDocument.class);
+        MongoCollection<BsonDocument> datakeys = admin.getCollection("datakeys", BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY);
         FutureResultCallback<Void> voidCallback = new FutureResultCallback<Void>();
         datakeys.drop(voidCallback);
         voidCallback.get();

driver-async/src/test/functional/com/mongodb/async/client/ClientSideEncryptionTest.java

@@ -20,6 +20,7 @@
 import com.mongodb.MongoCommandException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.MongoWriteConcernException;
+import com.mongodb.WriteConcern;
 import com.mongodb.async.FutureResultCallback;
 import com.mongodb.client.model.CreateCollectionOptions;
 import com.mongodb.client.model.ValidationOptions;
@@ -156,7 +157,8 @@ public void setUp() {
         }
 
         /* Insert data into the "admin.datakeys" key vault. */
-        collection = getMongoClient().getDatabase("admin").getCollection("datakeys", BsonDocument.class);
+        collection = getMongoClient().getDatabase("admin").getCollection("datakeys", BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY);
         callback = new FutureResultCallback<Void>();
         collection.drop(callback);
         callback.get(30, TimeUnit.SECONDS);

driver-sync/src/test/functional/com/mongodb/client/AbstractClientSideEncryptionTest.java

@@ -20,6 +20,7 @@
 import com.mongodb.MongoCommandException;
 import com.mongodb.MongoNamespace;
 import com.mongodb.MongoWriteConcernException;
+import com.mongodb.WriteConcern;
 import com.mongodb.client.model.CreateCollectionOptions;
 import com.mongodb.client.model.ValidationOptions;
 import com.mongodb.client.test.CollectionHelper;
@@ -147,7 +148,8 @@ public void setUp() {
 
         /* Insert data into the "admin.datakeys" key vault. */
         BsonArray data = specDocument.getArray("key_vault_data", new BsonArray());
-        collection = getMongoClient().getDatabase("admin").getCollection("datakeys", BsonDocument.class);
+        collection = getMongoClient().getDatabase("admin").getCollection("datakeys", BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY);
         collection.drop();
         if (!data.isEmpty()) {
             documents = new ArrayList<BsonDocument>();

driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionBsonSizeLimitsSpecification.groovy

@@ -20,6 +20,7 @@ import com.mongodb.AutoEncryptionSettings
 import com.mongodb.ClientEncryptionSettings
 import com.mongodb.MongoNamespace
 import com.mongodb.MongoWriteException
+import com.mongodb.WriteConcern
 import com.mongodb.client.vault.ClientEncryption
 import com.mongodb.client.vault.ClientEncryptions
 import com.mongodb.internal.connection.TestCommandListener
@@ -45,6 +46,7 @@ class ClientSideEncryptionBsonSizeLimitsSpecification extends FunctionalSpecific
             collectionName)
     private final MongoCollection dataKeyCollection = getMongoClient()
             .getDatabase(keyVaultNamespace.databaseName).getCollection(keyVaultNamespace.collectionName, BsonDocument)
+            .withWriteConcern(WriteConcern.MAJORITY)
     private final MongoCollection<BsonDocument> dataCollection = getMongoClient()
             .getDatabase(autoEncryptingCollectionNamespace.databaseName).getCollection(autoEncryptingCollectionNamespace.collectionName,
             BsonDocument)

driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionCorpusTest.java

@@ -20,6 +20,7 @@
 import com.mongodb.ClientEncryptionSettings;
 import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoException;
+import com.mongodb.WriteConcern;
 import com.mongodb.client.model.vault.EncryptOptions;
 import com.mongodb.client.vault.ClientEncryption;
 import com.mongodb.client.vault.ClientEncryptions;
@@ -94,7 +95,8 @@ public void setUp() throws IOException, URISyntaxException {
 
         // Step 3: Drop and create admin.datakeys
         MongoDatabase adminDatabase = client.getDatabase("admin");
-        MongoCollection<BsonDocument> dataKeysCollection = adminDatabase.getCollection("datakeys", BsonDocument.class);
+        MongoCollection<BsonDocument> dataKeysCollection = adminDatabase.getCollection("datakeys", BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY);
         dataKeysCollection.drop();
         dataKeysCollection.insertOne(bsonDocumentFromPath("corpus-key-aws.json"));
         dataKeysCollection.insertOne(bsonDocumentFromPath("corpus-key-local.json"));

driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionExternalKeyVaultSpecification.groovy

@@ -48,6 +48,7 @@ class ClientSideEncryptionExternalKeyVaultSpecification extends FunctionalSpecif
             'ClientSideEncryptionProseTestSpecification')
     private final MongoCollection dataKeyCollection = getMongoClient()
             .getDatabase(keyVaultNamespace.databaseName).getCollection(keyVaultNamespace.collectionName, BsonDocument)
+            .withWriteConcern(WriteConcern.MAJORITY)
     private final MongoCollection<BsonDocument> dataCollection = getMongoClient()
             .getDatabase(autoEncryptingCollectionNamespace.databaseName).getCollection(autoEncryptingCollectionNamespace.collectionName,
             BsonDocument)

driver-sync/src/test/functional/com/mongodb/client/ClientSideEncryptionExternalKeyVaultTest.java

@@ -21,6 +21,7 @@
 import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoCredential;
 import com.mongodb.MongoSecurityException;
+import com.mongodb.WriteConcern;
 import com.mongodb.client.model.vault.EncryptOptions;
 import com.mongodb.client.vault.ClientEncryption;
 import com.mongodb.client.vault.ClientEncryptions;
@@ -73,7 +74,8 @@ public void setUp() throws IOException, URISyntaxException {
         /* Step 1: get unencrypted client and recreate keys collection */
         client = getMongoClient();
         MongoDatabase admin = client.getDatabase("admin");
-        MongoCollection<BsonDocument> datakeys = admin.getCollection("datakeys", BsonDocument.class);
+        MongoCollection<BsonDocument> datakeys = admin.getCollection("datakeys", BsonDocument.class)
+                .withWriteConcern(WriteConcern.MAJORITY);
         datakeys.drop();
         datakeys.insertOne(bsonDocumentFromPath("external-key.json"));