Skip to content
Snippets Groups Projects
Verified Commit 624a6944 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'dev' into f-int64

parents 27370f8f 02d697e1
No related branches found
No related tags found
1 merge request!14Tests for f-int64
Pipeline #13204 passed
...@@ -32,13 +32,15 @@ ...@@ -32,13 +32,15 @@
* @date 2021-07-07 * @date 2021-07-07
*/ */
#define EXPECT_THROW_MESSAGE(statement, exeption_type, message) \ #define EXPECT_THROW_MESSAGE(statement, exeption_type, message) \
EXPECT_THROW(try { statement; } catch (const exeption_type &e) { \ EXPECT_THROW( \
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(try { statement; } catch (const exeption_type &e) { \ ASSERT_THROW( \
try { statement; } catch (const exeption_type &e) { \
ASSERT_EQ(std::string(e.what()), message); \ ASSERT_EQ(std::string(e.what()), message); \
throw; \ throw; \
}, \ }, \
......
...@@ -124,8 +124,8 @@ TEST_F(test_ccaosdb, test_count_query) { ...@@ -124,8 +124,8 @@ TEST_F(test_ccaosdb, test_count_query) {
EXPECT_EQ(return_code, 0); EXPECT_EQ(return_code, 0);
caosdb_transaction_transaction transaction; caosdb_transaction_transaction transaction;
return_code = caosdb_connection_connection_create_transaction(&connection, return_code =
&transaction); caosdb_connection_connection_create_transaction(&connection, &transaction);
EXPECT_EQ(return_code, 0); EXPECT_EQ(return_code, 0);
// COUNT query with an empty result // COUNT query with an empty result
...@@ -154,8 +154,8 @@ TEST_F(test_ccaosdb, test_query) { ...@@ -154,8 +154,8 @@ TEST_F(test_ccaosdb, test_query) {
EXPECT_EQ(return_code, 0); EXPECT_EQ(return_code, 0);
caosdb_transaction_transaction transaction; caosdb_transaction_transaction transaction;
return_code = caosdb_connection_connection_create_transaction(&connection, return_code =
&transaction); caosdb_connection_connection_create_transaction(&connection, &transaction);
EXPECT_EQ(return_code, 0); EXPECT_EQ(return_code, 0);
return_code = caosdb_transaction_transaction_query(&transaction, return_code = caosdb_transaction_transaction_query(&transaction,
...@@ -187,8 +187,8 @@ TEST_F(test_ccaosdb, test_single_id_retrieve) { ...@@ -187,8 +187,8 @@ TEST_F(test_ccaosdb, test_single_id_retrieve) {
EXPECT_EQ(return_code, 0); EXPECT_EQ(return_code, 0);
caosdb_transaction_transaction transaction; caosdb_transaction_transaction transaction;
return_code = caosdb_connection_connection_create_transaction(&connection, return_code =
&transaction); caosdb_connection_connection_create_transaction(&connection, &transaction);
EXPECT_EQ(return_code, 0); EXPECT_EQ(return_code, 0);
return_code = return_code =
...@@ -233,8 +233,8 @@ TEST_F(test_ccaosdb, test_multi_id_retrieve) { ...@@ -233,8 +233,8 @@ TEST_F(test_ccaosdb, test_multi_id_retrieve) {
EXPECT_EQ(return_code, 0); EXPECT_EQ(return_code, 0);
caosdb_transaction_transaction transaction; caosdb_transaction_transaction transaction;
return_code = caosdb_connection_connection_create_transaction(&connection, return_code =
&transaction); caosdb_connection_connection_create_transaction(&connection, &transaction);
EXPECT_EQ(return_code, 0); EXPECT_EQ(return_code, 0);
const char *ids[] = {"20", "21", "22"}; // NOLINT const char *ids[] = {"20", "21", "22"}; // NOLINT
......
...@@ -74,8 +74,8 @@ TEST(test_connection, connection_insecure_authentication_error_anonymous) { ...@@ -74,8 +74,8 @@ 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 = caosdb::utility::get_env_fallback( const auto *port_str =
"CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443"); caosdb::utility::get_env_fallback("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_fallback("CAOSDB_SERVER_HOST", "localhost"); caosdb::utility::get_env_fallback("CAOSDB_SERVER_HOST", "localhost");
...@@ -93,8 +93,8 @@ TEST(test_connection, connection_ssl_authentication_error_anonymous) { ...@@ -93,8 +93,8 @@ 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 = caosdb::utility::get_env_fallback( const auto *port_str =
"CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443"); caosdb::utility::get_env_fallback("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_fallback("CAOSDB_SERVER_HOST", "localhost"); caosdb::utility::get_env_fallback("CAOSDB_SERVER_HOST", "localhost");
......
...@@ -105,16 +105,12 @@ TEST_F(test_issues, server_issue_170) { ...@@ -105,16 +105,12 @@ TEST_F(test_issues, server_issue_170) {
update_entity.SetDataType(AtomicDataType::INTEGER, true); update_entity.SetDataType(AtomicDataType::INTEGER, true);
update_entity.SetValue(std::vector<int32_t>{1, 1, 2, 3, 5, 8, 13}); update_entity.SetValue(std::vector<int32_t>{1, 1, 2, 3, 5, 8, 13});
EXPECT_NONFATAL_FAILURE(
{
update_transaction->UpdateEntity(&update_entity); update_transaction->UpdateEntity(&update_entity);
update_transaction->ExecuteAsynchronously(); update_transaction->ExecuteAsynchronously();
auto update_status = update_transaction->WaitForIt(); auto update_status = update_transaction->WaitForIt();
EXPECT_TRUE(update_status.IsTerminated()); EXPECT_TRUE(update_status.IsTerminated());
EXPECT_FALSE(update_status.IsError()); EXPECT_FALSE(update_status.IsError());
},
"update_status.IsError");
} }
/* /*
...@@ -190,10 +186,7 @@ TEST_F(test_issues, server_issue_174) { ...@@ -190,10 +186,7 @@ TEST_F(test_issues, server_issue_174) {
auto insert_status = insert_transaction->WaitForIt(); auto insert_status = insert_transaction->WaitForIt();
ASSERT_TRUE(insert_status.IsTerminated()); ASSERT_TRUE(insert_status.IsTerminated());
// TODO(tf) Remove the EXPECT_NONFATAL_FAILURE after fixing #174. // TODO(tf) Remove the EXPECT_NONFATAL_FAILURE after fixing #174.
EXPECT_NONFATAL_FAILURE( EXPECT_NONFATAL_FAILURE(EXPECT_FALSE(insert_status.IsError()), "");
EXPECT_FALSE(insert_status.IsError())
, "");
} }
} // namespace caosdb::transaction } // namespace caosdb::transaction
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <gtest/gtest-message.h> // for Message #include <gtest/gtest-message.h> // for Message
#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver #include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver
#include <gtest/gtest_pred_impl.h> // for Test, EXPECT_EQ, AssertionResult #include <gtest/gtest_pred_impl.h> // for Test, EXPECT_EQ, AssertionResult
#include <iostream> #include <iostream> // for cout
#include <memory> // for unique_ptr, allocator, __shar... #include <memory> // for unique_ptr, allocator, __shar...
#include <string> // for string #include <string> // for string
#include <vector> // for vector #include <vector> // for vector
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment