Skip to content

Reduce Warnings - implicit-fallthrough, switch-enum, extra-semi-stmt, unneeded-member-function #1212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 19, 2024
Merged

Reduce Warnings - implicit-fallthrough, switch-enum, extra-semi-stmt, unneeded-member-function #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c038026
Address -Wimplicit-fallthrough warnings
eramongodb Sep 18, 2024
5dff479
Address -Wextra-semi-stmt warnings
eramongodb Sep 18, 2024
bfa5e3e
Address -Wswitch-enum warnings
eramongodb Sep 18, 2024
75366c7
Address -Wunneeded-member-function warnings
eramongodb Sep 18, 2024
a951f8c
Merge remote-tracking branch 'upstream/master' into cxx-warnings
eramongodb Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/bsoncxx/test/type_traits.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
// We declare variables that are only used for compilation checking
BSONCXX_DISABLE_WARNING(GNU("-Wunused"));
BSONCXX_DISABLE_WARNING(Clang("-Wunused-template"));
BSONCXX_DISABLE_WARNING(Clang("-Wunneeded-member-function"));

namespace {

Expand Down
38 changes: 38 additions & 0 deletions src/mongocxx/test/client_helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,25 @@ bsoncxx::array::value transform_array(bsoncxx::array::view view,
builder.append(transform_array(v.get_array().value, fcn, context));
break;

case bsoncxx::type::k_double:
case bsoncxx::type::k_string:
case bsoncxx::type::k_binary:
case bsoncxx::type::k_undefined:
case bsoncxx::type::k_oid:
case bsoncxx::type::k_bool:
case bsoncxx::type::k_date:
case bsoncxx::type::k_null:
case bsoncxx::type::k_regex:
case bsoncxx::type::k_dbpointer:
case bsoncxx::type::k_code:
case bsoncxx::type::k_symbol:
case bsoncxx::type::k_codewscope:
case bsoncxx::type::k_int32:
case bsoncxx::type::k_timestamp:
case bsoncxx::type::k_int64:
case bsoncxx::type::k_decimal128:
case bsoncxx::type::k_maxkey:
case bsoncxx::type::k_minkey:
default:
builder.append(v);
break;
Expand Down Expand Up @@ -159,6 +178,25 @@ bsoncxx::document::value transform_document_recursive(bsoncxx::document::view vi
k, transform_array(v.get_array().value, fcn, context)));
break;

case bsoncxx::type::k_double:
case bsoncxx::type::k_string:
case bsoncxx::type::k_binary:
case bsoncxx::type::k_undefined:
case bsoncxx::type::k_oid:
case bsoncxx::type::k_bool:
case bsoncxx::type::k_date:
case bsoncxx::type::k_null:
case bsoncxx::type::k_regex:
case bsoncxx::type::k_dbpointer:
case bsoncxx::type::k_code:
case bsoncxx::type::k_symbol:
case bsoncxx::type::k_codewscope:
case bsoncxx::type::k_int32:
case bsoncxx::type::k_timestamp:
case bsoncxx::type::k_int64:
case bsoncxx::type::k_decimal128:
case bsoncxx::type::k_maxkey:
case bsoncxx::type::k_minkey:
default:
builder.append(bsoncxx::builder::basic::kvp(k, v));
break;
Expand Down
2 changes: 2 additions & 0 deletions src/mongocxx/test/client_helpers.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,10 @@ cseeos_result client_side_encryption_enabled_or_skip_impl();
break; \
case mongocxx::test_util::cseeos_result::skip: \
SKIP("CSE environemnt variables not set"); \
break; \
case mongocxx::test_util::cseeos_result::fail: \
FAIL("One or more CSE environment variable is missing"); \
break; \
} \
} else \
((void)0)
Expand Down
16 changes: 16 additions & 0 deletions src/mongocxx/test/client_side_encryption.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3377,6 +3377,12 @@ TEST_CASE("Range Explicit Encryption", "[client_side_encryption]") {
// This test case should be skipped if the encrypted field is
// `encryptedDoubleNoPrecision` or `encryptedDecimalNoPrecision`.
break;

case RangeFieldType::DecimalPrecision:
case RangeFieldType::DoublePrecision:
case RangeFieldType::Date:
case RangeFieldType::Int:
case RangeFieldType::Long:
default: {
SECTION("Case 6: encrypting a document greater than the maximum errors") {
const auto original = to_field_value(201, field_type);
Expand Down Expand Up @@ -3413,6 +3419,12 @@ TEST_CASE("Range Explicit Encryption", "[client_side_encryption]") {
// This test case should be skipped if the encrypted field is
// `encryptedDoubleNoPrecision`.
break;

case RangeFieldType::DecimalPrecision:
case RangeFieldType::DoublePrecision:
case RangeFieldType::Date:
case RangeFieldType::Int:
case RangeFieldType::Long:
default: {
SECTION("Case 7: encrypting a document of a different type errors") {
// For all the tests below use these EncryptOpts:
Expand Down Expand Up @@ -3454,6 +3466,10 @@ TEST_CASE("Range Explicit Encryption", "[client_side_encryption]") {
// `encryptedDoublePrecision` or `encryptedDoubleNoPrecision` or
// `encryptedDecimalPrecision` or `encryptedDecimalNoPrecision`.
break;

case RangeFieldType::Date:
case RangeFieldType::Int:
case RangeFieldType::Long:
default: {
SECTION("Case 8: setting precision errors if the type is not a double") {
// Use `clientEncryption.encrypt()` to try to encrypt the value 6 with these
Expand Down
2 changes: 0 additions & 2 deletions src/mongocxx/test/options/create_collection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ TEST_CASE("create_collection accessors/mutators", "[create_collection]") {
auto validation = validation_criteria{}.rule(make_document(kvp("a", 1)));

CHECK_OPTIONAL_ARGUMENT(cc, capped, true);
BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_BEGIN;
BSONCXX_SUPPRESS_DEPRECATION_WARNINGS_END;
CHECK_OPTIONAL_ARGUMENT(cc, size, 5);
CHECK_OPTIONAL_ARGUMENT(cc, max, 2);
CHECK_OPTIONAL_ARGUMENT(cc, collation, collation.view());
Expand Down
21 changes: 21 additions & 0 deletions src/mongocxx/test/spec/initial_dns_seedlist_discovery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,33 @@ static void assert_elements_equal(bsoncxx::document::element expected_option,
case bsoncxx::type::k_int32:
REQUIRE(expected_option.get_int32() == my_option.get_int32());
break;

case bsoncxx::type::k_bool:
REQUIRE(expected_option.get_bool() == my_option.get_bool());
break;

case bsoncxx::type::k_string:
REQUIRE(expected_option.get_string() == my_option.get_string());
break;

case bsoncxx::type::k_double:
case bsoncxx::type::k_document:
case bsoncxx::type::k_array:
case bsoncxx::type::k_binary:
case bsoncxx::type::k_undefined:
case bsoncxx::type::k_oid:
case bsoncxx::type::k_date:
case bsoncxx::type::k_null:
case bsoncxx::type::k_regex:
case bsoncxx::type::k_dbpointer:
case bsoncxx::type::k_code:
case bsoncxx::type::k_symbol:
case bsoncxx::type::k_codewscope:
case bsoncxx::type::k_timestamp:
case bsoncxx::type::k_int64:
case bsoncxx::type::k_decimal128:
case bsoncxx::type::k_maxkey:
case bsoncxx::type::k_minkey:
default:
std::string msg =
"option type not handled: " + bsoncxx::to_string(expected_option.type());
Expand Down
84 changes: 84 additions & 0 deletions src/mongocxx/test/spec/operation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,7 @@ document::value operation_runner::_run_find_one_and_update(document::view operat
}
break;
}

case bsoncxx::type::k_array: {
pipeline update = build_pipeline(arguments["update"].get_array().value);
if (session) {
Expand All @@ -581,6 +582,26 @@ document::value operation_runner::_run_find_one_and_update(document::view operat
}
break;
}

case bsoncxx::type::k_double:
case bsoncxx::type::k_string:
case bsoncxx::type::k_binary:
case bsoncxx::type::k_undefined:
case bsoncxx::type::k_oid:
case bsoncxx::type::k_bool:
case bsoncxx::type::k_date:
case bsoncxx::type::k_null:
case bsoncxx::type::k_regex:
case bsoncxx::type::k_dbpointer:
case bsoncxx::type::k_code:
case bsoncxx::type::k_symbol:
case bsoncxx::type::k_codewscope:
case bsoncxx::type::k_int32:
case bsoncxx::type::k_timestamp:
case bsoncxx::type::k_int64:
case bsoncxx::type::k_decimal128:
case bsoncxx::type::k_maxkey:
case bsoncxx::type::k_minkey:
default:
throw std::logic_error{"update must be a document or an array"};
}
Expand Down Expand Up @@ -778,6 +799,7 @@ document::value operation_runner::_run_update_many(document::view operation) {
}
break;
}

case bsoncxx::type::k_array: {
pipeline update = build_pipeline(arguments["update"].get_array().value);
if (session) {
Expand All @@ -787,6 +809,26 @@ document::value operation_runner::_run_update_many(document::view operation) {
}
break;
}

case bsoncxx::type::k_double:
case bsoncxx::type::k_string:
case bsoncxx::type::k_binary:
case bsoncxx::type::k_undefined:
case bsoncxx::type::k_oid:
case bsoncxx::type::k_bool:
case bsoncxx::type::k_date:
case bsoncxx::type::k_null:
case bsoncxx::type::k_regex:
case bsoncxx::type::k_dbpointer:
case bsoncxx::type::k_code:
case bsoncxx::type::k_symbol:
case bsoncxx::type::k_codewscope:
case bsoncxx::type::k_int32:
case bsoncxx::type::k_timestamp:
case bsoncxx::type::k_int64:
case bsoncxx::type::k_decimal128:
case bsoncxx::type::k_maxkey:
case bsoncxx::type::k_minkey:
default:
throw std::logic_error{"update must be a document or an array"};
}
Expand Down Expand Up @@ -870,6 +912,7 @@ document::value operation_runner::_run_update_one(document::view operation) {
}
break;
}

case bsoncxx::type::k_array: {
pipeline update = build_pipeline(arguments["update"].get_array().value);
if (session) {
Expand All @@ -879,6 +922,26 @@ document::value operation_runner::_run_update_one(document::view operation) {
}
break;
}

case bsoncxx::type::k_double:
case bsoncxx::type::k_string:
case bsoncxx::type::k_binary:
case bsoncxx::type::k_undefined:
case bsoncxx::type::k_oid:
case bsoncxx::type::k_bool:
case bsoncxx::type::k_date:
case bsoncxx::type::k_null:
case bsoncxx::type::k_regex:
case bsoncxx::type::k_dbpointer:
case bsoncxx::type::k_code:
case bsoncxx::type::k_symbol:
case bsoncxx::type::k_codewscope:
case bsoncxx::type::k_int32:
case bsoncxx::type::k_timestamp:
case bsoncxx::type::k_int64:
case bsoncxx::type::k_decimal128:
case bsoncxx::type::k_maxkey:
case bsoncxx::type::k_minkey:
default:
throw std::logic_error{"update must be a document or an array"};
}
Expand Down Expand Up @@ -966,10 +1029,31 @@ T _build_update_model(document::view arguments) {
case bsoncxx::type::k_document: {
return T(filter, arguments["update"].get_document().value);
}

case bsoncxx::type::k_array: {
pipeline update = build_pipeline(arguments["update"].get_array().value);
return T(filter, update);
}

case bsoncxx::type::k_double:
case bsoncxx::type::k_string:
case bsoncxx::type::k_binary:
case bsoncxx::type::k_undefined:
case bsoncxx::type::k_oid:
case bsoncxx::type::k_bool:
case bsoncxx::type::k_date:
case bsoncxx::type::k_null:
case bsoncxx::type::k_regex:
case bsoncxx::type::k_dbpointer:
case bsoncxx::type::k_code:
case bsoncxx::type::k_symbol:
case bsoncxx::type::k_codewscope:
case bsoncxx::type::k_int32:
case bsoncxx::type::k_timestamp:
case bsoncxx::type::k_int64:
case bsoncxx::type::k_decimal128:
case bsoncxx::type::k_maxkey:
case bsoncxx::type::k_minkey:
default:
throw std::logic_error{"update must be a document or an array"};
}
Expand Down
19 changes: 19 additions & 0 deletions src/mongocxx/test/spec/unified_tests/assert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,11 @@ void assert::matches(types::bson_value::view actual,
case bsoncxx::type::k_document:
matches_document(actual, expected, map, is_root);
return;

case bsoncxx::type::k_array:
matches_array(actual, expected, map, is_array_of_root_docs);
return;

case bsoncxx::type::k_int32:
case bsoncxx::type::k_int64:
case bsoncxx::type::k_double: {
Expand All @@ -267,6 +269,23 @@ void assert::matches(types::bson_value::view actual,
BSONCXX_POP_WARNINGS();
return;
}

case bsoncxx::type::k_string:
case bsoncxx::type::k_binary:
case bsoncxx::type::k_undefined:
case bsoncxx::type::k_oid:
case bsoncxx::type::k_bool:
case bsoncxx::type::k_date:
case bsoncxx::type::k_null:
case bsoncxx::type::k_regex:
case bsoncxx::type::k_dbpointer:
case bsoncxx::type::k_code:
case bsoncxx::type::k_symbol:
case bsoncxx::type::k_codewscope:
case bsoncxx::type::k_timestamp:
case bsoncxx::type::k_decimal128:
case bsoncxx::type::k_maxkey:
case bsoncxx::type::k_minkey:
default: {
CAPTURE(is_root,
to_string(actual.type()),
Expand Down
Loading