Skip to content

Fix mongo-c-driver version compatibility check tests #1417

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
eramongodb merged 1 commit into from
Jun 16, 2025
Merged

Fix mongo-c-driver version compatibility check tests #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 15 additions & 9 deletions src/bsoncxx/test/private/bson_version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,15 @@ TEST_CASE("bson version numbers", "[bsoncxx][test]") {
CHECK(bson_get_major_version() == expect[0]);

CHECKED_IF(expect.size() > 1) {
CHECK(bson_get_minor_version() >= expect[1]);
auto const minor = bson_get_minor_version();

// Only when minor version number compares equal.
CHECKED_IF(expect.size() > 2) {
CHECK(bson_get_micro_version() >= expect[2]);
CHECK(minor >= expect[1]);

// Only compare patch version number when minor version number compares equal.
CHECKED_IF(minor == expect[1]) {
CHECKED_IF(expect.size() > 2) {
CHECK(bson_get_micro_version() >= expect[2]);
}
}
}
}
Expand Down Expand Up @@ -89,12 +93,14 @@ TEST_CASE(
// Minor version number.
CHECK(actual[1] >= expect[1]);

// Only when minor version number compares equal.
CHECKED_IF(expect.size() > 2) {
REQUIRE(actual.size() > 2);
// Only compare patch version number when minor version number compares equal.
CHECKED_IF(actual[1] == expect[1]) {
CHECKED_IF(expect.size() > 2) {
REQUIRE(actual.size() > 2);

// Patch version number.
CHECK(actual[2] >= expect[2]);
// Patch version number.
CHECK(actual[2] >= expect[2]);
}
}
}
}
Expand Down
28 changes: 16 additions & 12 deletions src/mongocxx/test/private/mongoc_version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,20 @@ TEST_CASE("mongoc version numbers", "[mongocxx][test]") {
CHECK(mongoc_get_major_version() == expect[0]);

CHECKED_IF(expect.size() > 1) {
CHECK(bson_get_minor_version() >= expect[1]);
auto const minor = mongoc_get_minor_version();

// Only when minor version number compares equal.
CHECKED_IF(expect.size() > 2) {
CHECK(bson_get_micro_version() >= expect[2]);
CHECK(minor >= expect[1]);

// Only compare patch version number when minor version number compares equal.
CHECKED_IF(minor == expect[1]) {
CHECKED_IF(expect.size() > 2) {
CHECK(mongoc_get_micro_version() >= expect[2]);
}
}
}
}

TEST_CASE(
"mongoc version string"
"[mongocxx][test]") {
TEST_CASE("mongoc version string", "[mongocxx][test]") {
auto const expect_str = bsoncxx::stdx::string_view{MONGOC_REQUIRED_VERSION()};
auto const actual_str = bsoncxx::stdx::string_view{MONGOC_VERSION_S};

Expand All @@ -74,12 +76,14 @@ TEST_CASE(
// Minor version number.
CHECK(actual[1] >= expect[1]);

// Only when minor version number compares equal.
CHECKED_IF(expect.size() > 2) {
REQUIRE(actual.size() > 2);
// Only compare patch version number when minor version number compares equal.
CHECKED_IF(actual[1] == expect[1]) {
CHECKED_IF(expect.size() > 2) {
REQUIRE(actual.size() > 2);

// Patch version number.
CHECK(actual[2] >= expect[2]);
// Patch version number.
CHECK(actual[2] >= expect[2]);
}
}
}
}
Expand Down