All tests passed

Author: kkloberdanz

src/mongocxx/collection.cpp

@@ -1312,6 +1312,26 @@ void collection::drop(const client_session& session,
     return _drop(&session, wc);
 }
 
+void collection::drop(bsoncxx::document::view_or_value collection_options) {
+    bson_error_t error;
+
+    bsoncxx::builder::basic::document opts_doc;
+
+    opts_doc.append(bsoncxx::builder::concatenate_doc{collection_options});
+
+    scoped_bson_t opts_bson{opts_doc.view()};
+    auto result =
+        libmongoc::collection_drop_with_opts(_get_impl().collection_t, opts_bson.bson(), &error);
+
+    // Throw an exception if the command failed, unless the failure was due to a non-existent
+    // collection. We check for this failure using 'code', but we fall back to checking 'message'
+    // for old server versions (3.0 and earlier) that do not send a code with the command response.
+    if (!result && !(error.code == ::MONGOC_ERROR_COLLECTION_DOES_NOT_EXIST ||
+                     stdx::string_view{error.message} == stdx::string_view{"ns not found"})) {
+        throw_exception<operation_exception>(error);
+    }
+}
+
 void collection::read_concern(class read_concern rc) {
     libmongoc::collection_set_read_concern(_get_impl().collection_t, rc._impl->read_concern_t);
 }

src/mongocxx/collection.hpp

@@ -722,6 +722,7 @@ class MONGOCXX_API collection {
     void drop(const client_session& session,
               const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {});
 
+    void drop(bsoncxx::document::view_or_value collection_options);
     ///
     /// @}
     ///

src/mongocxx/test/spec/operation.cpp

@@ -1282,18 +1282,43 @@ document::value operation_runner::_run_create_collection(document::view operatio
     auto arguments = operation["arguments"].get_document().value;
     auto collection_name = arguments["collection"].get_string().value;
     auto session = _lookup_session(arguments);
+
+    std::cerr << "CREATE COLLECTION: " << bsoncxx::to_json(operation) << std::endl;
     if (session) {
         _db->create_collection(*session, collection_name);
     } else if (arguments.find("encryptedFields") != arguments.end()) {
         auto encrypted_fields = arguments["encryptedFields"].get_document().value;
         auto encrypted_fields_map = make_document(kvp("encryptedFields", encrypted_fields));
         _db->create_collection(collection_name, std::move(encrypted_fields_map));
+        std::cerr << "CREATED COLLECTION WITH ENCRYPTED FIELDS" << std::endl;
     } else {
         _db->create_collection(collection_name);
     }
     return empty_document;
 }
 
+document::value operation_runner::_run_drop_collection(document::view operation) {
+    using bsoncxx::builder::basic::make_document;
+    using bsoncxx::builder::basic::kvp;
+
+    bsoncxx::document::value empty_document({});
+
+    auto arguments = operation["arguments"].get_document().value;
+
+    std::cerr << "DROP COLLECTION: " << bsoncxx::to_json(operation) << std::endl;
+    auto collection_name = operation["arguments"]["collection"].get_string().value;
+
+    if (arguments.find("encryptedFields") != arguments.end()) {
+        auto encrypted_fields = arguments["encryptedFields"].get_document().value;
+        auto encrypted_fields_map = make_document(kvp("encryptedFields", encrypted_fields));
+        _db->collection(collection_name).drop(std::move(encrypted_fields_map));
+        std::cerr << "CREATED COLLECTION WITH ENCRYPTED FIELDS" << std::endl;
+    } else {
+        _db->collection(collection_name).drop();
+    }
+    return empty_document;
+}
+
 operation_runner::operation_runner(collection* coll) : operation_runner(nullptr, coll) {}
 operation_runner::operation_runner(database* db,
                                    collection* coll,
@@ -1387,9 +1412,7 @@ document::value operation_runner::run(document::view operation) {
         _coll->drop();
         return empty_document;
     } else if (key.compare("dropCollection") == 0) {
-        auto collection_name = operation["arguments"]["collection"].get_string().value;
-        _db->collection(collection_name).drop();
-        return empty_document;
+        return _run_drop_collection(operation);
     } else if (key.compare("listCollectionNames") == 0) {
         _db->list_collection_names();
         return empty_document;

src/mongocxx/test/spec/operation.hh

@@ -59,6 +59,7 @@ class operation_runner {
     document::value _run_aggregate(document::view operation);
     document::value _run_count(document::view operation);
     document::value _run_create_collection(document::view operation);
+    document::value _run_drop_collection(document::view operation);
     document::value _run_distinct(document::view operation);
     document::value _run_find(document::view operation);
     document::value _run_delete_many(document::view operation);