diff --git a/test/caosdb_test_utility.h b/test/caosdb_test_utility.h index 4cde3dc5059acf60a04b071154b44a59b67e9833..4c97c203a8ab55c9d239d824cd274fe3b99aa60b 100644 --- a/test/caosdb_test_utility.h +++ b/test/caosdb_test_utility.h @@ -33,16 +33,16 @@ */ #define EXPECT_THROW_MESSAGE(statement, exeption_type, message) \ EXPECT_THROW( \ - try { statement; } catch (const exeption_type &e) { \ - EXPECT_EQ(std::string(e.what()), message); \ - throw; \ - }, \ - exeption_type) + try { statement; } catch (const exeption_type &e) { \ + EXPECT_EQ(std::string(e.what()), message); \ + throw; \ + }, \ + exeption_type) #define ASSERT_THROW_MESSAGE(statement, exeption_type, message) \ ASSERT_THROW( \ - try { statement; } catch (const exeption_type &e) { \ - ASSERT_EQ(std::string(e.what()), message); \ - throw; \ - }, \ - exeption_type) + try { statement; } catch (const exeption_type &e) { \ + ASSERT_EQ(std::string(e.what()), message); \ + throw; \ + }, \ + exeption_type) #endif diff --git a/test/test_connection.cpp b/test/test_connection.cpp index 6f27f23f40da242a47ac4b818783ad04aeaf72bf..678035b50b4fee53cc246a7335ae5fb74bfb1eca 100644 --- a/test/test_connection.cpp +++ b/test/test_connection.cpp @@ -62,10 +62,10 @@ TEST(test_connection, connect_somehost_42347_fails) { TEST(test_connection, connection_insecure_authentication_error_anonymous) { const auto *port_str = - caosdb::utility::get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTP", "8080"); + caosdb::utility::get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTP", "8080"); auto port = std::stoi(port_str); const auto *const host = - caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost"); + caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost"); auto config = InsecureConnectionConfiguration(host, port); auto connection = Connection(config); @@ -75,12 +75,12 @@ TEST(test_connection, connection_insecure_authentication_error_anonymous) { TEST(test_connection, connection_ssl_authentication_error_anonymous) { const auto *port_str = - caosdb::utility::get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443"); + caosdb::utility::get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443"); auto port = std::stoi(port_str); const auto *const host = - caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost"); + caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost"); const auto path = - caosdb::utility::get_env_var("CAOSDB_SERVER_CERT", std::string()); + caosdb::utility::get_env_var("CAOSDB_SERVER_CERT", std::string()); auto cert = PemFileCertificateProvider(path); auto config = TlsConnectionConfiguration(host, port, cert); @@ -94,12 +94,12 @@ TEST(test_connection, connection_ssl_authentication_error_anonymous) { TEST(test_connection, connection_ssl_authentication_error_wrong_credentials) { const auto *port_str = - caosdb::utility::get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443"); + caosdb::utility::get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443"); auto port = std::stoi(port_str); const auto *const host = - caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost"); + caosdb::utility::get_env_var("CAOSDB_SERVER_HOST", "localhost"); const auto path = - caosdb::utility::get_env_var("CAOSDB_SERVER_CERT", std::string()); + caosdb::utility::get_env_var("CAOSDB_SERVER_CERT", std::string()); const auto *const user = "not-a-user-23461237"; const auto *const password = "very-c-cred"; @@ -109,10 +109,10 @@ TEST(test_connection, connection_ssl_authentication_error_wrong_credentials) { auto connection = Connection(config); 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: " - "Authentication failed. Username or password wrong."); + connection.RetrieveVersionInfo(), AuthenticationError, + "The attempt to execute this transaction has not been executed at all " + "because the authentication did not succeed. Original error: " + "Authentication failed. Username or password wrong."); } TEST(test_connection, connection_ssl_authentication_success) { @@ -121,7 +121,7 @@ TEST(test_connection, connection_ssl_authentication_success) { auto major = caosdb::COMPATIBLE_SERVER_VERSION_MAJOR; auto minor = caosdb::COMPATIBLE_SERVER_VERSION_MINOR; const auto pre_release = - std::string(caosdb::COMPATIBLE_SERVER_VERSION_PRE_RELEASE); + std::string(caosdb::COMPATIBLE_SERVER_VERSION_PRE_RELEASE); const auto &v_info = connection->RetrieveVersionInfo(); EXPECT_EQ(major, v_info.GetMajor()); diff --git a/test/test_list_properties.cpp b/test/test_list_properties.cpp index fdbd3524dd7195285007e992c22504cdb11f02a1..83581bcc8438d513e44a5d46536d3000af923920 100644 --- a/test/test_list_properties.cpp +++ b/test/test_list_properties.cpp @@ -40,7 +40,7 @@ protected: void TearDown() override { const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); auto query_transaction(connection->CreateTransaction()); query_transaction->Query("FIND ENTITY WITH id > 99"); query_transaction->Execute(); @@ -56,7 +56,7 @@ protected: TEST_F(test_list_properties, insert_list_of_text) { const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); auto insertion_prop(connection->CreateTransaction()); @@ -65,7 +65,7 @@ TEST_F(test_list_properties, insert_list_of_text) { abstract_list_property.SetName("TestProp"); abstract_list_property.SetDataType(DataType::ListOf(AtomicDataType::TEXT)); abstract_list_property.SetValue( - std::vector<std::string>{"item1", "item2", "item3"}); + std::vector<std::string>{"item1", "item2", "item3"}); insertion_prop->InsertEntity(&abstract_list_property); std::cout << "response " << insertion_prop->ResponseToString(); diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp index 8ee82fb9d5c65952a23702f69b59c91f037ebda0..1c65d8dec68e7f29ee22ef9cab7f207d38a82661 100644 --- a/test/test_transaction.cpp +++ b/test/test_transaction.cpp @@ -72,7 +72,7 @@ protected: // delete all entities const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); auto query_transaction(connection->CreateTransaction()); query_transaction->Query("FIND ENTITY WITH id > 99"); query_transaction->Execute(); @@ -94,7 +94,7 @@ protected: */ TEST_F(test_transaction, retrieve_non_existing) { const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); auto transaction(connection->CreateTransaction()); @@ -124,7 +124,7 @@ TEST_F(test_transaction, retrieve_non_existing) { */ TEST_F(test_transaction, insert_without_delete) { const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); auto insert_transaction(connection->CreateTransaction()); @@ -159,7 +159,7 @@ TEST_F(test_transaction, insert_delete) { // same as in insert_without_delete // until marked END SAME const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); auto insert_transaction(connection->CreateTransaction()); @@ -204,7 +204,7 @@ TEST_F(test_transaction, insert_delete_with_parent) { // same as in insert_without_delete // until marked END SAME const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); auto insert_transaction(connection->CreateTransaction()); @@ -299,7 +299,7 @@ TEST_F(test_transaction, insert_delete_with_parent) { */ TEST_F(test_transaction, insert_delete_with_property) { const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); // Create and insert property Entity prop_ent; @@ -435,7 +435,7 @@ TEST_F(test_transaction, insert_delete_with_property) { */ TEST_F(test_transaction, test_multi_retrieve) { const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); auto transaction(connection->CreateTransaction()); @@ -469,7 +469,7 @@ TEST_F(test_transaction, test_multi_retrieve) { */ TEST_F(test_transaction, insert_update_delete) { const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); // INSERT auto insert_transaction(connection->CreateTransaction()); @@ -537,7 +537,7 @@ TEST_F(test_transaction, insert_update_delete) { */ TEST_F(test_transaction, test_query) { const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); auto insert_transaction(connection->CreateTransaction()); @@ -583,7 +583,7 @@ TEST_F(test_transaction, test_query) { */ TEST_F(test_transaction, test_query_with_retrieve) { const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); // rt1 Entity rt1; @@ -698,7 +698,7 @@ TEST_F(test_transaction, test_query_with_retrieve) { */ TEST_F(test_transaction, test_file_upload) { const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); Entity file; file.SetRole(Role::FILE); @@ -735,7 +735,7 @@ TEST_F(test_transaction, test_file_upload) { */ TEST_F(test_transaction, test_file_up_n_download) { const auto &connection = - caosdb::connection::ConnectionManager::GetDefaultConnection(); + caosdb::connection::ConnectionManager::GetDefaultConnection(); Entity file; file.SetRole(Role::FILE); @@ -754,7 +754,7 @@ TEST_F(test_transaction, test_file_up_n_download) { auto download_transaction(connection->CreateTransaction()); download_transaction->RetrieveAndDownloadFilesById( - inserted_file.GetId(), test_download_file_1.string()); + inserted_file.GetId(), test_download_file_1.string()); download_transaction->ExecuteAsynchronously(); ASSERT_EQ(download_transaction->WaitForIt().GetCode(), StatusCode::SUCCESS);