From e5dc1bf7c6a0f699bb36e7f45783791a4f979d76 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Sat, 5 Oct 2024 11:06:09 -0500 Subject: [PATCH] CXX-3084 Rename ASSERT to EXPECT in API examples --- .../access_array/algorithms.cpp | 8 +- .../bson_documents/access_array/basic.cpp | 12 +- .../bson_documents/access_array/find.cpp | 10 +- .../bson_documents/access_array/iterators.cpp | 20 +-- .../bson_documents/access_array/subscript.cpp | 8 +- .../bson_documents/access_doc/algorithms.cpp | 8 +- .../bson_documents/access_doc/basic.cpp | 12 +- .../bson_documents/access_doc/find.cpp | 10 +- .../bson_documents/access_doc/iterators.cpp | 20 +-- .../bson_documents/access_doc/subscript.cpp | 8 +- .../create_array/builder_append.cpp | 6 +- .../create_array/builder_basic.cpp | 6 +- .../create_array/builder_bson_type.cpp | 12 +- .../create_array/builder_bson_value.cpp | 12 +- .../create_array/builder_concatenate.cpp | 2 +- .../create_array/builder_make_document.cpp | 6 +- .../create_array/builder_raw_value.cpp | 4 +- .../create_array/builder_raw_view.cpp | 4 +- .../create_array/builder_reset.cpp | 8 +- .../create_array/builder_sub_array.cpp | 8 +- .../create_array/builder_sub_array_append.cpp | 6 +- .../create_array/builder_sub_document.cpp | 2 +- .../builder_sub_document_append.cpp | 6 +- .../create_array/builder_value_type.cpp | 12 +- .../create_array/json_basic.cpp | 6 +- .../create_array/json_extended.cpp | 6 +- .../create_array/json_sub_array.cpp | 4 +- .../create_array/json_sub_document.cpp | 2 +- .../bson_documents/create_array/json_udl.cpp | 2 +- .../create_doc/builder_append.cpp | 6 +- .../create_doc/builder_basic.cpp | 6 +- .../create_doc/builder_bson_type.cpp | 12 +- .../create_doc/builder_bson_value.cpp | 12 +- .../create_doc/builder_concatenate.cpp | 2 +- .../create_doc/builder_make_document.cpp | 6 +- .../create_doc/builder_raw_value.cpp | 2 +- .../create_doc/builder_raw_view.cpp | 2 +- .../create_doc/builder_reset.cpp | 8 +- .../create_doc/builder_sub_array.cpp | 8 +- .../create_doc/builder_sub_array_append.cpp | 6 +- .../create_doc/builder_sub_document.cpp | 2 +- .../builder_sub_document_append.cpp | 6 +- .../create_doc/builder_value_type.cpp | 12 +- .../bson_documents/create_doc/json_basic.cpp | 6 +- .../create_doc/json_extended.cpp | 6 +- .../create_doc/json_sub_array.cpp | 4 +- .../create_doc/json_sub_document.cpp | 2 +- .../bson_documents/create_doc/json_udl.cpp | 2 +- .../bson_documents/elements/arr_multi.cpp | 18 +-- .../bson_documents/elements/arr_single.cpp | 8 +- .../elements/cmp_bson_value.cpp | 8 +- .../bson_documents/elements/cmp_type.cpp | 8 +- .../bson_documents/elements/doc_multi.cpp | 18 +-- .../bson_documents/elements/doc_single.cpp | 8 +- .../examples/bson_documents/json/array.cpp | 8 +- .../examples/bson_documents/json/document.cpp | 8 +- .../bson_documents/values/arr_value.cpp | 10 +- .../bson_documents/values/arr_view.cpp | 14 +-- .../bson_documents/values/bson_type_value.cpp | 16 +-- .../bson_documents/values/bson_type_view.cpp | 16 +-- .../bson_documents/values/doc_value.cpp | 10 +- .../bson_documents/values/doc_view.cpp | 14 +-- .../bson_documents/values/make_value.cpp | 12 +- .../bson_documents/values/value_type.cpp | 16 +-- .../bson_errors/access_arr_iter_end.cpp | 8 +- .../bson_errors/access_arr_iter_invalid.cpp | 4 +- .../bson_errors/access_arr_key_missing.cpp | 4 +- .../bson_errors/access_doc_iter_end.cpp | 8 +- .../bson_errors/access_doc_iter_invalid.cpp | 4 +- .../bson_errors/access_doc_key_missing.cpp | 6 +- .../bson_errors/create_arr_append.cpp | 6 +- .../create_arr_append_sub_array.cpp | 12 +- .../create_arr_append_sub_document.cpp | 12 +- .../create_bson_value_invalid_element.cpp | 4 +- .../create_bson_value_invalid_type.cpp | 4 +- .../bson_errors/create_doc_append.cpp | 6 +- .../create_doc_append_sub_array.cpp | 12 +- .../create_doc_append_sub_document.cpp | 12 +- .../examples/bson_errors/create_json.cpp | 4 +- .../query_bson_value_invalid_type.cpp | 12 +- .../bson_errors/query_element_arr_invalid.cpp | 10 +- .../query_element_arr_invalid_type.cpp | 14 +-- .../bson_errors/query_element_doc_invalid.cpp | 10 +- .../query_element_doc_invalid_type.cpp | 14 +-- .../bson_errors/to_json_invalid_arr.cpp | 4 +- .../bson_errors/to_json_invalid_doc.cpp | 4 +- .../examples/decimal128/basic_usage.cpp | 118 +++++++++--------- .../bsoncxx/examples/decimal128/errors.cpp | 4 +- .../examples/decimal128/from_bytes.cpp | 34 ++--- .../api/bsoncxx/examples/oid/basic_usage.cpp | 32 ++--- examples/api/bsoncxx/examples/oid/errors.cpp | 8 +- .../examples/validation/basic_usage.cpp | 18 +-- .../bsoncxx/examples/validation/validator.cpp | 16 +-- examples/api/runner.cpp | 2 +- examples/macros.hh | 16 +-- 95 files changed, 477 insertions(+), 477 deletions(-) diff --git a/examples/api/bsoncxx/examples/bson_documents/access_array/algorithms.cpp b/examples/api/bsoncxx/examples/bson_documents/access_array/algorithms.cpp index e7d8902b25..a5ece39d31 100644 --- a/examples/api/bsoncxx/examples/bson_documents/access_array/algorithms.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/access_array/algorithms.cpp @@ -28,7 +28,7 @@ namespace { // [Example] // [1, 2.0, "three"] void example(bsoncxx::array::view arr) { - ASSERT(std::distance(arr.begin(), arr.end()) == 3); + EXPECT(std::distance(arr.begin(), arr.end()) == 3); std::vector elements; @@ -37,9 +37,9 @@ void example(bsoncxx::array::view arr) { return e.key().compare("0") == 0 || e.type() == bsoncxx::type::k_string; }); - ASSERT(elements.size() == 2u); - ASSERT(elements[0].key().compare("0") == 0); - ASSERT(elements[1].key().compare("2") == 0); + EXPECT(elements.size() == 2u); + EXPECT(elements[0].key().compare("0") == 0); + EXPECT(elements[1].key().compare("2") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/access_array/basic.cpp b/examples/api/bsoncxx/examples/bson_documents/access_array/basic.cpp index b1d4c873a2..1e4157bbfa 100644 --- a/examples/api/bsoncxx/examples/bson_documents/access_array/basic.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/access_array/basic.cpp @@ -28,16 +28,16 @@ void example(bsoncxx::array::view arr) { for (bsoncxx::array::element e : arr) { switch (e.type()) { case bsoncxx::type::k_int32: - ASSERT(e.key().compare("0") == 0); - ASSERT(e.get_int32().value == 1); + EXPECT(e.key().compare("0") == 0); + EXPECT(e.get_int32().value == 1); break; case bsoncxx::type::k_double: - ASSERT(e.key().compare("1") == 0); - ASSERT(e.get_double().value == 2.0); + EXPECT(e.key().compare("1") == 0); + EXPECT(e.get_double().value == 2.0); break; case bsoncxx::type::k_string: - ASSERT(e.key().compare("2") == 0); - ASSERT(e.get_string().value.compare("three") == 0); + EXPECT(e.key().compare("2") == 0); + EXPECT(e.get_string().value.compare("three") == 0); break; } } diff --git a/examples/api/bsoncxx/examples/bson_documents/access_array/find.cpp b/examples/api/bsoncxx/examples/bson_documents/access_array/find.cpp index ccfad22af9..789d9d0eb3 100644 --- a/examples/api/bsoncxx/examples/bson_documents/access_array/find.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/access_array/find.cpp @@ -24,17 +24,17 @@ namespace { // [Example] // [1, 2] void example(bsoncxx::array::view arr) { - ASSERT(arr.find(0) == arr.begin()); + EXPECT(arr.find(0) == arr.begin()); { auto iter = arr.find(1); - ASSERT(iter != arr.end()); - ASSERT(iter->key().compare("1") == 0); - ASSERT(iter->get_int32().value == 2); + EXPECT(iter != arr.end()); + EXPECT(iter->key().compare("1") == 0); + EXPECT(iter->get_int32().value == 2); } - ASSERT(arr.find(2) == arr.end()); + EXPECT(arr.find(2) == arr.end()); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/access_array/iterators.cpp b/examples/api/bsoncxx/examples/bson_documents/access_array/iterators.cpp index f4cae8f739..24d468459c 100644 --- a/examples/api/bsoncxx/examples/bson_documents/access_array/iterators.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/access_array/iterators.cpp @@ -25,32 +25,32 @@ namespace { // [Example] // [1, 2] void example(bsoncxx::array::view arr) { - ASSERT(arr.begin() != arr.end()); + EXPECT(arr.begin() != arr.end()); auto iter = arr.begin(); - ASSERT(iter == arr.begin()); + EXPECT(iter == arr.begin()); { bsoncxx::array::element e = *iter; - ASSERT(e.key().compare("0") == 0); - ASSERT(e.get_int32().value == 1); + EXPECT(e.key().compare("0") == 0); + EXPECT(e.get_int32().value == 1); } ++iter; - ASSERT(iter->key().compare("1") == 0); - ASSERT(iter->get_int32().value == 2); + EXPECT(iter->key().compare("1") == 0); + EXPECT(iter->get_int32().value == 2); { auto iter_copy = iter++; - ASSERT(iter_copy != iter); - ASSERT(iter_copy->key().compare("1") == 0); - ASSERT(iter_copy->get_int32() == 2); + EXPECT(iter_copy != iter); + EXPECT(iter_copy->key().compare("1") == 0); + EXPECT(iter_copy->get_int32() == 2); } - ASSERT(iter == arr.end()); + EXPECT(iter == arr.end()); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/access_array/subscript.cpp b/examples/api/bsoncxx/examples/bson_documents/access_array/subscript.cpp index bc7c5d2119..69a163acc7 100644 --- a/examples/api/bsoncxx/examples/bson_documents/access_array/subscript.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/access_array/subscript.cpp @@ -25,16 +25,16 @@ namespace { // [Example] // [1, 2] void example(bsoncxx::array::view arr) { - ASSERT(arr[0]); + EXPECT(arr[0]); { bsoncxx::array::element e = arr[1]; - ASSERT(e.key().compare("1") == 0); - ASSERT(e.get_int32().value == 2); + EXPECT(e.key().compare("1") == 0); + EXPECT(e.get_int32().value == 2); } - ASSERT(!arr[2]); // Invalid element. + EXPECT(!arr[2]); // Invalid element. } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/access_doc/algorithms.cpp b/examples/api/bsoncxx/examples/bson_documents/access_doc/algorithms.cpp index f24e42a98d..5f141321b3 100644 --- a/examples/api/bsoncxx/examples/bson_documents/access_doc/algorithms.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/access_doc/algorithms.cpp @@ -29,7 +29,7 @@ namespace { // [Example] // {"a": 1, "b": 2.0, "c": "three"} void example(bsoncxx::document::view doc) { - ASSERT(std::distance(doc.begin(), doc.end()) == 3); + EXPECT(std::distance(doc.begin(), doc.end()) == 3); std::vector elements; @@ -40,9 +40,9 @@ void example(bsoncxx::document::view doc) { return e.key().compare("a") == 0 || e.type() == bsoncxx::type::k_string; }); - ASSERT(elements.size() == 2u); - ASSERT(elements[0].key().compare("a") == 0); - ASSERT(elements[1].key().compare("c") == 0); + EXPECT(elements.size() == 2u); + EXPECT(elements[0].key().compare("a") == 0); + EXPECT(elements[1].key().compare("c") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/access_doc/basic.cpp b/examples/api/bsoncxx/examples/bson_documents/access_doc/basic.cpp index 95aa123912..7af279e40b 100644 --- a/examples/api/bsoncxx/examples/bson_documents/access_doc/basic.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/access_doc/basic.cpp @@ -28,16 +28,16 @@ void example(bsoncxx::document::view doc) { for (bsoncxx::document::element e : doc) { switch (e.type()) { case bsoncxx::type::k_int32: - ASSERT(e.key().compare("a") == 0); - ASSERT(e.get_int32().value == 1); + EXPECT(e.key().compare("a") == 0); + EXPECT(e.get_int32().value == 1); break; case bsoncxx::type::k_double: - ASSERT(e.key().compare("b") == 0); - ASSERT(e.get_double().value == 2.0); + EXPECT(e.key().compare("b") == 0); + EXPECT(e.get_double().value == 2.0); break; case bsoncxx::type::k_string: - ASSERT(e.key().compare("c") == 0); - ASSERT(e.get_string().value.compare("three") == 0); + EXPECT(e.key().compare("c") == 0); + EXPECT(e.get_string().value.compare("three") == 0); break; } } diff --git a/examples/api/bsoncxx/examples/bson_documents/access_doc/find.cpp b/examples/api/bsoncxx/examples/bson_documents/access_doc/find.cpp index 03afcb3af7..ec224c2437 100644 --- a/examples/api/bsoncxx/examples/bson_documents/access_doc/find.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/access_doc/find.cpp @@ -24,17 +24,17 @@ namespace { // [Example] // {"a": 1, "b": 2} void example(bsoncxx::document::view doc) { - ASSERT(doc.find("a") == doc.begin()); + EXPECT(doc.find("a") == doc.begin()); { auto iter = doc.find("b"); - ASSERT(iter != doc.end()); - ASSERT(iter->key().compare("b") == 0); - ASSERT(iter->get_int32().value == 2); + EXPECT(iter != doc.end()); + EXPECT(iter->key().compare("b") == 0); + EXPECT(iter->get_int32().value == 2); } - ASSERT(doc.find("x") == doc.end()); + EXPECT(doc.find("x") == doc.end()); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/access_doc/iterators.cpp b/examples/api/bsoncxx/examples/bson_documents/access_doc/iterators.cpp index ff8cbcc5ce..d496c2e5f8 100644 --- a/examples/api/bsoncxx/examples/bson_documents/access_doc/iterators.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/access_doc/iterators.cpp @@ -25,32 +25,32 @@ namespace { // [Example] // {"a": 1, "b": 2} void example(bsoncxx::document::view doc) { - ASSERT(doc.begin() != doc.end()); + EXPECT(doc.begin() != doc.end()); auto iter = doc.begin(); - ASSERT(iter == doc.begin()); + EXPECT(iter == doc.begin()); { bsoncxx::document::element e = *iter; - ASSERT(e.key().compare("a") == 0); - ASSERT(e.get_int32().value == 1); + EXPECT(e.key().compare("a") == 0); + EXPECT(e.get_int32().value == 1); } ++iter; - ASSERT(iter->key().compare("b") == 0); - ASSERT(iter->get_int32().value == 2); + EXPECT(iter->key().compare("b") == 0); + EXPECT(iter->get_int32().value == 2); { auto iter_copy = iter++; - ASSERT(iter_copy != iter); - ASSERT(iter_copy->key().compare("b") == 0); - ASSERT(iter_copy->get_int32() == 2); + EXPECT(iter_copy != iter); + EXPECT(iter_copy->key().compare("b") == 0); + EXPECT(iter_copy->get_int32() == 2); } - ASSERT(iter == doc.end()); + EXPECT(iter == doc.end()); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/access_doc/subscript.cpp b/examples/api/bsoncxx/examples/bson_documents/access_doc/subscript.cpp index 398558dd52..e039fad21b 100644 --- a/examples/api/bsoncxx/examples/bson_documents/access_doc/subscript.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/access_doc/subscript.cpp @@ -25,16 +25,16 @@ namespace { // [Example] // {"a": 1, "b": 2} void example(bsoncxx::document::view doc) { - ASSERT(doc["a"]); + EXPECT(doc["a"]); { bsoncxx::document::element e = doc["b"]; - ASSERT(e.key().compare("b") == 0); - ASSERT(e.get_int32().value == 2); + EXPECT(e.key().compare("b") == 0); + EXPECT(e.get_int32().value == 2); } - ASSERT(!doc["c"]); // Invalid element. + EXPECT(!doc["c"]); // Invalid element. } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_append.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_append.cpp index ad56ae3c5a..0c99ba6f2e 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_append.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_append.cpp @@ -33,9 +33,9 @@ void example() { bsoncxx::array::value owner = builder.extract(); bsoncxx::array::view arr = owner.view(); - ASSERT(arr[0].get_int32().value == 1); - ASSERT(arr[1].get_double().value == 2.0); - ASSERT(arr[2].get_string().value.compare("three") == 0); + EXPECT(arr[0].get_int32().value == 1); + EXPECT(arr[1].get_double().value == 2.0); + EXPECT(arr[2].get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_basic.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_basic.cpp index 53ffd5facf..06d135c97f 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_basic.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_basic.cpp @@ -31,9 +31,9 @@ void example() { bsoncxx::array::value owner = builder.extract(); bsoncxx::array::view arr = owner.view(); - ASSERT(arr[0].get_int32().value == 1); - ASSERT(arr[1].get_double().value == 2.0); - ASSERT(arr[2].get_string().value.compare("three") == 0); + EXPECT(arr[0].get_int32().value == 1); + EXPECT(arr[1].get_double().value == 2.0); + EXPECT(arr[2].get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_bson_type.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_bson_type.cpp index f15f76e480..87ebd4a738 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_bson_type.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_bson_type.cpp @@ -31,13 +31,13 @@ void example() { bsoncxx::array::value owner = bsoncxx::builder::basic::make_array(a, b, c); bsoncxx::array::view arr = owner.view(); - ASSERT(arr[0].type() == bsoncxx::type::k_int32); - ASSERT(arr[1].type() == bsoncxx::type::k_double); - ASSERT(arr[2].type() == bsoncxx::type::k_string); + EXPECT(arr[0].type() == bsoncxx::type::k_int32); + EXPECT(arr[1].type() == bsoncxx::type::k_double); + EXPECT(arr[2].type() == bsoncxx::type::k_string); - ASSERT(arr[0].get_int32().value == 1); - ASSERT(arr[1].get_double().value == 2.0); - ASSERT(arr[2].get_string().value.compare("three") == 0); + EXPECT(arr[0].get_int32().value == 1); + EXPECT(arr[1].get_double().value == 2.0); + EXPECT(arr[2].get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_bson_value.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_bson_value.cpp index 4a66341d01..6e44b20a98 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_bson_value.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_bson_value.cpp @@ -40,13 +40,13 @@ void example() { bsoncxx::builder::basic::make_array(values[0], values[1], values[2]); bsoncxx::array::view arr = owner.view(); - ASSERT(arr[0].type() == bsoncxx::type::k_int32); - ASSERT(arr[1].type() == bsoncxx::type::k_double); - ASSERT(arr[2].type() == bsoncxx::type::k_string); + EXPECT(arr[0].type() == bsoncxx::type::k_int32); + EXPECT(arr[1].type() == bsoncxx::type::k_double); + EXPECT(arr[2].type() == bsoncxx::type::k_string); - ASSERT(arr[0].get_value() == values[0]); - ASSERT(arr[1].get_value() == values[1]); - ASSERT(arr[2].get_value() == values[2]); + EXPECT(arr[0].get_value() == values[0]); + EXPECT(arr[1].get_value() == values[1]); + EXPECT(arr[2].get_value() == values[2]); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_concatenate.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_concatenate.cpp index 13df983a5b..31129c34f7 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_concatenate.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_concatenate.cpp @@ -32,7 +32,7 @@ void example(bsoncxx::array::view a, bsoncxx::array::view b) { builder.append(bsoncxx::builder::concatenate(a)); builder.append(bsoncxx::builder::concatenate(b)); - ASSERT(builder.view() == bsoncxx::builder::basic::make_array(1, 2)); + EXPECT(builder.view() == bsoncxx::builder::basic::make_array(1, 2)); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_make_document.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_make_document.cpp index b36ade8f15..e5f35c213a 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_make_document.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_make_document.cpp @@ -30,9 +30,9 @@ void example() { bsoncxx::builder::basic::make_array(std::int32_t{1}, 2.0, "three"); bsoncxx::array::view arr = owner.view(); - ASSERT(arr[0].get_int32().value == 1); - ASSERT(arr[1].get_double().value == 2.0); - ASSERT(arr[2].get_string().value.compare("three") == 0); + EXPECT(arr[0].get_int32().value == 1); + EXPECT(arr[1].get_double().value == 2.0); + EXPECT(arr[2].get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_raw_value.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_raw_value.cpp index c7289389a0..5ebd3f1551 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_raw_value.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_raw_value.cpp @@ -39,8 +39,8 @@ void example(const std::uint8_t* data, std::size_t length) { bsoncxx::array::value owner{raw, length, deleter}; bsoncxx::array::view arr = owner.view(); - ASSERT(arr[0].get_int32().value == 1); - ASSERT(arr[1].get_int32().value == 2); + EXPECT(arr[0].get_int32().value == 1); + EXPECT(arr[1].get_int32().value == 2); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_raw_view.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_raw_view.cpp index 822d4eab35..7c598dfdb5 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_raw_view.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_raw_view.cpp @@ -30,8 +30,8 @@ namespace { void example(const std::uint8_t* data, std::size_t length) { bsoncxx::array::view arr{data, length}; - ASSERT(arr[0].get_int32().value == 1); - ASSERT(arr[1].get_int32().value == 2); + EXPECT(arr[0].get_int32().value == 1); + EXPECT(arr[1].get_int32().value == 2); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_reset.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_reset.cpp index 20938e8b48..c26fbfd215 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_reset.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_reset.cpp @@ -39,11 +39,11 @@ void example() { bsoncxx::array::view a = a_owner.view(); bsoncxx::array::view b = b_owner.view(); - ASSERT(a[0].type() == bsoncxx::type::k_int32); - ASSERT(b[0].type() == bsoncxx::type::k_int64); + EXPECT(a[0].type() == bsoncxx::type::k_int32); + EXPECT(b[0].type() == bsoncxx::type::k_int64); - ASSERT(a[0].get_int32().value == 1); - ASSERT(b[0].get_int64().value == 2); + EXPECT(a[0].get_int32().value == 1); + EXPECT(b[0].get_int64().value == 2); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_array.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_array.cpp index 84698f7cdd..fa35e05b2f 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_array.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_array.cpp @@ -30,11 +30,11 @@ void example() { bsoncxx::array::value owner = make_array(make_array(std::int32_t{1}, std::int64_t{2})); bsoncxx::array::view v = owner.view()[0].get_array().value; - ASSERT(v[0].type() == bsoncxx::type::k_int32); - ASSERT(v[1].type() == bsoncxx::type::k_int64); + EXPECT(v[0].type() == bsoncxx::type::k_int32); + EXPECT(v[1].type() == bsoncxx::type::k_int64); - ASSERT(v[0].get_int32().value == 1); - ASSERT(v[1].get_int64().value == 2); + EXPECT(v[0].get_int32().value == 1); + EXPECT(v[1].get_int64().value == 2); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_array_append.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_array_append.cpp index aea40ad1ea..ceb0e90794 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_array_append.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_array_append.cpp @@ -35,9 +35,9 @@ void example() { }); bsoncxx::array::view v = owner.view()[0].get_array().value; - ASSERT(v[0].get_int32().value == 1); - ASSERT(v[1].get_int32().value == 2); - ASSERT(v[2].get_int32().value == 3); + EXPECT(v[0].get_int32().value == 1); + EXPECT(v[1].get_int32().value == 2); + EXPECT(v[2].get_int32().value == 3); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_document.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_document.cpp index 412eab43dd..e18b4b2f44 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_document.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_document.cpp @@ -31,7 +31,7 @@ void example() { bsoncxx::array::value owner = make_array(make_document(kvp("key", "value"))); bsoncxx::document::view v = owner.view()[0].get_document().value; - ASSERT(v["key"].get_string().value.compare("value") == 0); + EXPECT(v["key"].get_string().value.compare("value") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_document_append.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_document_append.cpp index 77f158152f..92f5f18b11 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_document_append.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_sub_document_append.cpp @@ -40,9 +40,9 @@ void example() { }); bsoncxx::document::view v = owner.view()[0].get_document().value; - ASSERT(v["a"].get_int32().value == 1); - ASSERT(v["b"].get_int32().value == 2); - ASSERT(v["c"].get_int32().value == 3); + EXPECT(v["a"].get_int32().value == 1); + EXPECT(v["b"].get_int32().value == 2); + EXPECT(v["c"].get_int32().value == 3); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_value_type.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_value_type.cpp index d577099be6..9c9281deff 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/builder_value_type.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/builder_value_type.cpp @@ -30,13 +30,13 @@ void example() { bsoncxx::builder::basic::make_array(std::int32_t{1}, 2.0, "three"); bsoncxx::array::view arr = owner.view(); - ASSERT(arr[0].type() == bsoncxx::type::k_int32); - ASSERT(arr[1].type() == bsoncxx::type::k_double); - ASSERT(arr[2].type() == bsoncxx::type::k_string); + EXPECT(arr[0].type() == bsoncxx::type::k_int32); + EXPECT(arr[1].type() == bsoncxx::type::k_double); + EXPECT(arr[2].type() == bsoncxx::type::k_string); - ASSERT(arr[0].get_int32().value == 1); - ASSERT(arr[1].get_double().value == 2.0); - ASSERT(arr[2].get_string().value.compare("three") == 0); + EXPECT(arr[0].get_int32().value == 1); + EXPECT(arr[1].get_double().value == 2.0); + EXPECT(arr[2].get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/json_basic.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/json_basic.cpp index b52cdfb24b..302cea0e25 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/json_basic.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/json_basic.cpp @@ -29,9 +29,9 @@ void example() { )"); bsoncxx::document::view doc = owner.view(); - ASSERT(doc["0"].get_int32().value == 1); - ASSERT(doc["1"].get_double().value == 2.0); - ASSERT(doc["2"].get_string().value.compare("three") == 0); + EXPECT(doc["0"].get_int32().value == 1); + EXPECT(doc["1"].get_double().value == 2.0); + EXPECT(doc["2"].get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/json_extended.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/json_extended.cpp index 1cbb9cddb0..cb268eda18 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/json_extended.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/json_extended.cpp @@ -33,9 +33,9 @@ void example() { )"); bsoncxx::document::view doc = owner.view(); - ASSERT(doc["0"].get_int32().value == 1); - ASSERT(doc["1"].get_int64().value == 2); - ASSERT(doc["2"].get_double().value == 3.0); + EXPECT(doc["0"].get_int32().value == 1); + EXPECT(doc["1"].get_int64().value == 2); + EXPECT(doc["2"].get_double().value == 3.0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/json_sub_array.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/json_sub_array.cpp index ab5f41743a..3664ab4411 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/json_sub_array.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/json_sub_array.cpp @@ -31,8 +31,8 @@ void example() { )"); bsoncxx::array::view sub = owner.view()["0"].get_array().value; - ASSERT(sub[0].get_int32().value == 1); - ASSERT(sub[1].get_int32().value == 2); + EXPECT(sub[0].get_int32().value == 1); + EXPECT(sub[1].get_int32().value == 2); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/json_sub_document.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/json_sub_document.cpp index 4efcb1c9fd..3157fd9c45 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/json_sub_document.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/json_sub_document.cpp @@ -31,7 +31,7 @@ void example() { )"); bsoncxx::document::view v = owner.view()["0"].get_document().value; - ASSERT(v["key"].get_string().value.compare("value") == 0); + EXPECT(v["key"].get_string().value.compare("value") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_array/json_udl.cpp b/examples/api/bsoncxx/examples/bson_documents/create_array/json_udl.cpp index 544674d790..969ca70634 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_array/json_udl.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_array/json_udl.cpp @@ -27,7 +27,7 @@ void example() { bsoncxx::document::value a = R"([1, 2])"_bson; bsoncxx::document::value b = bsoncxx::from_json(R"([1, 2])"); - ASSERT(a == b); + EXPECT(a == b); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_append.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_append.cpp index fc7aea9fc2..d9f594547e 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_append.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_append.cpp @@ -36,9 +36,9 @@ void example() { bsoncxx::document::value owner = builder.extract(); bsoncxx::document::view doc = owner.view(); - ASSERT(doc["a"].get_int32().value == 1); - ASSERT(doc["b"].get_double().value == 2.0); - ASSERT(doc["c"].get_string().value.compare("three") == 0); + EXPECT(doc["a"].get_int32().value == 1); + EXPECT(doc["b"].get_double().value == 2.0); + EXPECT(doc["c"].get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_basic.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_basic.cpp index c523665e4d..0b9b9523fa 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_basic.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_basic.cpp @@ -34,9 +34,9 @@ void example() { bsoncxx::document::value owner = builder.extract(); bsoncxx::document::view doc = owner.view(); - ASSERT(doc["a"].get_int32().value == 1); - ASSERT(doc["b"].get_double().value == 2.0); - ASSERT(doc["c"].get_string().value.compare("three") == 0); + EXPECT(doc["a"].get_int32().value == 1); + EXPECT(doc["b"].get_double().value == 2.0); + EXPECT(doc["c"].get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_bson_type.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_bson_type.cpp index 3beeaa2eeb..7d7d88868e 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_bson_type.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_bson_type.cpp @@ -37,13 +37,13 @@ void example() { bsoncxx::builder::basic::make_document(kvp("a", a), kvp("b", b), kvp("c", c)); bsoncxx::document::view doc = owner.view(); - ASSERT(doc["a"].type() == bsoncxx::type::k_int32); - ASSERT(doc["b"].type() == bsoncxx::type::k_double); - ASSERT(doc["c"].type() == bsoncxx::type::k_string); + EXPECT(doc["a"].type() == bsoncxx::type::k_int32); + EXPECT(doc["b"].type() == bsoncxx::type::k_double); + EXPECT(doc["c"].type() == bsoncxx::type::k_string); - ASSERT(doc["a"].get_int32() == a); - ASSERT(doc["b"].get_double() == b); - ASSERT(doc["c"].get_string() == c); + EXPECT(doc["a"].get_int32() == a); + EXPECT(doc["b"].get_double() == b); + EXPECT(doc["c"].get_string() == c); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_bson_value.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_bson_value.cpp index eec1f9a05e..5434ca352c 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_bson_value.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_bson_value.cpp @@ -40,13 +40,13 @@ void example() { kvp("a", values[0]), kvp("b", values[1]), kvp("c", values[2])); bsoncxx::document::view doc = owner.view(); - ASSERT(doc["a"].type() == bsoncxx::type::k_int32); - ASSERT(doc["b"].type() == bsoncxx::type::k_double); - ASSERT(doc["c"].type() == bsoncxx::type::k_string); + EXPECT(doc["a"].type() == bsoncxx::type::k_int32); + EXPECT(doc["b"].type() == bsoncxx::type::k_double); + EXPECT(doc["c"].type() == bsoncxx::type::k_string); - ASSERT(doc["a"].get_value() == values[0]); - ASSERT(doc["b"].get_value() == values[1]); - ASSERT(doc["c"].get_value() == values[2]); + EXPECT(doc["a"].get_value() == values[0]); + EXPECT(doc["b"].get_value() == values[1]); + EXPECT(doc["c"].get_value() == values[2]); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_concatenate.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_concatenate.cpp index 0180df59fd..a93da9ea4b 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_concatenate.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_concatenate.cpp @@ -31,7 +31,7 @@ void example(bsoncxx::document::view a, bsoncxx::document::view b) { builder.append(bsoncxx::builder::concatenate(a)); builder.append(bsoncxx::builder::concatenate(b)); - ASSERT(builder.view() == bsoncxx::from_json(R"({"a": 1, "b": 2})")); + EXPECT(builder.view() == bsoncxx::from_json(R"({"a": 1, "b": 2})")); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_make_document.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_make_document.cpp index 36440ddcba..81b69f8453 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_make_document.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_make_document.cpp @@ -33,9 +33,9 @@ void example() { kvp("a", std::int32_t{1}), kvp("b", 2.0), kvp("c", "three")); bsoncxx::document::view doc = owner.view(); - ASSERT(doc["a"].get_int32().value == 1); - ASSERT(doc["b"].get_double().value == 2.0); - ASSERT(doc["c"].get_string().value.compare("three") == 0); + EXPECT(doc["a"].get_int32().value == 1); + EXPECT(doc["b"].get_double().value == 2.0); + EXPECT(doc["c"].get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_raw_value.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_raw_value.cpp index 90d263daa1..5b4c37d9ab 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_raw_value.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_raw_value.cpp @@ -38,7 +38,7 @@ void example(const std::uint8_t* data, std::size_t length) { bsoncxx::document::value owner{raw, length, deleter}; bsoncxx::document::view doc = owner.view(); - ASSERT(doc["key"].get_string().value.compare("value") == 0); + EXPECT(doc["key"].get_string().value.compare("value") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_raw_view.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_raw_view.cpp index 0f45aa72c1..6f2787f706 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_raw_view.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_raw_view.cpp @@ -30,7 +30,7 @@ namespace { void example(const std::uint8_t* data, std::size_t length) { bsoncxx::document::view doc{data, length}; - ASSERT(doc["key"].get_string().value.compare("value") == 0); + EXPECT(doc["key"].get_string().value.compare("value") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_reset.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_reset.cpp index a508694604..575892bbc7 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_reset.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_reset.cpp @@ -42,11 +42,11 @@ void example() { bsoncxx::document::view a = a_owner.view(); bsoncxx::document::view b = b_owner.view(); - ASSERT(a["v"].type() == bsoncxx::type::k_int32); - ASSERT(b["v"].type() == bsoncxx::type::k_int64); + EXPECT(a["v"].type() == bsoncxx::type::k_int32); + EXPECT(b["v"].type() == bsoncxx::type::k_int64); - ASSERT(a["v"].get_int32().value == 1); - ASSERT(b["v"].get_int64().value == 2); + EXPECT(a["v"].get_int32().value == 1); + EXPECT(b["v"].get_int64().value == 2); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_array.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_array.cpp index 94f2ac8639..2750b8d416 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_array.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_array.cpp @@ -36,11 +36,11 @@ void example() { make_document(kvp("v", make_array(std::int32_t{1}, std::int64_t{2}))); bsoncxx::array::view v = owner.view()["v"].get_array().value; - ASSERT(v[0].type() == bsoncxx::type::k_int32); - ASSERT(v[1].type() == bsoncxx::type::k_int64); + EXPECT(v[0].type() == bsoncxx::type::k_int32); + EXPECT(v[1].type() == bsoncxx::type::k_int64); - ASSERT(v[0].get_int32().value == 1); - ASSERT(v[1].get_int64().value == 2); + EXPECT(v[0].get_int32().value == 1); + EXPECT(v[1].get_int64().value == 2); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_array_append.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_array_append.cpp index f5c62e1967..e287d03713 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_array_append.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_array_append.cpp @@ -40,9 +40,9 @@ void example() { })); bsoncxx::array::view v = owner.view()["v"].get_array().value; - ASSERT(v[0].get_int32().value == 1); - ASSERT(v[1].get_int32().value == 2); - ASSERT(v[2].get_int32().value == 3); + EXPECT(v[0].get_int32().value == 1); + EXPECT(v[1].get_int32().value == 2); + EXPECT(v[2].get_int32().value == 3); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_document.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_document.cpp index c5b2da0cec..03230c2e59 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_document.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_document.cpp @@ -31,7 +31,7 @@ void example() { bsoncxx::document::value owner = make_document(kvp("v", make_document(kvp("key", "value")))); bsoncxx::document::view v = owner.view()["v"].get_document().value; - ASSERT(v["key"].get_string().value.compare("value") == 0); + EXPECT(v["key"].get_string().value.compare("value") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_document_append.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_document_append.cpp index 6537488a0b..dd1aafc775 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_document_append.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_sub_document_append.cpp @@ -40,9 +40,9 @@ void example() { })); bsoncxx::document::view v = owner.view()["v"].get_document().value; - ASSERT(v["a"].get_int32().value == 1); - ASSERT(v["b"].get_int32().value == 2); - ASSERT(v["c"].get_int32().value == 3); + EXPECT(v["a"].get_int32().value == 1); + EXPECT(v["b"].get_int32().value == 2); + EXPECT(v["c"].get_int32().value == 3); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_value_type.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_value_type.cpp index 22398aa81a..1c38225698 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_value_type.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/builder_value_type.cpp @@ -33,13 +33,13 @@ void example() { kvp("a", std::int32_t{1}), kvp("b", 2.0), kvp("c", "three")); bsoncxx::document::view doc = owner.view(); - ASSERT(doc["a"].type() == bsoncxx::type::k_int32); - ASSERT(doc["b"].type() == bsoncxx::type::k_double); - ASSERT(doc["c"].type() == bsoncxx::type::k_string); + EXPECT(doc["a"].type() == bsoncxx::type::k_int32); + EXPECT(doc["b"].type() == bsoncxx::type::k_double); + EXPECT(doc["c"].type() == bsoncxx::type::k_string); - ASSERT(doc["a"].get_int32().value == 1); - ASSERT(doc["b"].get_double().value == 2.0); - ASSERT(doc["c"].get_string().value.compare("three") == 0); + EXPECT(doc["a"].get_int32().value == 1); + EXPECT(doc["b"].get_double().value == 2.0); + EXPECT(doc["c"].get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/json_basic.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/json_basic.cpp index c9eccc453e..2e864f21d6 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/json_basic.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/json_basic.cpp @@ -33,9 +33,9 @@ void example() { )"); bsoncxx::document::view doc = owner.view(); - ASSERT(doc["a"].get_int32().value == 1); - ASSERT(doc["b"].get_double().value == 2.0); - ASSERT(doc["c"].get_string().value.compare("three") == 0); + EXPECT(doc["a"].get_int32().value == 1); + EXPECT(doc["b"].get_double().value == 2.0); + EXPECT(doc["c"].get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/json_extended.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/json_extended.cpp index 0cad361a20..3ae281365b 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/json_extended.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/json_extended.cpp @@ -33,9 +33,9 @@ void example() { )"); bsoncxx::document::view doc = owner.view(); - ASSERT(doc["a"].get_int32().value == 1); - ASSERT(doc["b"].get_int64().value == 2); - ASSERT(doc["c"].get_double().value == 3.0); + EXPECT(doc["a"].get_int32().value == 1); + EXPECT(doc["b"].get_int64().value == 2); + EXPECT(doc["c"].get_double().value == 3.0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/json_sub_array.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/json_sub_array.cpp index 07c4e74d24..8474175fea 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/json_sub_array.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/json_sub_array.cpp @@ -31,8 +31,8 @@ void example() { )"); bsoncxx::array::view sub = owner.view()["v"].get_array().value; - ASSERT(sub[0].get_int32().value == 1); - ASSERT(sub[1].get_int32().value == 2); + EXPECT(sub[0].get_int32().value == 1); + EXPECT(sub[1].get_int32().value == 2); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/json_sub_document.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/json_sub_document.cpp index 3296d7c2c0..593709dd54 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/json_sub_document.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/json_sub_document.cpp @@ -31,7 +31,7 @@ void example() { )"); bsoncxx::document::view v = doc["v"].get_document().value; - ASSERT(v["key"].get_string().value.compare("value") == 0); + EXPECT(v["key"].get_string().value.compare("value") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/create_doc/json_udl.cpp b/examples/api/bsoncxx/examples/bson_documents/create_doc/json_udl.cpp index 28753a48fd..1f88bb5c5d 100644 --- a/examples/api/bsoncxx/examples/bson_documents/create_doc/json_udl.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/create_doc/json_udl.cpp @@ -27,7 +27,7 @@ void example() { bsoncxx::document::value a = R"({"key": "value"})"_bson; bsoncxx::document::value b = bsoncxx::from_json(R"({"key": "value"})"); - ASSERT(a == b); + EXPECT(a == b); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/elements/arr_multi.cpp b/examples/api/bsoncxx/examples/bson_documents/elements/arr_multi.cpp index 4a317c495d..03782bd2ed 100644 --- a/examples/api/bsoncxx/examples/bson_documents/elements/arr_multi.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/elements/arr_multi.cpp @@ -26,32 +26,32 @@ namespace { void example(bsoncxx::array::element e) { switch (e.type()) { case bsoncxx::type::k_int32: { - ASSERT(e.key().compare("0") == 0); + EXPECT(e.key().compare("0") == 0); bsoncxx::types::b_int32 v = e.get_int32(); - ASSERT(v.type_id == bsoncxx::type::k_int32); - ASSERT(v.value == 1); + EXPECT(v.type_id == bsoncxx::type::k_int32); + EXPECT(v.value == 1); break; } case bsoncxx::type::k_double: { - ASSERT(e.key().compare("1") == 0); + EXPECT(e.key().compare("1") == 0); bsoncxx::types::b_double v = e.get_double(); - ASSERT(v.type_id == bsoncxx::type::k_double); - ASSERT(v.value == 2.0); + EXPECT(v.type_id == bsoncxx::type::k_double); + EXPECT(v.value == 2.0); break; } case bsoncxx::type::k_string: { - ASSERT(e.key().compare("2") == 0); + EXPECT(e.key().compare("2") == 0); bsoncxx::types::b_string v = e.get_string(); - ASSERT(v.type_id == bsoncxx::type::k_string); - ASSERT(v.value.compare("three") == 0); + EXPECT(v.type_id == bsoncxx::type::k_string); + EXPECT(v.value.compare("three") == 0); break; } diff --git a/examples/api/bsoncxx/examples/bson_documents/elements/arr_single.cpp b/examples/api/bsoncxx/examples/bson_documents/elements/arr_single.cpp index 392d735936..40f43cce61 100644 --- a/examples/api/bsoncxx/examples/bson_documents/elements/arr_single.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/elements/arr_single.cpp @@ -25,14 +25,14 @@ namespace { // [1, 2.0, "three"] void example(bsoncxx::array::element e) { if (e.type() == bsoncxx::type::k_int32) { - ASSERT(e.key().compare("0") == 0); + EXPECT(e.key().compare("0") == 0); bsoncxx::types::b_int32 v = e.get_int32(); - ASSERT(v.type_id == bsoncxx::type::k_int32); - ASSERT(v.value == 1); + EXPECT(v.type_id == bsoncxx::type::k_int32); + EXPECT(v.value == 1); } else { - ASSERT(e.key().compare("0") != 0); + EXPECT(e.key().compare("0") != 0); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/elements/cmp_bson_value.cpp b/examples/api/bsoncxx/examples/bson_documents/elements/cmp_bson_value.cpp index 44c2d9dba6..88996d6ece 100644 --- a/examples/api/bsoncxx/examples/bson_documents/elements/cmp_bson_value.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/elements/cmp_bson_value.cpp @@ -29,18 +29,18 @@ void example(bsoncxx::document::element e) { bsoncxx::types::b_int64 b{2}; if (e.get_value() == a) { - ASSERT(e.key().compare("a") == 0); + EXPECT(e.key().compare("a") == 0); } else if (e.get_value() == b) { - ASSERT(e.key().compare("b") == 0); + EXPECT(e.key().compare("b") == 0); } bsoncxx::types::bson_value::view va{a}; bsoncxx::types::bson_value::view vb{b}; if (e == va) { - ASSERT(e.key().compare("a") == 0); + EXPECT(e.key().compare("a") == 0); } else if (e == vb) { - ASSERT(e.key().compare("b") == 0); + EXPECT(e.key().compare("b") == 0); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/elements/cmp_type.cpp b/examples/api/bsoncxx/examples/bson_documents/elements/cmp_type.cpp index 29c7a0b1ea..8d10f6d75a 100644 --- a/examples/api/bsoncxx/examples/bson_documents/elements/cmp_type.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/elements/cmp_type.cpp @@ -30,11 +30,11 @@ void example(bsoncxx::document::element e) { std::int64_t b{2}; if (e.type() == bsoncxx::type::k_int32) { - ASSERT(e.key().compare("a") == 0); - ASSERT(e.get_int32().value == a); + EXPECT(e.key().compare("a") == 0); + EXPECT(e.get_int32().value == a); } else if (e.type() == bsoncxx::type::k_int64) { - ASSERT(e.key().compare("b") == 0); - ASSERT(e.get_int64().value == b); + EXPECT(e.key().compare("b") == 0); + EXPECT(e.get_int64().value == b); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/elements/doc_multi.cpp b/examples/api/bsoncxx/examples/bson_documents/elements/doc_multi.cpp index fe5c323736..05438236bf 100644 --- a/examples/api/bsoncxx/examples/bson_documents/elements/doc_multi.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/elements/doc_multi.cpp @@ -26,32 +26,32 @@ namespace { void example(bsoncxx::document::element e) { switch (e.type()) { case bsoncxx::type::k_int32: { - ASSERT(e.key().compare("a") == 0); + EXPECT(e.key().compare("a") == 0); bsoncxx::types::b_int32 v = e.get_int32(); - ASSERT(v.type_id == bsoncxx::type::k_int32); - ASSERT(v.value == 1); + EXPECT(v.type_id == bsoncxx::type::k_int32); + EXPECT(v.value == 1); break; } case bsoncxx::type::k_double: { - ASSERT(e.key().compare("b") == 0); + EXPECT(e.key().compare("b") == 0); bsoncxx::types::b_double v = e.get_double(); - ASSERT(v.type_id == bsoncxx::type::k_double); - ASSERT(v.value == 2.0); + EXPECT(v.type_id == bsoncxx::type::k_double); + EXPECT(v.value == 2.0); break; } case bsoncxx::type::k_string: { - ASSERT(e.key().compare("c") == 0); + EXPECT(e.key().compare("c") == 0); bsoncxx::types::b_string v = e.get_string(); - ASSERT(v.type_id == bsoncxx::type::k_string); - ASSERT(v.value.compare("three") == 0); + EXPECT(v.type_id == bsoncxx::type::k_string); + EXPECT(v.value.compare("three") == 0); break; } diff --git a/examples/api/bsoncxx/examples/bson_documents/elements/doc_single.cpp b/examples/api/bsoncxx/examples/bson_documents/elements/doc_single.cpp index c8bf3ac940..eace5e5548 100644 --- a/examples/api/bsoncxx/examples/bson_documents/elements/doc_single.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/elements/doc_single.cpp @@ -25,14 +25,14 @@ namespace { // {"a": 1, "b": 2.0, "c": "three"} void example(bsoncxx::document::element e) { if (e.type() == bsoncxx::type::k_int32) { - ASSERT(e.key().compare("a") == 0); + EXPECT(e.key().compare("a") == 0); bsoncxx::types::b_int32 v = e.get_int32(); - ASSERT(v.type_id == bsoncxx::type::k_int32); - ASSERT(v.value == 1); + EXPECT(v.type_id == bsoncxx::type::k_int32); + EXPECT(v.value == 1); } else { - ASSERT(e.key().compare("a") != 0); + EXPECT(e.key().compare("a") != 0); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/json/array.cpp b/examples/api/bsoncxx/examples/bson_documents/json/array.cpp index f74104ecb4..3bc7ee8ef4 100644 --- a/examples/api/bsoncxx/examples/bson_documents/json/array.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/json/array.cpp @@ -54,7 +54,7 @@ void example() { // } // ] std::string json = bsoncxx::to_json(arr, ExtendedJsonMode::k_canonical); - ASSERT( + EXPECT( json == R"([ { "$numberInt" : "1" }, { "$numberLong" : "2" }, { "$binary" : { "base64" : "dGhyZWU=", "subType" : "00" } } ])"); } @@ -72,7 +72,7 @@ void example() { // } // ] std::string json = bsoncxx::to_json(arr, ExtendedJsonMode::k_relaxed); - ASSERT(json == R"([ 1, 2, { "$binary" : { "base64" : "dGhyZWU=", "subType" : "00" } } ])"); + EXPECT(json == R"([ 1, 2, { "$binary" : { "base64" : "dGhyZWU=", "subType" : "00" } } ])"); } { @@ -86,14 +86,14 @@ void example() { // } // ] std::string json = bsoncxx::to_json(arr); - ASSERT(json == R"([ 1, 2, { "$binary" : "dGhyZWU=", "$type" : "00" } ])"); + EXPECT(json == R"([ 1, 2, { "$binary" : "dGhyZWU=", "$type" : "00" } ])"); } { std::string a = bsoncxx::to_json(arr); std::string b = bsoncxx::to_json(arr, ExtendedJsonMode::k_legacy); - ASSERT(a == b); + EXPECT(a == b); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/json/document.cpp b/examples/api/bsoncxx/examples/bson_documents/json/document.cpp index d7055e6a98..9a3e9a268e 100644 --- a/examples/api/bsoncxx/examples/bson_documents/json/document.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/json/document.cpp @@ -56,7 +56,7 @@ void example() { // } // } std::string json = bsoncxx::to_json(doc, ExtendedJsonMode::k_canonical); - ASSERT( + EXPECT( json == R"({ "a" : { "$numberInt" : "1" }, "b" : { "$numberLong" : "2" }, "c" : { "$binary" : { "base64" : "dGhyZWU=", "subType" : "00" } } })"); } @@ -74,7 +74,7 @@ void example() { // } // } std::string json = bsoncxx::to_json(doc, ExtendedJsonMode::k_relaxed); - ASSERT( + EXPECT( json == R"({ "a" : 1, "b" : 2, "c" : { "$binary" : { "base64" : "dGhyZWU=", "subType" : "00" } } })"); } @@ -90,14 +90,14 @@ void example() { // } // } std::string json = bsoncxx::to_json(doc); - ASSERT(json == R"({ "a" : 1, "b" : 2, "c" : { "$binary" : "dGhyZWU=", "$type" : "00" } })"); + EXPECT(json == R"({ "a" : 1, "b" : 2, "c" : { "$binary" : "dGhyZWU=", "$type" : "00" } })"); } { std::string a = bsoncxx::to_json(doc); std::string b = bsoncxx::to_json(doc, ExtendedJsonMode::k_legacy); - ASSERT(a == b); + EXPECT(a == b); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/values/arr_value.cpp b/examples/api/bsoncxx/examples/bson_documents/values/arr_value.cpp index 979bb557a0..40a3b31925 100644 --- a/examples/api/bsoncxx/examples/bson_documents/values/arr_value.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/values/arr_value.cpp @@ -25,19 +25,19 @@ namespace { void example() { bsoncxx::types::bson_value::value v = nullptr; - ASSERT(v.view().type() == bsoncxx::type::k_null); - ASSERT(v.view().get_null() == bsoncxx::types::b_null{}); + EXPECT(v.view().type() == bsoncxx::type::k_null); + EXPECT(v.view().get_null() == bsoncxx::types::b_null{}); v = bsoncxx::from_json(R"({"v": ["value"]})") // Temporary object. ["v"] .get_owning_value(); // Copy: no dangling. - ASSERT(v.view().type() == bsoncxx::type::k_array); + EXPECT(v.view().type() == bsoncxx::type::k_array); v = v.view().get_array().value[0].get_string(); // Copy: no dangling. - ASSERT(v.view().type() == bsoncxx::type::k_string); - ASSERT(v.view().get_string().value.compare("value") == 0); + EXPECT(v.view().type() == bsoncxx::type::k_string); + EXPECT(v.view().get_string().value.compare("value") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/values/arr_view.cpp b/examples/api/bsoncxx/examples/bson_documents/values/arr_view.cpp index f5600d3ae5..c314e6cfac 100644 --- a/examples/api/bsoncxx/examples/bson_documents/values/arr_view.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/values/arr_view.cpp @@ -26,20 +26,20 @@ namespace { // [1, 2.0, "three"] void example(bsoncxx::array::element e) { bsoncxx::types::bson_value::view v = e.get_value(); - ASSERT(v.type() == e.type()); + EXPECT(v.type() == e.type()); switch (v.type()) { case bsoncxx::type::k_int32: - ASSERT(e.key().compare("0") == 0); - ASSERT(v.get_int32() == e.get_int32()); + EXPECT(e.key().compare("0") == 0); + EXPECT(v.get_int32() == e.get_int32()); break; case bsoncxx::type::k_double: - ASSERT(e.key().compare("1") == 0); - ASSERT(v.get_double() == e.get_double()); + EXPECT(e.key().compare("1") == 0); + EXPECT(v.get_double() == e.get_double()); break; case bsoncxx::type::k_string: - ASSERT(e.key().compare("2") == 0); - ASSERT(v.get_string() == e.get_string()); + EXPECT(e.key().compare("2") == 0); + EXPECT(v.get_string() == e.get_string()); break; } } diff --git a/examples/api/bsoncxx/examples/bson_documents/values/bson_type_value.cpp b/examples/api/bsoncxx/examples/bson_documents/values/bson_type_value.cpp index 51ce072c61..4edfd3c93b 100644 --- a/examples/api/bsoncxx/examples/bson_documents/values/bson_type_value.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/values/bson_type_value.cpp @@ -24,20 +24,20 @@ namespace { void example() { bsoncxx::types::bson_value::value v = nullptr; - ASSERT(v.view().type() == bsoncxx::type::k_null); - ASSERT(v.view().get_null() == bsoncxx::types::b_null{}); + EXPECT(v.view().type() == bsoncxx::type::k_null); + EXPECT(v.view().get_null() == bsoncxx::types::b_null{}); v = bsoncxx::types::b_int32{1}; - ASSERT(v.view().type() == bsoncxx::type::k_int32); - ASSERT(v.view().get_int32().value == 1); + EXPECT(v.view().type() == bsoncxx::type::k_int32); + EXPECT(v.view().get_int32().value == 1); v = bsoncxx::types::b_double{2.0}; - ASSERT(v.view().type() == bsoncxx::type::k_double); - ASSERT(v.view().get_double().value == 2.0); + EXPECT(v.view().type() == bsoncxx::type::k_double); + EXPECT(v.view().get_double().value == 2.0); v = bsoncxx::types::b_string{"three"}; - ASSERT(v.view().type() == bsoncxx::type::k_string); - ASSERT(v.view().get_string().value.compare("three") == 0); + EXPECT(v.view().type() == bsoncxx::type::k_string); + EXPECT(v.view().get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/values/bson_type_view.cpp b/examples/api/bsoncxx/examples/bson_documents/values/bson_type_view.cpp index 1d66ac44ee..6d89c4a866 100644 --- a/examples/api/bsoncxx/examples/bson_documents/values/bson_type_view.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/values/bson_type_view.cpp @@ -29,20 +29,20 @@ void example() { bsoncxx::types::b_string v2{"three"}; view_type v; - ASSERT(v.type() == bsoncxx::type::k_null); - ASSERT(v.get_null() == bsoncxx::types::b_null{}); + EXPECT(v.type() == bsoncxx::type::k_null); + EXPECT(v.get_null() == bsoncxx::types::b_null{}); v = view_type(v0); - ASSERT(v.type() == v0.type_id); - ASSERT(v.get_int32() == v0); + EXPECT(v.type() == v0.type_id); + EXPECT(v.get_int32() == v0); v = view_type(v1); - ASSERT(v.type() == v1.type_id); - ASSERT(v.get_double() == v1); + EXPECT(v.type() == v1.type_id); + EXPECT(v.get_double() == v1); v = view_type(v2); - ASSERT(v.type() == v2.type_id); - ASSERT(v.get_string() == v2); + EXPECT(v.type() == v2.type_id); + EXPECT(v.get_string() == v2); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/values/doc_value.cpp b/examples/api/bsoncxx/examples/bson_documents/values/doc_value.cpp index ead44f8128..2e686d7ce1 100644 --- a/examples/api/bsoncxx/examples/bson_documents/values/doc_value.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/values/doc_value.cpp @@ -25,19 +25,19 @@ namespace { void example() { bsoncxx::types::bson_value::value v = nullptr; - ASSERT(v.view().type() == bsoncxx::type::k_null); - ASSERT(v.view().get_null() == bsoncxx::types::b_null{}); + EXPECT(v.view().type() == bsoncxx::type::k_null); + EXPECT(v.view().get_null() == bsoncxx::types::b_null{}); v = bsoncxx::from_json(R"({"v": {"key": "value"}})") // Temporary object. ["v"] .get_owning_value(); // Copy: no dangling. - ASSERT(v.view().type() == bsoncxx::type::k_document); + EXPECT(v.view().type() == bsoncxx::type::k_document); v = v.view().get_document().value["key"].get_string(); // Copy: no dangling. - ASSERT(v.view().type() == bsoncxx::type::k_string); - ASSERT(v.view().get_string().value.compare("value") == 0); + EXPECT(v.view().type() == bsoncxx::type::k_string); + EXPECT(v.view().get_string().value.compare("value") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/values/doc_view.cpp b/examples/api/bsoncxx/examples/bson_documents/values/doc_view.cpp index 362c233f38..3efeecf094 100644 --- a/examples/api/bsoncxx/examples/bson_documents/values/doc_view.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/values/doc_view.cpp @@ -26,20 +26,20 @@ namespace { // {"a": 1, "b": 2.0, "c": "three"} void example(bsoncxx::document::element e) { bsoncxx::types::bson_value::view v = e.get_value(); - ASSERT(v.type() == e.type()); + EXPECT(v.type() == e.type()); switch (v.type()) { case bsoncxx::type::k_int32: - ASSERT(e.key().compare("a") == 0); - ASSERT(v.get_int32() == e.get_int32()); + EXPECT(e.key().compare("a") == 0); + EXPECT(v.get_int32() == e.get_int32()); break; case bsoncxx::type::k_double: - ASSERT(e.key().compare("b") == 0); - ASSERT(v.get_double() == e.get_double()); + EXPECT(e.key().compare("b") == 0); + EXPECT(v.get_double() == e.get_double()); break; case bsoncxx::type::k_string: - ASSERT(e.key().compare("c") == 0); - ASSERT(v.get_string() == e.get_string()); + EXPECT(e.key().compare("c") == 0); + EXPECT(v.get_string() == e.get_string()); break; } } diff --git a/examples/api/bsoncxx/examples/bson_documents/values/make_value.cpp b/examples/api/bsoncxx/examples/bson_documents/values/make_value.cpp index f2837d5e42..993e975814 100644 --- a/examples/api/bsoncxx/examples/bson_documents/values/make_value.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/values/make_value.cpp @@ -33,24 +33,24 @@ void example() { value_type owner = bsoncxx::types::bson_value::make_value(1); view_type v = owner.view(); - ASSERT(v.type() == bsoncxx::type::k_int32); - ASSERT(v.get_int32().value == 1); + EXPECT(v.type() == bsoncxx::type::k_int32); + EXPECT(v.get_int32().value == 1); } { value_type owner = bsoncxx::types::bson_value::make_value(bsoncxx::types::b_int64{2}); view_type v = owner.view(); - ASSERT(v.type() == bsoncxx::type::k_int64); - ASSERT(v.get_int64().value == 2); + EXPECT(v.type() == bsoncxx::type::k_int64); + EXPECT(v.get_int64().value == 2); } { value_type owner = bsoncxx::types::bson_value::make_value(std::string("three")); view_type v = owner.view(); - ASSERT(v.type() == bsoncxx::type::k_string); - ASSERT(v.get_string().value.compare("three") == 0); + EXPECT(v.type() == bsoncxx::type::k_string); + EXPECT(v.get_string().value.compare("three") == 0); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_documents/values/value_type.cpp b/examples/api/bsoncxx/examples/bson_documents/values/value_type.cpp index 34f17aaa18..4e18d186e0 100644 --- a/examples/api/bsoncxx/examples/bson_documents/values/value_type.cpp +++ b/examples/api/bsoncxx/examples/bson_documents/values/value_type.cpp @@ -26,23 +26,23 @@ namespace { void example() { bsoncxx::types::bson_value::value v = nullptr; - ASSERT(v.view().type() == bsoncxx::type::k_null); - ASSERT(v.view().get_null() == bsoncxx::types::b_null{}); + EXPECT(v.view().type() == bsoncxx::type::k_null); + EXPECT(v.view().get_null() == bsoncxx::types::b_null{}); v = std::int32_t{1}; - ASSERT(v.view().type() == bsoncxx::type::k_int32); - ASSERT(v.view().get_int32().value == 1); + EXPECT(v.view().type() == bsoncxx::type::k_int32); + EXPECT(v.view().get_int32().value == 1); v = 2.0; - ASSERT(v.view().type() == bsoncxx::type::k_double); - ASSERT(v.view().get_double().value == 2.0); + EXPECT(v.view().type() == bsoncxx::type::k_double); + EXPECT(v.view().get_double().value == 2.0); v = std::string("three"); - ASSERT(v.view().type() == bsoncxx::type::k_string); - ASSERT(v.view().get_string().value.compare("three") == 0); + EXPECT(v.view().type() == bsoncxx::type::k_string); + EXPECT(v.view().get_string().value.compare("three") == 0); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/access_arr_iter_end.cpp b/examples/api/bsoncxx/examples/bson_errors/access_arr_iter_end.cpp index ccfa4a9a70..0e53d4b530 100644 --- a/examples/api/bsoncxx/examples/bson_errors/access_arr_iter_end.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/access_arr_iter_end.cpp @@ -25,7 +25,7 @@ namespace { // [Example] // [1, 2, 3] void example(bsoncxx::array::view arr) { - ASSERT(arr.begin() != arr.end()); + EXPECT(arr.begin() != arr.end()); auto iter = arr.begin(); // 1 @@ -33,15 +33,15 @@ void example(bsoncxx::array::view arr) { ++iter; // 3 ++iter; // End iterator. - ASSERT(iter == arr.end()); + EXPECT(iter == arr.end()); ++iter; // DO NOT DO THIS - ASSERT(iter == arr.end()); // Incrementing an end iterator results in an end iterator. + EXPECT(iter == arr.end()); // Incrementing an end iterator results in an end iterator. bsoncxx::array::element e = *iter; // DO NOT DO THIS - ASSERT(!e); // An end iterator returns an invalid element. + EXPECT(!e); // An end iterator returns an invalid element. } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/access_arr_iter_invalid.cpp b/examples/api/bsoncxx/examples/bson_errors/access_arr_iter_invalid.cpp index 92d5ef7f24..3ec1731122 100644 --- a/examples/api/bsoncxx/examples/bson_errors/access_arr_iter_invalid.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/access_arr_iter_invalid.cpp @@ -34,11 +34,11 @@ void example() { auto iter = arr.begin(); - ASSERT(iter == arr.end()); // An invalid BSON document returns an end iterator. + EXPECT(iter == arr.end()); // An invalid BSON document returns an end iterator. bsoncxx::array::element e = *iter; // DO NOT DO THIS - ASSERT(!e); // An end iterator returns an invalid element. + EXPECT(!e); // An end iterator returns an invalid element. } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/access_arr_key_missing.cpp b/examples/api/bsoncxx/examples/bson_errors/access_arr_key_missing.cpp index 10508f49b7..f63a1cdc03 100644 --- a/examples/api/bsoncxx/examples/bson_errors/access_arr_key_missing.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/access_arr_key_missing.cpp @@ -27,11 +27,11 @@ namespace { // [Example] // [1, 2, 3] void example(bsoncxx::array::view arr) { - ASSERT(std::distance(arr.begin(), arr.end()) == 3); + EXPECT(std::distance(arr.begin(), arr.end()) == 3); bsoncxx::array::element e = arr[3]; - ASSERT(!e); // A missing element is represented as an invalid element. + EXPECT(!e); // A missing element is represented as an invalid element. } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/access_doc_iter_end.cpp b/examples/api/bsoncxx/examples/bson_errors/access_doc_iter_end.cpp index 27f235a654..0bb78f20d8 100644 --- a/examples/api/bsoncxx/examples/bson_errors/access_doc_iter_end.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/access_doc_iter_end.cpp @@ -25,22 +25,22 @@ namespace { // [Example] // {"a": 1, "b": 2} void example(bsoncxx::document::view doc) { - ASSERT(doc.begin() != doc.end()); + EXPECT(doc.begin() != doc.end()); auto iter = doc.begin(); // "a": 1 ++iter; // "b": 2 ++iter; // End iterator. - ASSERT(iter == doc.end()); + EXPECT(iter == doc.end()); ++iter; // DO NOT DO THIS - ASSERT(iter == doc.end()); // Incrementing an end iterator results in an end iterator. + EXPECT(iter == doc.end()); // Incrementing an end iterator results in an end iterator. bsoncxx::document::element e = *iter; // DO NOT DO THIS - ASSERT(!e); // An end iterator returns an invalid element. + EXPECT(!e); // An end iterator returns an invalid element. } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/access_doc_iter_invalid.cpp b/examples/api/bsoncxx/examples/bson_errors/access_doc_iter_invalid.cpp index 5079e48ee1..11fc5713af 100644 --- a/examples/api/bsoncxx/examples/bson_errors/access_doc_iter_invalid.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/access_doc_iter_invalid.cpp @@ -35,11 +35,11 @@ void example() { auto iter = doc.begin(); - ASSERT(iter == doc.end()); // An invalid BSON document returns an end iterator. + EXPECT(iter == doc.end()); // An invalid BSON document returns an end iterator. bsoncxx::document::element e = *iter; // DO NOT DO THIS - ASSERT(!e); // An end iterator returns an invalid element. + EXPECT(!e); // An end iterator returns an invalid element. } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/access_doc_key_missing.cpp b/examples/api/bsoncxx/examples/bson_errors/access_doc_key_missing.cpp index e7a3db6268..7d55ba0377 100644 --- a/examples/api/bsoncxx/examples/bson_errors/access_doc_key_missing.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/access_doc_key_missing.cpp @@ -25,12 +25,12 @@ namespace { // [Example] // {"a": 1, "b": 2} void example(bsoncxx::document::view doc) { - ASSERT(doc["a"]); - ASSERT(doc["b"]); + EXPECT(doc["a"]); + EXPECT(doc["b"]); bsoncxx::document::element e = doc["c"]; - ASSERT(!e); // A missing element is represented as an invalid element. + EXPECT(!e); // A missing element is represented as an invalid element. } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/create_arr_append.cpp b/examples/api/bsoncxx/examples/bson_errors/create_arr_append.cpp index 48e2be60f6..1213d56243 100644 --- a/examples/api/bsoncxx/examples/bson_errors/create_arr_append.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/create_arr_append.cpp @@ -40,12 +40,12 @@ void example(bsoncxx::stdx::string_view big_string) { try { builder.append(big_string); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_cannot_append_string); + EXPECT(ex.code() == bsoncxx::error_code::k_cannot_append_string); } - ASSERT(builder.view() == original.view()); + EXPECT(builder.view() == original.view()); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/create_arr_append_sub_array.cpp b/examples/api/bsoncxx/examples/bson_errors/create_arr_append_sub_array.cpp index 7f8c019919..bd696bad9d 100644 --- a/examples/api/bsoncxx/examples/bson_errors/create_arr_append_sub_array.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/create_arr_append_sub_array.cpp @@ -42,28 +42,28 @@ void example(bsoncxx::stdx::string_view big_string) { arr.append(big_string); // Throws. }); - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_cannot_append_string); + EXPECT(ex.code() == bsoncxx::error_code::k_cannot_append_string); } // Builder is in an erroneous state. try { builder.view(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_unmatched_key_in_builder); + EXPECT(ex.code() == bsoncxx::error_code::k_unmatched_key_in_builder); } // Reset builder to a usable state. builder.clear(); - ASSERT(builder.view().empty()); + EXPECT(builder.view().empty()); // Restore the original state prior to the append failure. builder.append(bsoncxx::builder::concatenate_array{original.view()}); - ASSERT(builder.view() == original.view()); + EXPECT(builder.view() == original.view()); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/create_arr_append_sub_document.cpp b/examples/api/bsoncxx/examples/bson_errors/create_arr_append_sub_document.cpp index acc2ddb3d1..51a4e1af6d 100644 --- a/examples/api/bsoncxx/examples/bson_errors/create_arr_append_sub_document.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/create_arr_append_sub_document.cpp @@ -45,28 +45,28 @@ void example(bsoncxx::stdx::string_view big_string) { doc.append(kvp("too big", big_string)); // Throws. }); - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_cannot_append_string); + EXPECT(ex.code() == bsoncxx::error_code::k_cannot_append_string); } // Builder is in an erroneous state. try { builder.view(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_unmatched_key_in_builder); + EXPECT(ex.code() == bsoncxx::error_code::k_unmatched_key_in_builder); } // Reset builder to a usable state. builder.clear(); - ASSERT(builder.view().empty()); + EXPECT(builder.view().empty()); // Restore the original state prior to the append failure. builder.append(bsoncxx::builder::concatenate_array{original.view()}); - ASSERT(builder.view() == original.view()); + EXPECT(builder.view() == original.view()); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/create_bson_value_invalid_element.cpp b/examples/api/bsoncxx/examples/bson_errors/create_bson_value_invalid_element.cpp index b47eac9c3a..df9d5fdead 100644 --- a/examples/api/bsoncxx/examples/bson_errors/create_bson_value_invalid_element.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/create_bson_value_invalid_element.cpp @@ -28,9 +28,9 @@ void example() { bsoncxx::document::element e; bsoncxx::types::bson_value::view v = e.get_value(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_unset_element); + EXPECT(ex.code() == bsoncxx::error_code::k_unset_element); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/create_bson_value_invalid_type.cpp b/examples/api/bsoncxx/examples/bson_errors/create_bson_value_invalid_type.cpp index c02b75331d..70439777d6 100644 --- a/examples/api/bsoncxx/examples/bson_errors/create_bson_value_invalid_type.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/create_bson_value_invalid_type.cpp @@ -27,9 +27,9 @@ void example() { try { bsoncxx::types::bson_value::value value{bsoncxx::type::k_null}; // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_invalid_bson_type_id); + EXPECT(ex.code() == bsoncxx::error_code::k_invalid_bson_type_id); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/create_doc_append.cpp b/examples/api/bsoncxx/examples/bson_errors/create_doc_append.cpp index cd97ea327b..b4b760ec35 100644 --- a/examples/api/bsoncxx/examples/bson_errors/create_doc_append.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/create_doc_append.cpp @@ -43,12 +43,12 @@ void example(bsoncxx::stdx::string_view big_string) { try { builder.append(kvp("too big", big_string)); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_cannot_append_string); + EXPECT(ex.code() == bsoncxx::error_code::k_cannot_append_string); } - ASSERT(builder.view() == original.view()); + EXPECT(builder.view() == original.view()); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/create_doc_append_sub_array.cpp b/examples/api/bsoncxx/examples/bson_errors/create_doc_append_sub_array.cpp index 8e5ea16e21..0393a93ceb 100644 --- a/examples/api/bsoncxx/examples/bson_errors/create_doc_append_sub_array.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/create_doc_append_sub_array.cpp @@ -47,28 +47,28 @@ void example(bsoncxx::stdx::string_view big_string) { arr.append(big_string); // Throws. })); - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_cannot_append_string); + EXPECT(ex.code() == bsoncxx::error_code::k_cannot_append_string); } // Builder is in an erroneous state. try { builder.view(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_unmatched_key_in_builder); + EXPECT(ex.code() == bsoncxx::error_code::k_unmatched_key_in_builder); } // Reset builder to a usable state. builder.clear(); - ASSERT(builder.view().empty()); + EXPECT(builder.view().empty()); // Restore the original state prior to the append failure. builder.append(bsoncxx::builder::concatenate_doc{original.view()}); - ASSERT(builder.view() == original.view()); + EXPECT(builder.view() == original.view()); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/create_doc_append_sub_document.cpp b/examples/api/bsoncxx/examples/bson_errors/create_doc_append_sub_document.cpp index e45ebb5cd0..6a3ce423d1 100644 --- a/examples/api/bsoncxx/examples/bson_errors/create_doc_append_sub_document.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/create_doc_append_sub_document.cpp @@ -46,28 +46,28 @@ void example(bsoncxx::stdx::string_view big_string) { doc.append(kvp("too big", big_string)); // Throws. })); - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_cannot_append_string); + EXPECT(ex.code() == bsoncxx::error_code::k_cannot_append_string); } // Builder is in an erroneous state. try { builder.view(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_unmatched_key_in_builder); + EXPECT(ex.code() == bsoncxx::error_code::k_unmatched_key_in_builder); } // Reset builder to a usable state. builder.clear(); - ASSERT(builder.view().empty()); + EXPECT(builder.view().empty()); // Restore the original state prior to the append failure. builder.append(bsoncxx::builder::concatenate_doc{original.view()}); - ASSERT(builder.view() == original.view()); + EXPECT(builder.view() == original.view()); } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/create_json.cpp b/examples/api/bsoncxx/examples/bson_errors/create_json.cpp index 3621351f5e..a9d3df4f63 100644 --- a/examples/api/bsoncxx/examples/bson_errors/create_json.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/create_json.cpp @@ -26,9 +26,9 @@ void example() { try { const auto doc = bsoncxx::from_json(R"(invalid json)"); - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_json_parse_failure); + EXPECT(ex.code() == bsoncxx::error_code::k_json_parse_failure); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/query_bson_value_invalid_type.cpp b/examples/api/bsoncxx/examples/bson_errors/query_bson_value_invalid_type.cpp index b89f67d7ab..5e2a491c55 100644 --- a/examples/api/bsoncxx/examples/bson_errors/query_bson_value_invalid_type.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/query_bson_value_invalid_type.cpp @@ -25,23 +25,23 @@ namespace { // [Example] void example() { bsoncxx::types::bson_value::view v; - ASSERT(v.type() == bsoncxx::type::k_null); - ASSERT(v.get_null() == bsoncxx::types::b_null{}); + EXPECT(v.type() == bsoncxx::type::k_null); + EXPECT(v.get_null() == bsoncxx::types::b_null{}); try { bsoncxx::types::b_int32 i = v.get_int32(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_need_element_type_k_int32); + EXPECT(ex.code() == bsoncxx::error_code::k_need_element_type_k_int32); } try { bsoncxx::types::b_int64 i = v.get_int64(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_need_element_type_k_int64); + EXPECT(ex.code() == bsoncxx::error_code::k_need_element_type_k_int64); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/query_element_arr_invalid.cpp b/examples/api/bsoncxx/examples/bson_errors/query_element_arr_invalid.cpp index a1dd6a6af0..8b2df5e6f1 100644 --- a/examples/api/bsoncxx/examples/bson_errors/query_element_arr_invalid.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/query_element_arr_invalid.cpp @@ -35,22 +35,22 @@ void example() { bsoncxx::array::element e = arr[0]; - ASSERT(!e); // An invalid BSON array returns an invalid element. + EXPECT(!e); // An invalid BSON array returns an invalid element. try { bsoncxx::stdx::string_view key = e.key(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_unset_element); + EXPECT(ex.code() == bsoncxx::error_code::k_unset_element); } try { bsoncxx::type type = e.type(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_unset_element); + EXPECT(ex.code() == bsoncxx::error_code::k_unset_element); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/query_element_arr_invalid_type.cpp b/examples/api/bsoncxx/examples/bson_errors/query_element_arr_invalid_type.cpp index 7ec31ef9a1..db802cd32d 100644 --- a/examples/api/bsoncxx/examples/bson_errors/query_element_arr_invalid_type.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/query_element_arr_invalid_type.cpp @@ -26,24 +26,24 @@ namespace { // [Example] // [1] void example(bsoncxx::array::element e) { - ASSERT(e.key().compare("0") == 0); - ASSERT(e.type() == bsoncxx::type::k_int32); - ASSERT(e.get_int32().value == 1); + EXPECT(e.key().compare("0") == 0); + EXPECT(e.type() == bsoncxx::type::k_int32); + EXPECT(e.get_int32().value == 1); try { bsoncxx::types::b_double d = e.get_double(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_need_element_type_k_double); + EXPECT(ex.code() == bsoncxx::error_code::k_need_element_type_k_double); } try { bsoncxx::types::b_string str = e.get_string(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_need_element_type_k_string); + EXPECT(ex.code() == bsoncxx::error_code::k_need_element_type_k_string); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/query_element_doc_invalid.cpp b/examples/api/bsoncxx/examples/bson_errors/query_element_doc_invalid.cpp index 987e607833..b54804a220 100644 --- a/examples/api/bsoncxx/examples/bson_errors/query_element_doc_invalid.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/query_element_doc_invalid.cpp @@ -38,22 +38,22 @@ void example() { bsoncxx::document::element e = doc["x"]; - ASSERT(!e); // An invalid BSON document returns an invalid element. + EXPECT(!e); // An invalid BSON document returns an invalid element. try { bsoncxx::stdx::string_view key = e.key(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_unset_element); + EXPECT(ex.code() == bsoncxx::error_code::k_unset_element); } try { bsoncxx::type type = e.type(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_unset_element); + EXPECT(ex.code() == bsoncxx::error_code::k_unset_element); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/query_element_doc_invalid_type.cpp b/examples/api/bsoncxx/examples/bson_errors/query_element_doc_invalid_type.cpp index 58b8abd72e..3f7fe409fc 100644 --- a/examples/api/bsoncxx/examples/bson_errors/query_element_doc_invalid_type.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/query_element_doc_invalid_type.cpp @@ -26,24 +26,24 @@ namespace { // [Example] // {"x": 1} void example(bsoncxx::document::element e) { - ASSERT(e.key().compare("x") == 0); - ASSERT(e.type() == bsoncxx::type::k_int32); - ASSERT(e.get_int32().value == 1); + EXPECT(e.key().compare("x") == 0); + EXPECT(e.type() == bsoncxx::type::k_int32); + EXPECT(e.get_int32().value == 1); try { bsoncxx::types::b_double d = e.get_double(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_need_element_type_k_double); + EXPECT(ex.code() == bsoncxx::error_code::k_need_element_type_k_double); } try { bsoncxx::types::b_string str = e.get_string(); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_need_element_type_k_string); + EXPECT(ex.code() == bsoncxx::error_code::k_need_element_type_k_string); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/to_json_invalid_arr.cpp b/examples/api/bsoncxx/examples/bson_errors/to_json_invalid_arr.cpp index afc36e1fd4..9325c7f785 100644 --- a/examples/api/bsoncxx/examples/bson_errors/to_json_invalid_arr.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/to_json_invalid_arr.cpp @@ -40,9 +40,9 @@ void example() { try { std::string json = bsoncxx::to_json(doc); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_failed_converting_bson_to_json); + EXPECT(ex.code() == bsoncxx::error_code::k_failed_converting_bson_to_json); } } // [Example] diff --git a/examples/api/bsoncxx/examples/bson_errors/to_json_invalid_doc.cpp b/examples/api/bsoncxx/examples/bson_errors/to_json_invalid_doc.cpp index 85eee021a0..6d9b8466ed 100644 --- a/examples/api/bsoncxx/examples/bson_errors/to_json_invalid_doc.cpp +++ b/examples/api/bsoncxx/examples/bson_errors/to_json_invalid_doc.cpp @@ -40,9 +40,9 @@ void example() { try { std::string json = bsoncxx::to_json(doc); // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_failed_converting_bson_to_json); + EXPECT(ex.code() == bsoncxx::error_code::k_failed_converting_bson_to_json); } } // [Example] diff --git a/examples/api/bsoncxx/examples/decimal128/basic_usage.cpp b/examples/api/bsoncxx/examples/decimal128/basic_usage.cpp index db2ae6c899..1e70994988 100644 --- a/examples/api/bsoncxx/examples/decimal128/basic_usage.cpp +++ b/examples/api/bsoncxx/examples/decimal128/basic_usage.cpp @@ -26,72 +26,72 @@ void example() { using d128 = bsoncxx::decimal128; // For brevity. // Default ctor. - ASSERT(d128{}.to_string() == "0E-6176"); + EXPECT(d128{}.to_string() == "0E-6176"); - ASSERT(d128{"0"}.to_string() == "0"); - ASSERT(d128{"12"}.to_string() == "12"); - ASSERT(d128{"-76"}.to_string() == "-76"); - ASSERT(d128{"12.70"}.to_string() == "12.70"); - ASSERT(d128{"+0.003"}.to_string() == "0.003"); - ASSERT(d128{"017."}.to_string() == "17"); - ASSERT(d128{".5"}.to_string() == "0.5"); - ASSERT(d128{"4E+9"}.to_string() == "4E+9"); - ASSERT(d128{"0.73e-7"}.to_string() == "7.3E-8"); - ASSERT(d128{"Inf"}.to_string() == "Infinity"); - ASSERT(d128{"-infinity"}.to_string() == "-Infinity"); - ASSERT(d128{"NaN"}.to_string() == "NaN"); + EXPECT(d128{"0"}.to_string() == "0"); + EXPECT(d128{"12"}.to_string() == "12"); + EXPECT(d128{"-76"}.to_string() == "-76"); + EXPECT(d128{"12.70"}.to_string() == "12.70"); + EXPECT(d128{"+0.003"}.to_string() == "0.003"); + EXPECT(d128{"017."}.to_string() == "17"); + EXPECT(d128{".5"}.to_string() == "0.5"); + EXPECT(d128{"4E+9"}.to_string() == "4E+9"); + EXPECT(d128{"0.73e-7"}.to_string() == "7.3E-8"); + EXPECT(d128{"Inf"}.to_string() == "Infinity"); + EXPECT(d128{"-infinity"}.to_string() == "-Infinity"); + EXPECT(d128{"NaN"}.to_string() == "NaN"); // "NaN8275" is not a supported string representation. - ASSERT(d128{"123"}.to_string() == "123"); - ASSERT(d128{"-123"}.to_string() == "-123"); - ASSERT(d128{"1.23E+3"}.to_string() == "1.23E+3"); - ASSERT(d128{"1.23E+5"}.to_string() == "1.23E+5"); - ASSERT(d128{"12.3"}.to_string() == "12.3"); - ASSERT(d128{"0.00123"}.to_string() == "0.00123"); - ASSERT(d128{"1.23E-8"}.to_string() == "1.23E-8"); - ASSERT(d128{"-1.23E-10"}.to_string() == "-1.23E-10"); - ASSERT(d128{"0"}.to_string() == "0"); - ASSERT(d128{"0.00"}.to_string() == "0.00"); - ASSERT(d128{"0E+2"}.to_string() == "0E+2"); - ASSERT(d128{"-0"}.to_string() == "-0"); - ASSERT(d128{"0.000005"}.to_string() == "0.000005"); - ASSERT(d128{"0.0000050"}.to_string() == "0.0000050"); - ASSERT(d128{"5E-7"}.to_string() == "5E-7"); - ASSERT(d128{"Infinity"}.to_string() == "Infinity"); - ASSERT(d128{"-Infinity"}.to_string() == "-Infinity"); - ASSERT(d128{"NaN"}.to_string() == "NaN"); + EXPECT(d128{"123"}.to_string() == "123"); + EXPECT(d128{"-123"}.to_string() == "-123"); + EXPECT(d128{"1.23E+3"}.to_string() == "1.23E+3"); + EXPECT(d128{"1.23E+5"}.to_string() == "1.23E+5"); + EXPECT(d128{"12.3"}.to_string() == "12.3"); + EXPECT(d128{"0.00123"}.to_string() == "0.00123"); + EXPECT(d128{"1.23E-8"}.to_string() == "1.23E-8"); + EXPECT(d128{"-1.23E-10"}.to_string() == "-1.23E-10"); + EXPECT(d128{"0"}.to_string() == "0"); + EXPECT(d128{"0.00"}.to_string() == "0.00"); + EXPECT(d128{"0E+2"}.to_string() == "0E+2"); + EXPECT(d128{"-0"}.to_string() == "-0"); + EXPECT(d128{"0.000005"}.to_string() == "0.000005"); + EXPECT(d128{"0.0000050"}.to_string() == "0.0000050"); + EXPECT(d128{"5E-7"}.to_string() == "5E-7"); + EXPECT(d128{"Infinity"}.to_string() == "Infinity"); + EXPECT(d128{"-Infinity"}.to_string() == "-Infinity"); + EXPECT(d128{"NaN"}.to_string() == "NaN"); // "NaN123" is not a supported string representation. // "-sNaN" is not a supported string representation. - ASSERT(d128{"1.23E+3"}.to_string() == "1.23E+3"); - ASSERT(d128{"123E+3"}.to_string() == "1.23E+5"); - ASSERT(d128{"12.3E-9"}.to_string() == "1.23E-8"); - ASSERT(d128{"-123E-12"}.to_string() == "-1.23E-10"); - ASSERT(d128{"700E-9"}.to_string() == "7.00E-7"); - ASSERT(d128{"70"}.to_string() == "70"); - ASSERT(d128{"0.00E+3"}.to_string() == "0E+1"); + EXPECT(d128{"1.23E+3"}.to_string() == "1.23E+3"); + EXPECT(d128{"123E+3"}.to_string() == "1.23E+5"); + EXPECT(d128{"12.3E-9"}.to_string() == "1.23E-8"); + EXPECT(d128{"-123E-12"}.to_string() == "-1.23E-10"); + EXPECT(d128{"700E-9"}.to_string() == "7.00E-7"); + EXPECT(d128{"70"}.to_string() == "70"); + EXPECT(d128{"0.00E+3"}.to_string() == "0E+1"); - ASSERT(d128{"0"}.to_string() == "0"); - ASSERT(d128{"0.00"}.to_string() == "0.00"); - ASSERT(d128{"123"}.to_string() == "123"); - ASSERT(d128{"-123"}.to_string() == "-123"); - ASSERT(d128{"1.23E3"}.to_string() == "1.23E+3"); - ASSERT(d128{"1.23E+3"}.to_string() == "1.23E+3"); - ASSERT(d128{"12.3E+7"}.to_string() == "1.23E+8"); - ASSERT(d128{"12.0"}.to_string() == "12.0"); - ASSERT(d128{"12.3"}.to_string() == "12.3"); - ASSERT(d128{"0.00123"}.to_string() == "0.00123"); - ASSERT(d128{"-1.23E-12"}.to_string() == "-1.23E-12"); - ASSERT(d128{"1234.5E-4"}.to_string() == "0.12345"); - ASSERT(d128{"-0"}.to_string() == "-0"); - ASSERT(d128{"-0.00"}.to_string() == "-0.00"); - ASSERT(d128{"0E+7"}.to_string() == "0E+7"); - ASSERT(d128{"-0E-7"}.to_string() == "-0E-7"); - ASSERT(d128{"inf"}.to_string() == "Infinity"); - ASSERT(d128{"+inFiniTy"}.to_string() == "Infinity"); - ASSERT(d128{"-Infinity"}.to_string() == "-Infinity"); - ASSERT(d128{"NaN"}.to_string() == "NaN"); - ASSERT(d128{"-NAN"}.to_string() == "NaN"); + EXPECT(d128{"0"}.to_string() == "0"); + EXPECT(d128{"0.00"}.to_string() == "0.00"); + EXPECT(d128{"123"}.to_string() == "123"); + EXPECT(d128{"-123"}.to_string() == "-123"); + EXPECT(d128{"1.23E3"}.to_string() == "1.23E+3"); + EXPECT(d128{"1.23E+3"}.to_string() == "1.23E+3"); + EXPECT(d128{"12.3E+7"}.to_string() == "1.23E+8"); + EXPECT(d128{"12.0"}.to_string() == "12.0"); + EXPECT(d128{"12.3"}.to_string() == "12.3"); + EXPECT(d128{"0.00123"}.to_string() == "0.00123"); + EXPECT(d128{"-1.23E-12"}.to_string() == "-1.23E-12"); + EXPECT(d128{"1234.5E-4"}.to_string() == "0.12345"); + EXPECT(d128{"-0"}.to_string() == "-0"); + EXPECT(d128{"-0.00"}.to_string() == "-0.00"); + EXPECT(d128{"0E+7"}.to_string() == "0E+7"); + EXPECT(d128{"-0E-7"}.to_string() == "-0E-7"); + EXPECT(d128{"inf"}.to_string() == "Infinity"); + EXPECT(d128{"+inFiniTy"}.to_string() == "Infinity"); + EXPECT(d128{"-Infinity"}.to_string() == "-Infinity"); + EXPECT(d128{"NaN"}.to_string() == "NaN"); + EXPECT(d128{"-NAN"}.to_string() == "NaN"); // "SNaN" is not a supported string representation. // "Fred" is not a supported string representation. } diff --git a/examples/api/bsoncxx/examples/decimal128/errors.cpp b/examples/api/bsoncxx/examples/decimal128/errors.cpp index da6c1f24e0..c852a93f93 100644 --- a/examples/api/bsoncxx/examples/decimal128/errors.cpp +++ b/examples/api/bsoncxx/examples/decimal128/errors.cpp @@ -26,9 +26,9 @@ void example() { try { bsoncxx::decimal128 d{"invalid"}; // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_invalid_decimal128); + EXPECT(ex.code() == bsoncxx::error_code::k_invalid_decimal128); } } // [Example] diff --git a/examples/api/bsoncxx/examples/decimal128/from_bytes.cpp b/examples/api/bsoncxx/examples/decimal128/from_bytes.cpp index 86f1ec0999..d29b46d5d1 100644 --- a/examples/api/bsoncxx/examples/decimal128/from_bytes.cpp +++ b/examples/api/bsoncxx/examples/decimal128/from_bytes.cpp @@ -26,55 +26,55 @@ void example() { using d128 = bsoncxx::decimal128; // For brevity. // Default ctor. - ASSERT((d128{0u, 0u}) == d128{}); + EXPECT((d128{0u, 0u}) == d128{}); // [0,0,0] - ASSERT((d128{0x3040000000000000, 0x0000000000000000}) == d128{"0"}); + EXPECT((d128{0x3040000000000000, 0x0000000000000000}) == d128{"0"}); // [1,0,0] - ASSERT((d128{0xb040000000000000, 0x0000000000000000}) == d128{"-0"}); + EXPECT((d128{0xb040000000000000, 0x0000000000000000}) == d128{"-0"}); // [0,0,1] - ASSERT((d128{0x3040000000000000, 0x0000000000000000}) == d128{"00E0"}); + EXPECT((d128{0x3040000000000000, 0x0000000000000000}) == d128{"00E0"}); // [0,0,-1] - ASSERT((d128{0x303e000000000000, 0x0000000000000000}) == d128{"0.0E0"}); + EXPECT((d128{0x303e000000000000, 0x0000000000000000}) == d128{"0.0E0"}); // [0,123,0] - ASSERT((d128{0x3040000000000000, 0x000000000000007b}) == d128{"123"}); + EXPECT((d128{0x3040000000000000, 0x000000000000007b}) == d128{"123"}); // [1,123,0] - ASSERT((d128{0xb040000000000000, 0x000000000000007b}) == d128{"-123"}); + EXPECT((d128{0xb040000000000000, 0x000000000000007b}) == d128{"-123"}); // [0,123,1] - ASSERT((d128{0x3042000000000000, 0x000000000000007b}) == d128{"1.23E3"}); + EXPECT((d128{0x3042000000000000, 0x000000000000007b}) == d128{"1.23E3"}); // [1,123,1] - ASSERT((d128{0xb042000000000000, 0x000000000000007b}) == d128{"-1.23E3"}); + EXPECT((d128{0xb042000000000000, 0x000000000000007b}) == d128{"-1.23E3"}); // [0,123,-1] - ASSERT((d128{0x303e000000000000, 0x000000000000007b}) == d128{"12.3"}); + EXPECT((d128{0x303e000000000000, 0x000000000000007b}) == d128{"12.3"}); // [1,123,-1] - ASSERT((d128{0xb03e000000000000, 0x000000000000007b}) == d128{"-12.3"}); + EXPECT((d128{0xb03e000000000000, 0x000000000000007b}) == d128{"-12.3"}); // [0,inf] - ASSERT((d128{0x7800000000000000, 0x0000000000000000}) == d128{"Infinity"}); + EXPECT((d128{0x7800000000000000, 0x0000000000000000}) == d128{"Infinity"}); // [1,inf] - ASSERT((d128{0xf800000000000000, 0x0000000000000000}) == d128{"-Infinity"}); + EXPECT((d128{0xf800000000000000, 0x0000000000000000}) == d128{"-Infinity"}); // [0,qNaN] - ASSERT((d128{0x7c00000000000000, 0x0000000000000000}) == d128{"NaN"}); + EXPECT((d128{0x7c00000000000000, 0x0000000000000000}) == d128{"NaN"}); // [1,qNaN]: Negative NaN is string-represented as NaN. - ASSERT((d128{0xfc00000000000000, 0x0000000000000000}).to_string() == "NaN"); + EXPECT((d128{0xfc00000000000000, 0x0000000000000000}).to_string() == "NaN"); // [0,sNaN]: Signaling NaN is string-represented as NaN. - ASSERT((d128{0x7e00000000000000, 0x0000000000000000}).to_string() == "NaN"); + EXPECT((d128{0x7e00000000000000, 0x0000000000000000}).to_string() == "NaN"); // [1,sNaN]: Negative Signaling NaN is string-represented as NaN. - ASSERT((d128{0x7e00000000000000, 0x0000000000000000}).to_string() == "NaN"); + EXPECT((d128{0x7e00000000000000, 0x0000000000000000}).to_string() == "NaN"); } // [Example] diff --git a/examples/api/bsoncxx/examples/oid/basic_usage.cpp b/examples/api/bsoncxx/examples/oid/basic_usage.cpp index 6599104d4c..b58847b891 100644 --- a/examples/api/bsoncxx/examples/oid/basic_usage.cpp +++ b/examples/api/bsoncxx/examples/oid/basic_usage.cpp @@ -29,7 +29,7 @@ void example() { bsoncxx::oid a; bsoncxx::oid b; - ASSERT(a != b); // Random and unique per process. + EXPECT(a != b); // Random and unique per process. } { @@ -40,17 +40,17 @@ void example() { { std::time_t time = oid.get_time_t(); char str[sizeof("YYYY-MM-DD HH:MM:SS")]; - ASSERT(std::strftime(str, sizeof(str), "%F %T", std::gmtime(&time)) == + EXPECT(std::strftime(str, sizeof(str), "%F %T", std::gmtime(&time)) == sizeof(str) - 1u); - ASSERT(std::string(str) == "1970-01-01 00:00:00"); + EXPECT(std::string(str) == "1970-01-01 00:00:00"); } - ASSERT(oid.bytes() != bytes); // Seperate storage. - ASSERT(oid.size() == bsoncxx::oid::k_oid_length); - ASSERT(std::memcmp(bytes, oid.bytes(), oid.size()) == 0); + EXPECT(oid.bytes() != bytes); // Seperate storage. + EXPECT(oid.size() == bsoncxx::oid::k_oid_length); + EXPECT(std::memcmp(bytes, oid.bytes(), oid.size()) == 0); - ASSERT(oid.to_string() == "000000000000000000000000"); - ASSERT(oid == bsoncxx::oid{"000000000000000000000000"}); + EXPECT(oid.to_string() == "000000000000000000000000"); + EXPECT(oid == bsoncxx::oid{"000000000000000000000000"}); } { @@ -62,17 +62,17 @@ void example() { { std::time_t time = oid.get_time_t(); char str[sizeof("YYYY-MM-DD HH:MM:SS")]; - ASSERT(std::strftime(str, sizeof(str), "%F %T", std::gmtime(&time)) == + EXPECT(std::strftime(str, sizeof(str), "%F %T", std::gmtime(&time)) == sizeof(str) - 1u); - ASSERT(std::string(str) == "2000-01-01 23:59:59"); + EXPECT(std::string(str) == "2000-01-01 23:59:59"); } - ASSERT(oid < bsoncxx::oid{"389622001112131415212223"}); // Timestamp: 2000-02-01 00:00:00 - ASSERT(oid > bsoncxx::oid{"386d43801112131415212223"}); // Timestamp: 2000-01-01 00:00:00 - ASSERT(oid < bsoncxx::oid{"386e94ffffffffffff212223"}); // Value: 1099511627775 - ASSERT(oid > bsoncxx::oid{"386e94ff0000000000212223"}); // Value: 0 - ASSERT(oid < bsoncxx::oid{"386e94ff1112131415ffffff"}); // Counter: 16777215 - ASSERT(oid > bsoncxx::oid{"386e94ff1112131415000000"}); // Counter: 0 + EXPECT(oid < bsoncxx::oid{"389622001112131415212223"}); // Timestamp: 2000-02-01 00:00:00 + EXPECT(oid > bsoncxx::oid{"386d43801112131415212223"}); // Timestamp: 2000-01-01 00:00:00 + EXPECT(oid < bsoncxx::oid{"386e94ffffffffffff212223"}); // Value: 1099511627775 + EXPECT(oid > bsoncxx::oid{"386e94ff0000000000212223"}); // Value: 0 + EXPECT(oid < bsoncxx::oid{"386e94ff1112131415ffffff"}); // Counter: 16777215 + EXPECT(oid > bsoncxx::oid{"386e94ff1112131415000000"}); // Counter: 0 } } // [Example] diff --git a/examples/api/bsoncxx/examples/oid/errors.cpp b/examples/api/bsoncxx/examples/oid/errors.cpp index 856adcb182..d653a898ac 100644 --- a/examples/api/bsoncxx/examples/oid/errors.cpp +++ b/examples/api/bsoncxx/examples/oid/errors.cpp @@ -26,9 +26,9 @@ void example() { try { bsoncxx::oid oid{"invalid"}; // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_invalid_oid); + EXPECT(ex.code() == bsoncxx::error_code::k_invalid_oid); } try { @@ -36,9 +36,9 @@ void example() { bsoncxx::oid oid{bytes, sizeof(bytes)}; // Throws. - ASSERT(false && "should not reach this point"); + EXPECT(false && "should not reach this point"); } catch (const bsoncxx::exception& ex) { - ASSERT(ex.code() == bsoncxx::error_code::k_invalid_oid); + EXPECT(ex.code() == bsoncxx::error_code::k_invalid_oid); } } // [Example] diff --git a/examples/api/bsoncxx/examples/validation/basic_usage.cpp b/examples/api/bsoncxx/examples/validation/basic_usage.cpp index 41f3198cdd..f24b88db63 100644 --- a/examples/api/bsoncxx/examples/validation/basic_usage.cpp +++ b/examples/api/bsoncxx/examples/validation/basic_usage.cpp @@ -30,14 +30,14 @@ void example() { { std::uint8_t bytes[1]{}; // Invalid. - ASSERT(!bsoncxx::validate(bytes, sizeof(bytes))); + EXPECT(!bsoncxx::validate(bytes, sizeof(bytes))); std::size_t offset; - ASSERT(!bsoncxx::validate(bytes, sizeof(bytes), bsoncxx::validator{}, &offset)); + EXPECT(!bsoncxx::validate(bytes, sizeof(bytes), bsoncxx::validator{}, &offset)); // Set to `0` for an invalid BSON document. - ASSERT(offset == 0u); + EXPECT(offset == 0u); } bsoncxx::document::value owner = bsoncxx::from_json(R"({"x": 1})"); @@ -46,24 +46,24 @@ void example() { { auto doc_opt = bsoncxx::validate(data, length); - ASSERT(doc_opt); + EXPECT(doc_opt); bsoncxx::document::view doc = *doc_opt; - ASSERT(doc.data() == data); - ASSERT(doc.length() == length); - ASSERT(doc == owner.view()); + EXPECT(doc.data() == data); + EXPECT(doc.length() == length); + EXPECT(doc == owner.view()); } { bsoncxx::validator options; std::size_t offset = 123u; - ASSERT(bsoncxx::validate(data, length) == + EXPECT(bsoncxx::validate(data, length) == bsoncxx::validate(data, length, options, &offset)); // Not set when valid. - ASSERT(offset == 123u); + EXPECT(offset == 123u); } } // [Example] diff --git a/examples/api/bsoncxx/examples/validation/validator.cpp b/examples/api/bsoncxx/examples/validation/validator.cpp index 04ea221a0b..b6a40ea43d 100644 --- a/examples/api/bsoncxx/examples/validation/validator.cpp +++ b/examples/api/bsoncxx/examples/validation/validator.cpp @@ -35,7 +35,7 @@ void example(const std::uint8_t* bytes, std::size_t length) { bsoncxx::validator options; std::size_t offset; - ASSERT(bsoncxx::validate(bytes, length, options, &offset)); + EXPECT(bsoncxx::validate(bytes, length, options, &offset)); } // Validate UTF-8 strings. @@ -45,14 +45,14 @@ void example(const std::uint8_t* bytes, std::size_t length) { options.check_utf8(true); - ASSERT(!bsoncxx::validate(bytes, length, options, &offset)); + EXPECT(!bsoncxx::validate(bytes, length, options, &offset)); // Offset of `"x": "\0"` relative to start of the document. - ASSERT(offset == 4u); + EXPECT(offset == 4u); options.check_utf8_allow_null(true); - ASSERT(bsoncxx::validate(bytes, length, options, &offset)); + EXPECT(bsoncxx::validate(bytes, length, options, &offset)); } // Validate dot keys. @@ -62,10 +62,10 @@ void example(const std::uint8_t* bytes, std::size_t length) { options.check_dot_keys(true); - ASSERT(!bsoncxx::validate(bytes, length, options, &offset)); + EXPECT(!bsoncxx::validate(bytes, length, options, &offset)); // Offset of `"a.b": 1` relative to start of the document. - ASSERT(offset == 15u); + EXPECT(offset == 15u); } // Validate dollar keys. @@ -75,10 +75,10 @@ void example(const std::uint8_t* bytes, std::size_t length) { options.check_dollar_keys(true); - ASSERT(!bsoncxx::validate(bytes, length, options, &offset)); + EXPECT(!bsoncxx::validate(bytes, length, options, &offset)); // Offset of `"$numberInt": "123"` relative to start of the sub-document. (CDRIVER-5710) - ASSERT(offset == 4u); + EXPECT(offset == 4u); } } // [Example] diff --git a/examples/api/runner.cpp b/examples/api/runner.cpp index abf80fa6c0..98a17c920e 100644 --- a/examples/api/runner.cpp +++ b/examples/api/runner.cpp @@ -62,7 +62,7 @@ class runner_type { } int run() { - ASSERT(jobs > 0u); + EXPECT(jobs > 0u); std::cout << "seed: " << seed << std::endl; diff --git a/examples/macros.hh b/examples/macros.hh index f11b9e1f47..f04b75cf9c 100644 --- a/examples/macros.hh +++ b/examples/macros.hh @@ -26,12 +26,12 @@ #define EXAMPLES_CONCAT(a, b) EXAMPLES_CONCAT_1(a, b) #define EXAMPLES_CONCAT_1(a, b) a##b -// Unconditionally define `assert()` for examples. -#define ASSERT(...) \ - if (!static_cast(__VA_ARGS__)) { \ - std::printf( \ - "%s:%d: %s: assertion failed: %s\n", __FILE__, __LINE__, __func__, #__VA_ARGS__); \ - std::fflush(stdout); \ - std::abort(); \ - } else \ +// Unconditionally `assert()` expectations in examples. +#define EXPECT(...) \ + if (!static_cast(__VA_ARGS__)) { \ + std::printf( \ + "%s:%d: %s: expectation failed: %s\n", __FILE__, __LINE__, __func__, #__VA_ARGS__); \ + std::fflush(stdout); \ + std::abort(); \ + } else \ ((void)0)