From 2d0a9f042abf0be21bb7d840b21667f445b0080a Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Fri, 25 Mar 2022 17:44:15 +0100 Subject: [PATCH] TST: update tests for next server release --- test/CMakeLists.txt | 2 +- test/test_connection.cpp | 2 +- test/test_issues.cpp | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 868c363..bad2a26 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -85,7 +85,7 @@ if(LINTING) "--header-filter=caosdb/.*[^\(\.pb\.h\)]$" "--fix") set(_CMAKE_CXX_CLANG_TIDY_CHECKS - "--checks=*,-fuchsia-*,-llvmlibc-*,-cert-err58-cpp,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-modernize-use-trailing-return-type,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-cppcoreguidelines-avoid-goto,-hicpp-avoid-goto,-readability-function-cognitive-complexity,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay") + "--checks=*,-fuchsia-*,-llvmlibc-*,-cert-err58-cpp,-cppcoreguidelines-avoid-non-const-global-variables,-cppcoreguidelines-owning-memory,-modernize-use-trailing-return-type,-google-readability-avoid-underscore-in-googletest-name,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-cppcoreguidelines-avoid-goto,-hicpp-avoid-goto,-readability-function-cognitive-complexity,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-non-private-member-variables-in-classes,-misc-non-private-member-variables-in-classes,-cppcoreguidelines-pro-type-vararg,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay,-altera-*") endif() else() message(STATUS "LINTING is OFF") diff --git a/test/test_connection.cpp b/test/test_connection.cpp index c3686a9..f0042f2 100644 --- a/test/test_connection.cpp +++ b/test/test_connection.cpp @@ -84,7 +84,7 @@ TEST(test_connection, connection_ssl_authentication_error_anonymous) { EXPECT_THROW_MESSAGE(connection.RetrieveVersionInfo(), AuthenticationError, "The attempt to execute this transaction has not been " "executed at all because the authentication did not " - "succeed. Original error: Please login."); + "succeed. Original error: Please log in!"); } TEST(test_connection, connection_ssl_authentication_error_wrong_credentials) { diff --git a/test/test_issues.cpp b/test/test_issues.cpp index ddfee8b..9935eb1 100644 --- a/test/test_issues.cpp +++ b/test/test_issues.cpp @@ -180,8 +180,7 @@ TEST_F(test_issues, server_issue_174) { auto insert_status = insert_transaction->WaitForIt(); ASSERT_TRUE(insert_status.IsTerminated()); - // TODO(tf) Remove the EXPECT_NONFATAL_FAILURE after fixing #174. - EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(insert_status.IsError()), ""); + EXPECT_FALSE(insert_status.IsError()); } } // namespace caosdb::transaction -- GitLab