From d76b8d6948e96d790538808d68269c5ab1f9965f Mon Sep 17 00:00:00 2001
From: florian <f.spreckelsen@inidscale.com>
Date: Thu, 12 Aug 2021 15:54:32 +0200
Subject: [PATCH] DRAFT: Remove UniqueResult from int tests
---
test/test_transaction.cpp | 110 +++++++++++++++++++-------------------
1 file changed, 55 insertions(+), 55 deletions(-)
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index b186b90..caada0d 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -46,7 +46,7 @@ protected:
auto query_transaction(connection->CreateTransaction());
query_transaction->Query("FIND ENTITY WITH id > 99");
query_transaction->Execute();
- if (query_transaction->GetResultSet().Size() > 0) {
+ if (query_transaction->GetResultSet().size() > 0) {
auto delete_transaction(connection->CreateTransaction());
for (const Entity &entity : query_transaction->GetResultSet()) {
delete_transaction->DeleteById(entity.GetId());
@@ -71,9 +71,9 @@ TEST_F(test_transaction, DISABLED_retrieve_manufacturer_by_id) {
transaction->Execute();
const auto &result_set =
- dynamic_cast<const UniqueResult &>(transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(transaction->GetResultSet());
- const auto &entity = result_set.GetEntity();
+ const auto &entity = result_set.at(0);
EXPECT_EQ(id, entity.GetId());
EXPECT_EQ(name, entity.GetName());
EXPECT_EQ(role, entity.GetRole());
@@ -96,9 +96,9 @@ TEST_F(test_transaction, retrieve_non_existing) {
ASSERT_EQ(status.GetCode(), StatusCode::GENERIC_TRANSACTION_ERROR);
const auto &result_set =
- dynamic_cast<const UniqueResult &>(transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(transaction->GetResultSet());
- const auto &entity = result_set.GetEntity();
+ const auto &entity = result_set.at(0);
EXPECT_EQ(id, entity.GetId());
EXPECT_TRUE(entity.HasErrors());
ASSERT_EQ(entity.GetErrors().Size(), 1);
@@ -124,9 +124,9 @@ TEST_F(test_transaction, insert_without_delete) {
ASSERT_FALSE(insert_status.IsError());
const auto &insert_result_set =
- dynamic_cast<const UniqueResult &>(insert_transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(insert_transaction->GetResultSet());
- const auto &new_entity = insert_result_set.GetEntity();
+ const auto &new_entity = insert_result_set.at(0);
EXPECT_FALSE(new_entity.GetId().empty());
EXPECT_FALSE(new_entity.HasErrors());
// Should have a warning since it has no properties
@@ -154,9 +154,9 @@ TEST_F(test_transaction, insert_delete) {
ASSERT_FALSE(insert_status.IsError());
const auto &insert_result_set =
- dynamic_cast<const UniqueResult &>(insert_transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(insert_transaction->GetResultSet());
- const auto &new_entity = insert_result_set.GetEntity();
+ const auto &new_entity = insert_result_set.at(0);
EXPECT_FALSE(new_entity.GetId().empty());
EXPECT_FALSE(new_entity.HasErrors());
// Should have a warning since it has no properties
@@ -176,9 +176,9 @@ TEST_F(test_transaction, insert_delete) {
ASSERT_FALSE(delete_status.IsError());
const auto &delete_result_set =
- dynamic_cast<const UniqueResult &>(delete_transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(delete_transaction->GetResultSet());
- const auto &deleted_entity = delete_result_set.GetEntity();
+ const auto &deleted_entity = delete_result_set.at(0);
EXPECT_EQ(deleted_entity.GetId(), new_entity.GetId());
EXPECT_FALSE(deleted_entity.HasErrors());
}
@@ -201,9 +201,9 @@ TEST_F(test_transaction, insert_delete_with_parent) {
ASSERT_FALSE(insert_status.IsError());
const auto &insert_result_set =
- dynamic_cast<const UniqueResult &>(insert_transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(insert_transaction->GetResultSet());
- const auto &inserted_rt = insert_result_set.GetEntity();
+ const auto &inserted_rt = insert_result_set.at(0);
Entity rec;
rec.SetRole("Record");
@@ -224,9 +224,9 @@ TEST_F(test_transaction, insert_delete_with_parent) {
ASSERT_FALSE(rec_insert_status.IsError());
const auto &rec_result_set =
- dynamic_cast<const UniqueResult &>(rec_transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(rec_transaction->GetResultSet());
- const auto &inserted_rec = rec_result_set.GetEntity();
+ const auto &inserted_rec = rec_result_set.at(0);
EXPECT_FALSE(inserted_rec.GetId().empty());
@@ -241,8 +241,8 @@ TEST_F(test_transaction, insert_delete_with_parent) {
ASSERT_FALSE(rec_retrieve_status.IsError());
const auto &retrieve_result_set =
- dynamic_cast<const UniqueResult &>(retrieve_transaction->GetResultSet());
- const auto &retrieved_rec = retrieve_result_set.GetEntity();
+ dynamic_cast<const MultiResultSet &>(retrieve_transaction->GetResultSet());
+ const auto &retrieved_rec = retrieve_result_set.at(0);
EXPECT_EQ(retrieved_rec.GetName(), rec.GetName());
EXPECT_EQ(retrieved_rec.GetParents().Size(), 1);
@@ -290,9 +290,9 @@ TEST_F(test_transaction, insert_delete_with_property) {
ASSERT_FALSE(prop_insert_status.IsError());
const auto &prop_result_set =
- dynamic_cast<const UniqueResult &>(prop_insertion->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(prop_insertion->GetResultSet());
- const auto &inserted_prop = prop_result_set.GetEntity();
+ const auto &inserted_prop = prop_result_set.at(0);
EXPECT_FALSE(inserted_prop.GetId().empty());
// create and insert record type with the above property
@@ -317,9 +317,9 @@ TEST_F(test_transaction, insert_delete_with_property) {
ASSERT_FALSE(rt_insert_status.IsError());
const auto &rt_result_set =
- dynamic_cast<const UniqueResult &>(rt_insertion->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(rt_insertion->GetResultSet());
- const auto &inserted_rt = rt_result_set.GetEntity();
+ const auto &inserted_rt = rt_result_set.at(0);
EXPECT_FALSE(inserted_rt.GetId().empty());
// retrieve inserted rt for testing
@@ -332,9 +332,9 @@ TEST_F(test_transaction, insert_delete_with_property) {
ASSERT_FALSE(rt_retrieve_status.IsError());
const auto &rt_retrieve_results =
- dynamic_cast<const UniqueResult &>(rt_retrieval->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(rt_retrieval->GetResultSet());
- const auto &retrieved_rt = rt_retrieve_results.GetEntity();
+ const auto &retrieved_rt = rt_retrieve_results.at(0);
EXPECT_EQ(inserted_rt.GetId(), retrieved_rt.GetId());
EXPECT_EQ(rt.GetName(), retrieved_rt.GetName());
EXPECT_EQ(rt.GetDescription(), retrieved_rt.GetDescription());
@@ -373,9 +373,9 @@ TEST_F(test_transaction, insert_delete_with_property) {
ASSERT_FALSE(rec_insert_status.IsError());
const auto &rec_result_set =
- dynamic_cast<const UniqueResult &>(rec_insertion->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(rec_insertion->GetResultSet());
- const auto &inserted_rec = rec_result_set.GetEntity();
+ const auto &inserted_rec = rec_result_set.at(0);
EXPECT_FALSE(inserted_rec.GetId().empty());
// Retrieve the record and verify paretn and property
@@ -388,9 +388,9 @@ TEST_F(test_transaction, insert_delete_with_property) {
ASSERT_FALSE(rec_retrieve_status.IsError());
const auto &rec_retrieve_results =
- dynamic_cast<const UniqueResult &>(rec_retrieval->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(rec_retrieval->GetResultSet());
- const auto &retrieved_rec = rec_retrieve_results.GetEntity();
+ const auto &retrieved_rec = rec_retrieve_results.at(0);
EXPECT_EQ(rec.GetName(), retrieved_rec.GetName());
EXPECT_EQ(inserted_rec.GetId(), retrieved_rec.GetId());
EXPECT_EQ(retrieved_rec.GetParents().Size(), 1);
@@ -425,14 +425,14 @@ TEST_F(test_transaction, test_multi_retrieve) {
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");
- EXPECT_FALSE(result_set.At(1).HasErrors());
+ EXPECT_EQ(result_set.size(), 3);
+ EXPECT_EQ(result_set.at(1).GetId(), "21");
+ EXPECT_EQ(result_set.at(1).GetName(), "unit");
+ EXPECT_FALSE(result_set.at(1).HasErrors());
- 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(),
+ 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(),
MessageCode::ENTITY_DOES_NOT_EXIST);
}
@@ -455,9 +455,9 @@ TEST_F(test_transaction, insert_update_delete) {
ASSERT_FALSE(insert_status.IsError());
const auto &insert_result_set =
- dynamic_cast<const UniqueResult &>(insert_transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(insert_transaction->GetResultSet());
- const auto &new_entity = insert_result_set.GetEntity();
+ const auto &new_entity = insert_result_set.at(0);
EXPECT_FALSE(new_entity.GetId().empty());
EXPECT_FALSE(new_entity.HasErrors());
@@ -468,7 +468,7 @@ TEST_F(test_transaction, insert_update_delete) {
// UPDATE
auto update_transaction(connection->CreateTransaction());
- auto update_entity(retrieve_transaction->GetResultSet().At(0));
+ auto update_entity(retrieve_transaction->GetResultSet().at(0));
update_entity.SetName("RT1-Update");
update_transaction->UpdateEntity(&update_entity);
@@ -478,8 +478,8 @@ TEST_F(test_transaction, insert_update_delete) {
ASSERT_TRUE(update_status.IsTerminated());
ASSERT_FALSE(update_status.IsError());
- EXPECT_EQ(update_transaction->GetResultSet().Size(), 1);
- const auto &updated_entity = update_transaction->GetResultSet().At(0);
+ EXPECT_EQ(update_transaction->GetResultSet().size(), 1);
+ const auto &updated_entity = update_transaction->GetResultSet().at(0);
EXPECT_EQ(updated_entity.GetId(), new_entity.GetId());
EXPECT_FALSE(updated_entity.HasErrors());
@@ -496,9 +496,9 @@ TEST_F(test_transaction, insert_update_delete) {
ASSERT_FALSE(delete_status.IsError());
const auto &delete_result_set =
- dynamic_cast<const UniqueResult &>(delete_transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(delete_transaction->GetResultSet());
- const auto &deleted_entity = delete_result_set.GetEntity();
+ const auto &deleted_entity = delete_result_set.at(0);
EXPECT_EQ(deleted_entity.GetId(), new_entity.GetId());
EXPECT_FALSE(deleted_entity.HasErrors());
}
@@ -521,17 +521,17 @@ TEST_F(test_transaction, test_query) {
ASSERT_FALSE(insert_status.IsError());
const auto &insert_result_set =
- dynamic_cast<const UniqueResult &>(insert_transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(insert_transaction->GetResultSet());
- const auto &new_entity = insert_result_set.GetEntity();
+ const auto &new_entity = insert_result_set.at(0);
EXPECT_FALSE(new_entity.GetId().empty());
EXPECT_FALSE(new_entity.HasErrors());
auto query_transaction(connection->CreateTransaction());
query_transaction->Query("FIND ENTITY WITH id = " + new_entity.GetId());
query_transaction->Execute();
- EXPECT_EQ(query_transaction->GetResultSet().Size(), 1);
- EXPECT_EQ(query_transaction->GetResultSet().At(0).GetId(),
+ EXPECT_EQ(query_transaction->GetResultSet().size(), 1);
+ EXPECT_EQ(query_transaction->GetResultSet().at(0).GetId(),
new_entity.GetId());
// No count query, so no count result should be present
EXPECT_TRUE((query_transaction->GetCountResult() < 0));
@@ -540,7 +540,7 @@ TEST_F(test_transaction, test_query) {
count_query_trans->Query("COUNT ENTITY WITH id = " + new_entity.GetId());
count_query_trans->Execute();
// No result set in a count query
- EXPECT_EQ(count_query_trans->GetResultSet().Size(), 0);
+ EXPECT_EQ(count_query_trans->GetResultSet().size(), 0);
EXPECT_EQ(count_query_trans->GetCountResult(), 1);
}
@@ -563,9 +563,9 @@ TEST_F(test_transaction, test_query_with_retrieve) {
ASSERT_FALSE(insert_rt1_status.IsError());
const auto &insert_rt1_results =
- dynamic_cast<const UniqueResult &>(insert_rt1_transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(insert_rt1_transaction->GetResultSet());
- const auto &inserted_rt1 = insert_rt1_results.GetEntity();
+ const auto &inserted_rt1 = insert_rt1_results.at(0);
EXPECT_FALSE(inserted_rt1.GetId().empty());
EXPECT_FALSE(inserted_rt1.HasErrors());
@@ -584,9 +584,9 @@ TEST_F(test_transaction, test_query_with_retrieve) {
ASSERT_FALSE(insert_rt2_status.IsError());
const auto &insert_rt2_results =
- dynamic_cast<const UniqueResult &>(insert_rt2_transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(insert_rt2_transaction->GetResultSet());
- const auto &inserted_rt2 = insert_rt2_results.GetEntity();
+ const auto &inserted_rt2 = insert_rt2_results.at(0);
EXPECT_FALSE(inserted_rt2.GetId().empty());
EXPECT_FALSE(inserted_rt2.HasErrors());
@@ -605,9 +605,9 @@ TEST_F(test_transaction, test_query_with_retrieve) {
ASSERT_FALSE(insert_rt3_status.IsError());
const auto &insert_rt3_results =
- dynamic_cast<const UniqueResult &>(insert_rt3_transaction->GetResultSet());
+ dynamic_cast<const MultiResultSet &>(insert_rt3_transaction->GetResultSet());
- const auto &inserted_rt3 = insert_rt3_results.GetEntity();
+ const auto &inserted_rt3 = insert_rt3_results.at(0);
EXPECT_FALSE(inserted_rt3.GetId().empty());
EXPECT_FALSE(inserted_rt3.HasErrors());
@@ -622,7 +622,7 @@ TEST_F(test_transaction, test_query_with_retrieve) {
ASSERT_FALSE(find_status.IsError());
const auto &find_results = find_transaction->GetResultSet();
- EXPECT_EQ(find_results.Size(), 3);
+ EXPECT_EQ(find_results.size(), 3);
// only retrieve rt1 and rt2 by id
const std::vector<std::string> ids = {inserted_rt1.GetId(),
@@ -640,7 +640,7 @@ TEST_F(test_transaction, test_query_with_retrieve) {
ASSERT_FALSE(find_and_retrieve_status.IsError());
const auto &result_set_a = find_and_retrieve->GetResultSet();
- EXPECT_EQ(result_set_a.Size(), 3);
+ EXPECT_EQ(result_set_a.size(), 3);
// retrieve rt1 and rt2 by ID and count all TestRTs
auto count_and_retrieve(connection->CreateTransaction());
@@ -655,7 +655,7 @@ TEST_F(test_transaction, test_query_with_retrieve) {
const auto &result_set_b = count_and_retrieve->GetResultSet();
// TODO(fspreck) Re-enable once we implemented this
- // EXPECT_EQ(result_set_b.Size(), 2);
+ // EXPECT_EQ(result_set_b.size(), 2);
EXPECT_EQ(count_and_retrieve->GetCountResult(), 3);
}
--
GitLab