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

MAINT: autoformatted

parent 026b2417
No related branches found
No related tags found
1 merge request!11ENH: Test insert/update/delete and files in Extern C
This commit is part of merge request !11. 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 @ 2dcfa816
...@@ -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
+ 17
− 17
View file @ 2dcfa816
...@@ -29,10 +29,10 @@ ...@@ -29,10 +29,10 @@
#include "caosdb/utility.h" // for get_env_var #include "caosdb/utility.h" // for get_env_var
#include "caosdb_test_utility.h" // for EXPECT_THROW_MESSAGE #include "caosdb_test_utility.h" // for EXPECT_THROW_MESSAGE
#include <gtest/gtest-message.h> // NOLINT TODO ?? for Message #include <gtest/gtest-message.h> // NOLINT TODO ?? for Message
#include <gtest/gtest-test-part.h> // NOLINT for SuiteApiResolver, TestPartR... #include <gtest/gtest-test-part.h> // NOLINT for SuiteApiResolver, TestPartR...
#include "gtest/gtest_pred_impl.h" // NOLINT for Test, TestInfo, TEST, EXPEC... #include "gtest/gtest_pred_impl.h" // NOLINT for Test, TestInfo, TEST, EXPEC...
#include <memory> // for allocator, unique_ptr, __sh... #include <memory> // for allocator, unique_ptr, __sh...
#include <string> // for stoi, string #include <string> // for stoi, string
namespace caosdb::connection { namespace caosdb::connection {
using caosdb::authentication::PlainPasswordAuthenticator; using caosdb::authentication::PlainPasswordAuthenticator;
...@@ -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_file_transmission.cpp
+ 6
− 6
View file @ 2dcfa816
...@@ -47,7 +47,7 @@ protected: ...@@ -47,7 +47,7 @@ protected:
TEST_F(test_file_transmission, register_file_upload) { TEST_F(test_file_transmission, register_file_upload) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto transaction(connection->CreateTransaction()); auto transaction(connection->CreateTransaction());
RegisterFileUploadResponse response; RegisterFileUploadResponse response;
...@@ -63,7 +63,7 @@ TEST_F(test_file_transmission, register_file_upload) { ...@@ -63,7 +63,7 @@ TEST_F(test_file_transmission, register_file_upload) {
TEST_F(test_file_transmission, file_upload) { TEST_F(test_file_transmission, file_upload) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto transaction(connection->CreateTransaction()); auto transaction(connection->CreateTransaction());
RegisterFileUploadResponse registration_response; RegisterFileUploadResponse registration_response;
...@@ -82,7 +82,7 @@ TEST_F(test_file_transmission, file_upload) { ...@@ -82,7 +82,7 @@ TEST_F(test_file_transmission, file_upload) {
TEST_F(test_file_transmission, file_insertion) { TEST_F(test_file_transmission, file_insertion) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto transaction(connection->CreateTransaction()); auto transaction(connection->CreateTransaction());
RegisterFileUploadResponse registration_response; RegisterFileUploadResponse registration_response;
...@@ -110,7 +110,7 @@ TEST_F(test_file_transmission, file_insertion) { ...@@ -110,7 +110,7 @@ TEST_F(test_file_transmission, file_insertion) {
TEST_F(test_file_transmission, file_download) { TEST_F(test_file_transmission, file_download) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto upload_transaction(connection->CreateTransaction()); auto upload_transaction(connection->CreateTransaction());
RegisterFileUploadResponse upload_registration_response; RegisterFileUploadResponse upload_registration_response;
...@@ -136,7 +136,7 @@ TEST_F(test_file_transmission, file_download) { ...@@ -136,7 +136,7 @@ TEST_F(test_file_transmission, file_download) {
RegisterFileDownloadResponse download_registration_response; RegisterFileDownloadResponse download_registration_response;
RegisterFileDownloadRequest download_registration_request; RegisterFileDownloadRequest download_registration_request;
download_registration_request.add_files()->set_entity_id( download_registration_request.add_files()->set_entity_id(
upload_transaction->GetResultSet().At(0).GetId()); upload_transaction->GetResultSet().At(0).GetId());
download_transaction->RegisterDownloadFile(download_registration_request, download_transaction->RegisterDownloadFile(download_registration_request,
&download_registration_response); &download_registration_response);
ASSERT_EQ(download_registration_response.status(), ASSERT_EQ(download_registration_response.status(),
...@@ -151,7 +151,7 @@ TEST_F(test_file_transmission, file_download) { ...@@ -151,7 +151,7 @@ TEST_F(test_file_transmission, file_download) {
// CLEANUP // CLEANUP
auto cleanup_transaction(connection->CreateTransaction()); auto cleanup_transaction(connection->CreateTransaction());
cleanup_transaction->DeleteById( cleanup_transaction->DeleteById(
upload_transaction->GetResultSet().At(0).GetId()); upload_transaction->GetResultSet().At(0).GetId());
cleanup_transaction->Execute(); cleanup_transaction->Execute();
} }
......
test/test_transaction.cpp
+ 14
− 14
View file @ 2dcfa816
...@@ -64,7 +64,7 @@ protected: ...@@ -64,7 +64,7 @@ protected:
fs::remove(test_download_file_1); fs::remove(test_download_file_1);
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();
...@@ -80,7 +80,7 @@ protected: ...@@ -80,7 +80,7 @@ protected:
TEST_F(test_transaction, DISABLED_retrieve_manufacturer_by_id) { TEST_F(test_transaction, DISABLED_retrieve_manufacturer_by_id) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
const auto *id = "107"; const auto *id = "107";
const auto *role = "RecordType"; const auto *role = "RecordType";
...@@ -104,7 +104,7 @@ TEST_F(test_transaction, DISABLED_retrieve_manufacturer_by_id) { ...@@ -104,7 +104,7 @@ TEST_F(test_transaction, DISABLED_retrieve_manufacturer_by_id) {
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());
...@@ -128,7 +128,7 @@ TEST_F(test_transaction, retrieve_non_existing) { ...@@ -128,7 +128,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());
...@@ -157,7 +157,7 @@ TEST_F(test_transaction, insert_without_delete) { ...@@ -157,7 +157,7 @@ TEST_F(test_transaction, insert_without_delete) {
TEST_F(test_transaction, insert_delete) { TEST_F(test_transaction, insert_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());
...@@ -202,7 +202,7 @@ TEST_F(test_transaction, insert_delete) { ...@@ -202,7 +202,7 @@ TEST_F(test_transaction, insert_delete) {
TEST_F(test_transaction, insert_delete_with_parent) { TEST_F(test_transaction, insert_delete_with_parent) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
auto insert_transaction(connection->CreateTransaction()); auto insert_transaction(connection->CreateTransaction());
...@@ -286,7 +286,7 @@ TEST_F(test_transaction, insert_delete_with_parent) { ...@@ -286,7 +286,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;
...@@ -419,7 +419,7 @@ TEST_F(test_transaction, insert_delete_with_property) { ...@@ -419,7 +419,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());
...@@ -450,7 +450,7 @@ TEST_F(test_transaction, test_multi_retrieve) { ...@@ -450,7 +450,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());
...@@ -515,7 +515,7 @@ TEST_F(test_transaction, insert_update_delete) { ...@@ -515,7 +515,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());
...@@ -557,7 +557,7 @@ TEST_F(test_transaction, test_query) { ...@@ -557,7 +557,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;
...@@ -669,7 +669,7 @@ TEST_F(test_transaction, test_query_with_retrieve) { ...@@ -669,7 +669,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("File"); file.SetRole("File");
...@@ -694,7 +694,7 @@ TEST_F(test_transaction, test_file_upload) { ...@@ -694,7 +694,7 @@ TEST_F(test_transaction, test_file_upload) {
TEST_F(test_transaction, test_file_download) { TEST_F(test_transaction, test_file_download) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
Entity file; Entity file;
file.SetRole("File"); file.SetRole("File");
...@@ -713,7 +713,7 @@ TEST_F(test_transaction, test_file_download) { ...@@ -713,7 +713,7 @@ TEST_F(test_transaction, test_file_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