diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp index 9066337ff7cca2fac177ba88ebb1c1d93a1b1414..347b8696e015cdf865fe94623599f4cf8cb07143 100644 --- a/test/test_ccaosdb.cpp +++ b/test/test_ccaosdb.cpp @@ -103,11 +103,17 @@ TEST_F(test_ccaosdb, connection_ssl_authentication_success) { auto major = caosdb_constants_COMPATIBLE_SERVER_VERSION_MAJOR(); 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(); EXPECT_EQ(major, version_info.major); - EXPECT_EQ(minor, version_info.minor); - EXPECT_STREQ(pre_release, version_info.pre_release); + 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); + } } TEST_F(test_ccaosdb, test_count_query) { diff --git a/test/test_connection.cpp b/test/test_connection.cpp index 6e0839e2e56b6153cdcf3f004360d10a3244d940..c3686a9872cb354e63050a6249e4fc8d0d51d1c6 100644 --- a/test/test_connection.cpp +++ b/test/test_connection.cpp @@ -111,12 +111,19 @@ TEST(test_connection, connection_ssl_authentication_success) { auto major = caosdb::COMPATIBLE_SERVER_VERSION_MAJOR; 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 &v_info = connection->RetrieveVersionInfo(); + EXPECT_EQ(major, v_info.GetMajor()); - EXPECT_EQ(minor, v_info.GetMinor()); - EXPECT_EQ(pre_release, v_info.GetPreRelease()); + 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()); + } } } // namespace caosdb::connection