Skip to content
Snippets Groups Projects
Commit f638ff39 authored by florian's avatar florian
Browse files

STY: autoformatted

parent 7f5ab863
No related branches found
No related tags found
1 merge request!10ENH: Test datatypes and values in Extern C interface
Pipeline #12330 passed
Stage: info
Stage: setup
Stage: build
Stage: test
This commit is part of merge request !10. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
test/caosdb_test_utility.h
+ 10
− 10
View file @ f638ff39
...@@ -33,16 +33,16 @@ ...@@ -33,16 +33,16 @@
*/ */
#define EXPECT_THROW_MESSAGE(statement, exeption_type, message) \ #define EXPECT_THROW_MESSAGE(statement, exeption_type, message) \
EXPECT_THROW( \ EXPECT_THROW( \
try { statement; } catch (const exeption_type &e) { \ try { statement; } catch (const exeption_type &e) { \
EXPECT_EQ(std::string(e.what()), message); \ EXPECT_EQ(std::string(e.what()), message); \
throw; \ throw; \
}, \ }, \
exeption_type) exeption_type)
#define ASSERT_THROW_MESSAGE(statement, exeption_type, message) \ #define ASSERT_THROW_MESSAGE(statement, exeption_type, message) \
ASSERT_THROW( \ ASSERT_THROW( \
try { statement; } catch (const exeption_type &e) { \ try { statement; } catch (const exeption_type &e) { \
ASSERT_EQ(std::string(e.what()), message); \ ASSERT_EQ(std::string(e.what()), message); \
throw; \ throw; \
}, \ }, \
exeption_type) exeption_type)
#endif #endif
test/test_connection.cpp
+ 13
− 13
View file @ f638ff39
...@@ -62,10 +62,10 @@ TEST(test_connection, connect_somehost_42347_fails) { ...@@ -62,10 +62,10 @@ TEST(test_connection, connect_somehost_42347_fails) {
TEST(test_connection, connection_insecure_authentication_error_anonymous) { TEST(test_connection, connection_insecure_authentication_error_anonymous) {
const auto *port_str = 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); auto port = std::stoi(port_str);
const auto *const host = 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 config = InsecureConnectionConfiguration(host, port);
auto connection = Connection(config); auto connection = Connection(config);
...@@ -75,12 +75,12 @@ TEST(test_connection, connection_insecure_authentication_error_anonymous) { ...@@ -75,12 +75,12 @@ TEST(test_connection, connection_insecure_authentication_error_anonymous) {
TEST(test_connection, connection_ssl_authentication_error_anonymous) { TEST(test_connection, connection_ssl_authentication_error_anonymous) {
const auto *port_str = 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); auto port = std::stoi(port_str);
const auto *const host = 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 = 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 cert = PemFileCertificateProvider(path);
auto config = TlsConnectionConfiguration(host, port, cert); auto config = TlsConnectionConfiguration(host, port, cert);
...@@ -94,12 +94,12 @@ TEST(test_connection, connection_ssl_authentication_error_anonymous) { ...@@ -94,12 +94,12 @@ TEST(test_connection, connection_ssl_authentication_error_anonymous) {
TEST(test_connection, connection_ssl_authentication_error_wrong_credentials) { TEST(test_connection, connection_ssl_authentication_error_wrong_credentials) {
const auto *port_str = 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); auto port = std::stoi(port_str);
const auto *const host = 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 = 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 user = "not-a-user-23461237";
const auto *const password = "very-c-cred"; const auto *const password = "very-c-cred";
...@@ -109,10 +109,10 @@ TEST(test_connection, connection_ssl_authentication_error_wrong_credentials) { ...@@ -109,10 +109,10 @@ TEST(test_connection, connection_ssl_authentication_error_wrong_credentials) {
auto connection = Connection(config); auto connection = Connection(config);
EXPECT_THROW_MESSAGE( EXPECT_THROW_MESSAGE(
connection.RetrieveVersionInfo(), AuthenticationError, connection.RetrieveVersionInfo(), AuthenticationError,
"The attempt to execute this transaction has not been executed at all " "The attempt to execute this transaction has not been executed at all "
"because the authentication did not succeed. Original error: " "because the authentication did not succeed. Original error: "
"Authentication failed. Username or password wrong."); "Authentication failed. Username or password wrong.");
} }
TEST(test_connection, connection_ssl_authentication_success) { TEST(test_connection, connection_ssl_authentication_success) {
...@@ -121,7 +121,7 @@ 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 major = caosdb::COMPATIBLE_SERVER_VERSION_MAJOR;
auto minor = caosdb::COMPATIBLE_SERVER_VERSION_MINOR; auto minor = caosdb::COMPATIBLE_SERVER_VERSION_MINOR;
const auto pre_release = 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(); const auto &v_info = connection->RetrieveVersionInfo();
EXPECT_EQ(major, v_info.GetMajor()); EXPECT_EQ(major, v_info.GetMajor());
......
test/test_list_properties.cpp
+ 3
− 3
View file @ f638ff39
...@@ -40,7 +40,7 @@ protected: ...@@ -40,7 +40,7 @@ protected:
void TearDown() override { void TearDown() override {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto query_transaction(connection->CreateTransaction()); auto query_transaction(connection->CreateTransaction());
query_transaction->Query("FIND ENTITY WITH id > 99"); query_transaction->Query("FIND ENTITY WITH id > 99");
query_transaction->Execute(); query_transaction->Execute();
...@@ -56,7 +56,7 @@ protected: ...@@ -56,7 +56,7 @@ protected:
TEST_F(test_list_properties, insert_list_of_text) { TEST_F(test_list_properties, insert_list_of_text) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto insertion_prop(connection->CreateTransaction()); auto insertion_prop(connection->CreateTransaction());
...@@ -65,7 +65,7 @@ TEST_F(test_list_properties, insert_list_of_text) { ...@@ -65,7 +65,7 @@ TEST_F(test_list_properties, insert_list_of_text) {
abstract_list_property.SetName("TestProp"); abstract_list_property.SetName("TestProp");
abstract_list_property.SetDataType(DataType::ListOf(AtomicDataType::TEXT)); abstract_list_property.SetDataType(DataType::ListOf(AtomicDataType::TEXT));
abstract_list_property.SetValue( abstract_list_property.SetValue(
std::vector<std::string>{"item1", "item2", "item3"}); std::vector<std::string>{"item1", "item2", "item3"});
insertion_prop->InsertEntity(&abstract_list_property); insertion_prop->InsertEntity(&abstract_list_property);
std::cout << "response " << insertion_prop->ResponseToString(); std::cout << "response " << insertion_prop->ResponseToString();
......
test/test_transaction.cpp
+ 13
− 13
View file @ f638ff39
...@@ -72,7 +72,7 @@ protected: ...@@ -72,7 +72,7 @@ protected:
// delete all entities // delete all entities
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto query_transaction(connection->CreateTransaction()); auto query_transaction(connection->CreateTransaction());
query_transaction->Query("FIND ENTITY WITH id > 99"); query_transaction->Query("FIND ENTITY WITH id > 99");
query_transaction->Execute(); query_transaction->Execute();
...@@ -94,7 +94,7 @@ protected: ...@@ -94,7 +94,7 @@ protected:
*/ */
TEST_F(test_transaction, retrieve_non_existing) { TEST_F(test_transaction, retrieve_non_existing) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto transaction(connection->CreateTransaction()); auto transaction(connection->CreateTransaction());
...@@ -124,7 +124,7 @@ TEST_F(test_transaction, retrieve_non_existing) { ...@@ -124,7 +124,7 @@ TEST_F(test_transaction, retrieve_non_existing) {
*/ */
TEST_F(test_transaction, insert_without_delete) { TEST_F(test_transaction, insert_without_delete) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto insert_transaction(connection->CreateTransaction()); auto insert_transaction(connection->CreateTransaction());
...@@ -159,7 +159,7 @@ TEST_F(test_transaction, insert_delete) { ...@@ -159,7 +159,7 @@ TEST_F(test_transaction, insert_delete) {
// same as in insert_without_delete // same as in insert_without_delete
// until marked END SAME // until marked END SAME
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto insert_transaction(connection->CreateTransaction()); auto insert_transaction(connection->CreateTransaction());
...@@ -204,7 +204,7 @@ TEST_F(test_transaction, insert_delete_with_parent) { ...@@ -204,7 +204,7 @@ TEST_F(test_transaction, insert_delete_with_parent) {
// same as in insert_without_delete // same as in insert_without_delete
// until marked END SAME // until marked END SAME
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto insert_transaction(connection->CreateTransaction()); auto insert_transaction(connection->CreateTransaction());
...@@ -299,7 +299,7 @@ TEST_F(test_transaction, insert_delete_with_parent) { ...@@ -299,7 +299,7 @@ TEST_F(test_transaction, insert_delete_with_parent) {
*/ */
TEST_F(test_transaction, insert_delete_with_property) { TEST_F(test_transaction, insert_delete_with_property) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
// Create and insert property // Create and insert property
Entity prop_ent; Entity prop_ent;
...@@ -435,7 +435,7 @@ TEST_F(test_transaction, insert_delete_with_property) { ...@@ -435,7 +435,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
*/ */
TEST_F(test_transaction, test_multi_retrieve) { TEST_F(test_transaction, test_multi_retrieve) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto transaction(connection->CreateTransaction()); auto transaction(connection->CreateTransaction());
...@@ -469,7 +469,7 @@ TEST_F(test_transaction, test_multi_retrieve) { ...@@ -469,7 +469,7 @@ TEST_F(test_transaction, test_multi_retrieve) {
*/ */
TEST_F(test_transaction, insert_update_delete) { TEST_F(test_transaction, insert_update_delete) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
// INSERT // INSERT
auto insert_transaction(connection->CreateTransaction()); auto insert_transaction(connection->CreateTransaction());
...@@ -537,7 +537,7 @@ TEST_F(test_transaction, insert_update_delete) { ...@@ -537,7 +537,7 @@ TEST_F(test_transaction, insert_update_delete) {
*/ */
TEST_F(test_transaction, test_query) { TEST_F(test_transaction, test_query) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto insert_transaction(connection->CreateTransaction()); auto insert_transaction(connection->CreateTransaction());
...@@ -583,7 +583,7 @@ TEST_F(test_transaction, test_query) { ...@@ -583,7 +583,7 @@ TEST_F(test_transaction, test_query) {
*/ */
TEST_F(test_transaction, test_query_with_retrieve) { TEST_F(test_transaction, test_query_with_retrieve) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
// rt1 // rt1
Entity rt1; Entity rt1;
...@@ -698,7 +698,7 @@ TEST_F(test_transaction, test_query_with_retrieve) { ...@@ -698,7 +698,7 @@ TEST_F(test_transaction, test_query_with_retrieve) {
*/ */
TEST_F(test_transaction, test_file_upload) { TEST_F(test_transaction, test_file_upload) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
Entity file; Entity file;
file.SetRole(Role::FILE); file.SetRole(Role::FILE);
...@@ -735,7 +735,7 @@ TEST_F(test_transaction, test_file_upload) { ...@@ -735,7 +735,7 @@ TEST_F(test_transaction, test_file_upload) {
*/ */
TEST_F(test_transaction, test_file_up_n_download) { TEST_F(test_transaction, test_file_up_n_download) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
Entity file; Entity file;
file.SetRole(Role::FILE); file.SetRole(Role::FILE);
...@@ -754,7 +754,7 @@ TEST_F(test_transaction, test_file_up_n_download) { ...@@ -754,7 +754,7 @@ TEST_F(test_transaction, test_file_up_n_download) {
auto download_transaction(connection->CreateTransaction()); auto download_transaction(connection->CreateTransaction());
download_transaction->RetrieveAndDownloadFilesById( download_transaction->RetrieveAndDownloadFilesById(
inserted_file.GetId(), test_download_file_1.string()); inserted_file.GetId(), test_download_file_1.string());
download_transaction->ExecuteAsynchronously(); download_transaction->ExecuteAsynchronously();
ASSERT_EQ(download_transaction->WaitForIt().GetCode(), StatusCode::SUCCESS); ASSERT_EQ(download_transaction->WaitForIt().GetCode(), StatusCode::SUCCESS);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment