diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp index caada0dac083bd4c32cf2e5bc65d051b00d48e88..f57b1fe6a0550f5940a8385f4af0db223f1bf9b6 100644 --- a/test/test_transaction.cpp +++ b/test/test_transaction.cpp @@ -27,9 +27,10 @@ #include "gtest/gtest-message.h" // for Message #include "gtest/gtest-test-part.h" // for TestPartResult, SuiteApiResolver #include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, AssertionResult -#include <memory> // for unique_ptr, allocator, __shar... -#include <string> // for string -#include <vector> // for vector +#include <iostream> +#include <memory> // for unique_ptr, allocator, __shar... +#include <string> // for string +#include <vector> // for vector namespace caosdb::transaction { using caosdb::entity::Entity; using caosdb::entity::MessageCode; @@ -421,15 +422,18 @@ TEST_F(test_transaction, test_multi_retrieve) { auto status = transaction->WaitForIt(); ASSERT_TRUE(status.IsTerminated()); - ASSERT_FALSE(status.IsError()); + // Should have an error since entity 22 doesn't exist + ASSERT_TRUE(status.IsError()); const auto &result_set = transaction->GetResultSet(); EXPECT_EQ(result_set.size(), 3); EXPECT_EQ(result_set.at(1).GetId(), "21"); EXPECT_EQ(result_set.at(1).GetName(), "unit"); + // Exists so should be fine ... EXPECT_FALSE(result_set.at(1).HasErrors()); + // ... but this does not EXPECT_EQ(result_set.at(2).GetId(), "22"); EXPECT_TRUE(result_set.at(2).HasErrors()); EXPECT_EQ(result_set.at(2).GetErrors().At(0).GetCode(), @@ -537,10 +541,14 @@ TEST_F(test_transaction, test_query) { EXPECT_TRUE((query_transaction->GetCountResult() < 0)); auto count_query_trans(connection->CreateTransaction()); + std::cout << "Creating count query ..." << std::endl; count_query_trans->Query("COUNT ENTITY WITH id = " + new_entity.GetId()); + std::cout << "Executing count query ..." << std::endl; count_query_trans->Execute(); // No result set in a count query + std::cout << "Checking count query result set..." << std::endl; EXPECT_EQ(count_query_trans->GetResultSet().size(), 0); + std::cout << "Checking count query result ..." << std::endl; EXPECT_EQ(count_query_trans->GetCountResult(), 1); } @@ -562,8 +570,8 @@ TEST_F(test_transaction, test_query_with_retrieve) { ASSERT_TRUE(insert_rt1_status.IsTerminated()); ASSERT_FALSE(insert_rt1_status.IsError()); - const auto &insert_rt1_results = - dynamic_cast<const MultiResultSet &>(insert_rt1_transaction->GetResultSet()); + const auto &insert_rt1_results = dynamic_cast<const MultiResultSet &>( + insert_rt1_transaction->GetResultSet()); const auto &inserted_rt1 = insert_rt1_results.at(0); EXPECT_FALSE(inserted_rt1.GetId().empty()); @@ -583,8 +591,8 @@ TEST_F(test_transaction, test_query_with_retrieve) { ASSERT_TRUE(insert_rt2_status.IsTerminated()); ASSERT_FALSE(insert_rt2_status.IsError()); - const auto &insert_rt2_results = - dynamic_cast<const MultiResultSet &>(insert_rt2_transaction->GetResultSet()); + const auto &insert_rt2_results = dynamic_cast<const MultiResultSet &>( + insert_rt2_transaction->GetResultSet()); const auto &inserted_rt2 = insert_rt2_results.at(0); EXPECT_FALSE(inserted_rt2.GetId().empty()); @@ -604,8 +612,8 @@ TEST_F(test_transaction, test_query_with_retrieve) { ASSERT_TRUE(insert_rt3_status.IsTerminated()); ASSERT_FALSE(insert_rt3_status.IsError()); - const auto &insert_rt3_results = - dynamic_cast<const MultiResultSet &>(insert_rt3_transaction->GetResultSet()); + const auto &insert_rt3_results = dynamic_cast<const MultiResultSet &>( + insert_rt3_transaction->GetResultSet()); const auto &inserted_rt3 = insert_rt3_results.at(0); EXPECT_FALSE(inserted_rt3.GetId().empty());