CXX-805 Use options::find::comment()

Author: Tess Avitabile

src/mongocxx/collection.cpp

@@ -212,6 +212,10 @@ cursor collection::find(view_or_value filter, const options::find& options) {
         filter_builder << builder::stream::concatenate(options.hint()->to_document());
     }
 
+    if (options.comment()) {
+        filter_builder << "$comment" << *options.comment();
+    }
+
     filter_bson.init_from_static(filter_builder.view());
 
     const mongoc_read_prefs_t* rp_ptr = NULL;

src/mongocxx/test/collection_mocked.cpp

@@ -342,6 +342,8 @@ TEST_CASE("Collection", "[collection]") {
         auto doc = find_doc.view();
         mongocxx::stdx::optional<bsoncxx::document::view> expected_sort{};
         mongocxx::stdx::optional<bsoncxx::document::view> expected_hint{};
+        mongocxx::stdx::optional<bsoncxx::stdx::string_view> expected_comment{};
+
 
         collection_find->interpose([&](mongoc_collection_t*, mongoc_query_flags_t flags,
                                        uint32_t skip, uint32_t limit, uint32_t batch_size,
@@ -365,6 +367,9 @@ TEST_CASE("Collection", "[collection]") {
                 REQUIRE(query_view["$hint"].get_utf8() ==
                         expected_hint->operator[]("$hint").get_utf8());
             }
+            if (expected_comment) {
+                REQUIRE(query_view["$comment"].get_utf8().value == *expected_comment);
+            }
             REQUIRE(fields == NULL);
             REQUIRE(read_prefs == NULL);
 
@@ -396,6 +401,14 @@ TEST_CASE("Collection", "[collection]") {
             REQUIRE_NOTHROW(mongo_coll.find(doc, opts));
         }
 
+        SECTION("Succeeds with comment") {
+            expected_comment = "my comment";
+            options::find opts;
+            opts.comment(*expected_comment);
+
+            REQUIRE_NOTHROW(mongo_coll.find(doc, opts));
+        }
+
         REQUIRE(collection_find_called);
     }