test appeared to be checking for the wrong index before. now it checks for the index as specified in the arguments

Author: kkloberdanz

src/mongocxx/test/spec/client_side_encryption.cpp

@@ -52,7 +52,6 @@ void add_auto_encryption_opts(document::view test, options::client* client_opts)
     using std::string;
 
     if (test["clientOptions"]["autoEncryptOpts"]) {
-        std::cout << "AUTO ENCRYPT OPTS: " << bsoncxx::to_json(test["clientOptions"]["autoEncryptOpts"].get_document().value) << std::endl;
         auto test_encrypt_opts = test["clientOptions"]["autoEncryptOpts"].get_document().value;
 
         options::auto_encryption auto_encrypt_opts{};

src/mongocxx/test/spec/operation.cpp

@@ -1281,21 +1281,14 @@ 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;
-    std::cerr << "CREATING COLLECTION NAME: " << collection_name << std::endl;
-    std::cerr << "GOT encrypted_fields" << std::endl;
     auto session = _lookup_session(arguments);
-    std::cerr << "GOT session" << std::endl;
     if (session) {
-        std::cerr << "HERE 1" << std::endl;
         _db->create_collection(*session, collection_name);
     } else if (arguments.find("encryptedFields") != arguments.end()) {
-        std::cerr << "HERE 2" << std::endl;
         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));
     } else {
-        std::cerr << "HERE 3" << std::endl;
-        //_db->create_collection(collection_name, arguments);
         _db->create_collection(collection_name);
     }
     return empty_document;
@@ -1310,14 +1303,10 @@ operation_runner::operation_runner(database* db,
     : _coll(coll), _db(db), _session0(session0), _session1(session1), _client(client) {}
 
 document::value operation_runner::run(document::view operation) {
-    static int i = 0;
-    std::cout << "\n\ni = " << i++ << "\n\n" << std::endl;
     using namespace bsoncxx::builder::basic;
 
     bsoncxx::document::value empty_document({});
 
-    std::cerr << "OPERATION: " << bsoncxx::to_json(operation) << std::endl;
-
     stdx::string_view key = operation["name"].get_string().value;
     stdx::string_view object;
     if (operation["object"]) {
@@ -1437,7 +1426,6 @@ document::value operation_runner::run(document::view operation) {
         REQUIRE(client[_db->name()].has_collection(collection_name));
         return empty_document;
     } else if (key.compare("createIndex") == 0) {
-        std::cerr << "CREATING INDEX: " << bsoncxx::to_json(operation) << std::endl;
         return _create_index(operation);
     } else if (key.compare("assertIndexNotExists") == 0) {
         client client{uri{}};
@@ -1454,9 +1442,10 @@ document::value operation_runner::run(document::view operation) {
         return empty_document;
     } else if (key.compare("assertIndexExists") == 0) {
         client client{uri{}};
-        auto cursor = client[_db->name()][_coll->name()].list_indexes();
+        auto db = operation["arguments"]["database"].get_string().value;
+        auto collection = operation["arguments"]["collection"].get_string().value;
+        auto cursor = client[db][collection].list_indexes();
 
-        std::cerr << "REQUIRING INDEX ON: " << "'" << _db->name() << "." << _coll->name() << "'" << std::endl;
         REQUIRE(cursor.end() !=
                 std::find_if(cursor.begin(),
                              cursor.end(),