Skip to content
Snippets Groups Projects
Verified Commit ac1cda4f authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Fix tests for better use of semantic versioning

parent d983a77a
Branches
Tags
No related merge requests found
Pipeline #17261 passed
...@@ -103,12 +103,18 @@ TEST_F(test_ccaosdb, connection_ssl_authentication_success) { ...@@ -103,12 +103,18 @@ TEST_F(test_ccaosdb, connection_ssl_authentication_success) {
auto major = caosdb_constants_COMPATIBLE_SERVER_VERSION_MAJOR(); auto major = caosdb_constants_COMPATIBLE_SERVER_VERSION_MAJOR();
auto minor = caosdb_constants_COMPATIBLE_SERVER_VERSION_MINOR(); auto minor = caosdb_constants_COMPATIBLE_SERVER_VERSION_MINOR();
auto patch = caosdb_constants_COMPATIBLE_SERVER_VERSION_PATCH();
const auto *const pre_release = caosdb_constants_COMPATIBLE_SERVER_VERSION_PRE_RELEASE(); const auto *const pre_release = caosdb_constants_COMPATIBLE_SERVER_VERSION_PRE_RELEASE();
EXPECT_EQ(major, version_info.major); EXPECT_EQ(major, version_info.major);
EXPECT_EQ(minor, version_info.minor); EXPECT_LE(minor, version_info.minor);
if (minor == version_info.minor) {
EXPECT_LE(patch, version_info.patch);
}
if (strcmp(pre_release, "") != 0) {
EXPECT_STREQ(pre_release, version_info.pre_release); EXPECT_STREQ(pre_release, version_info.pre_release);
} }
}
TEST_F(test_ccaosdb, test_count_query) { TEST_F(test_ccaosdb, test_count_query) {
......
...@@ -111,12 +111,19 @@ TEST(test_connection, connection_ssl_authentication_success) { ...@@ -111,12 +111,19 @@ TEST(test_connection, connection_ssl_authentication_success) {
auto major = caosdb::COMPATIBLE_SERVER_VERSION_MAJOR; auto major = caosdb::COMPATIBLE_SERVER_VERSION_MAJOR;
auto minor = caosdb::COMPATIBLE_SERVER_VERSION_MINOR; auto minor = caosdb::COMPATIBLE_SERVER_VERSION_MINOR;
auto patch = caosdb::COMPATIBLE_SERVER_VERSION_PATCH;
const auto pre_release = std::string(caosdb::COMPATIBLE_SERVER_VERSION_PRE_RELEASE); const auto pre_release = std::string(caosdb::COMPATIBLE_SERVER_VERSION_PRE_RELEASE);
const auto &v_info = connection->RetrieveVersionInfo(); const auto &v_info = connection->RetrieveVersionInfo();
EXPECT_EQ(major, v_info.GetMajor()); EXPECT_EQ(major, v_info.GetMajor());
EXPECT_EQ(minor, v_info.GetMinor()); EXPECT_LE(minor, v_info.GetMinor());
if (minor == v_info.GetMinor()) {
EXPECT_LE(patch, v_info.GetPatch());
}
if (!pre_release.empty()) {
EXPECT_EQ(pre_release, v_info.GetPreRelease()); EXPECT_EQ(pre_release, v_info.GetPreRelease());
} }
}
} // namespace caosdb::connection } // namespace caosdb::connection
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment