Support Convert CSFLE spec tests to unified test format changes

JAVA-5674

Author: rozza

driver-core/src/test/functional/com/mongodb/client/test/CollectionHelper.java

@@ -179,6 +179,11 @@ public void create(final WriteConcern writeConcern, final BsonDocument createOpt
                 case "encryptedFields":
                     createCollectionOptions.encryptedFields(createOptions.getDocument("encryptedFields"));
                     break;
+                case "validator":
+                    ValidationOptions validationOptions = new ValidationOptions();
+                    validationOptions.validator(createOptions.getDocument("validator"));
+                    createCollectionOptions.validationOptions(validationOptions);
+                    break;
                 default:
                     throw new UnsupportedOperationException("Unsupported create collection option: " + option);
             }
@@ -198,6 +203,10 @@ public void create(final String collectionName, final CreateCollectionOptions op
         if (indexOptionDefaults.getStorageEngine() != null) {
             operation.indexOptionDefaults(new BsonDocument("storageEngine", toBsonDocument(indexOptionDefaults.getStorageEngine())));
         }
+        Bson encryptedFields = options.getEncryptedFields();
+        if (encryptedFields != null) {
+            operation.encryptedFields(encryptedFields.toBsonDocument());
+        }
         ValidationOptions validationOptions = options.getValidationOptions();
         if (validationOptions.getValidator() != null) {
             operation.validator(toBsonDocument(validationOptions.getValidator()));

driver-core/src/test/unit/com/mongodb/internal/connection/TestClusterListener.java

@@ -32,7 +32,6 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Predicate;
 
-import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.assertions.Assertions.notNull;
 import static com.mongodb.internal.Locks.withLock;
 
@@ -48,15 +47,17 @@ public final class TestClusterListener implements ClusterListener {
 
     @Override
     public void clusterOpening(final ClusterOpeningEvent event) {
-        isTrue("clusterOpeningEvent is null", clusterOpeningEvent == null);
-        clusterOpeningEvent = event;
+        if(clusterOpeningEvent == null) {
+            clusterOpeningEvent = event;
+        }
     }
 
     @Override
     public void clusterClosed(final ClusterClosedEvent event) {
-        isTrue("clusterClosingEvent is null", clusterClosingEvent == null);
-        closedLatch.countDown();
-        clusterClosingEvent = event;
+        if(clusterClosingEvent == null) {
+            closedLatch.countDown();
+            clusterClosingEvent = event;
+        }
     }
 
     @Override

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

@@ -57,6 +57,7 @@
 import com.mongodb.client.model.DeleteManyModel;
 import com.mongodb.client.model.DeleteOneModel;
 import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.DropCollectionOptions;
 import com.mongodb.client.model.DropIndexOptions;
 import com.mongodb.client.model.EstimatedDocumentCountOptions;
 import com.mongodb.client.model.FindOneAndDeleteOptions;
@@ -77,6 +78,7 @@
 import com.mongodb.client.model.UpdateManyModel;
 import com.mongodb.client.model.UpdateOneModel;
 import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.ValidationOptions;
 import com.mongodb.client.model.WriteModel;
 import com.mongodb.client.model.bulk.ClientBulkWriteOptions;
 import com.mongodb.client.model.bulk.ClientBulkWriteResult;
@@ -1364,12 +1366,21 @@ public OperationResult executeDropCollection(final BsonDocument operation) {
         BsonDocument arguments = operation.getDocument("arguments", new BsonDocument());
         String collectionName = arguments.getString("collection").getValue();
 
-        if (operation.getDocument("arguments").size() > 1) {
-            throw new UnsupportedOperationException("Unexpected arguments " + operation.get("arguments"));
+        DropCollectionOptions dropCollectionOptions = new DropCollectionOptions();
+        for (Map.Entry<String, BsonValue> entry : arguments.entrySet()) {
+            switch (entry.getKey()) {
+                case "collection":
+                    break;
+                case "encryptedFields":
+                    dropCollectionOptions.encryptedFields(entry.getValue().asDocument());
+                    break;
+                default:
+                    throw new UnsupportedOperationException("Unsupported drop collections option: " + entry.getKey());
+            }
         }
 
         return resultOf(() -> {
-            database.getCollection(collectionName).drop();
+            database.getCollection(collectionName).drop(dropCollectionOptions);
             return null;
         });
     }
@@ -1429,6 +1440,11 @@ public OperationResult executeCreateCollection(final BsonDocument operation) {
                     case "clusteredIndex":
                         options.clusteredIndexOptions(createClusteredIndexOptions(cur.getValue().asDocument()));
                         break;
+                    case "validator":
+                        ValidationOptions validationOptions = new ValidationOptions();
+                        validationOptions.validator(cur.getValue().asDocument());
+                        options.validationOptions(validationOptions);
+                        break;
                     default:
                         throw new UnsupportedOperationException("Unsupported argument: " + cur.getKey());
                 }