diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp index 75c79abd18a98abe27802c3a1ecc414dba1e7efd..1ba10ac1422f4f30bee8f6c77165b32e925c2751 100644 --- a/test/test_transaction.cpp +++ b/test/test_transaction.cpp @@ -327,18 +327,19 @@ TEST_F(test_transaction, insert_delete_with_property) { prop_double_ent.SetName("TestDoubleProperty"); prop_double_ent.SetDataType(AtomicDataType::DOUBLE); - prop_insertion = connection->CreateTransaction(); - prop_insertion->InsertEntity(&prop_double_ent); - prop_insertion->ExecuteAsynchronously(); + auto prop_double_insertion = connection->CreateTransaction(); + prop_double_insertion->InsertEntity(&prop_double_ent); + prop_double_insertion->ExecuteAsynchronously(); - prop_insert_status = prop_insertion->WaitForIt(); + prop_insert_status = prop_double_insertion->WaitForIt(); ASSERT_TRUE(prop_insert_status.IsTerminated()); ASSERT_FALSE(prop_insert_status.IsError()); - const auto &prop_double_result_set = prop_insertion->GetResultSet(); + const auto &prop_double_result_set = prop_double_insertion->GetResultSet(); const auto &inserted_prop_double = prop_double_result_set.at(0); + EXPECT_FALSE(inserted_prop_double.GetId().empty()); // create and insert record type with the above properties @@ -388,16 +389,16 @@ TEST_F(test_transaction, insert_delete_with_property) { EXPECT_EQ(inserted_rt.GetId(), retrieved_rt.GetId()); EXPECT_EQ(rt.GetName(), retrieved_rt.GetName()); EXPECT_EQ(rt.GetDescription(), retrieved_rt.GetDescription()); - EXPECT_EQ(retrieved_rt.GetProperties().size(), 1); + EXPECT_EQ(retrieved_rt.GetProperties().size(), 2); const Property *retrieved_prop_rt = nullptr; // get by name is not possible yet - if (retrieved_rt.GetProperties().at(0).GetName() == prop_ent.GetName()) { + if (retrieved_rt.GetProperties().at(0).GetName() == prop_rt.GetName()) { retrieved_prop_rt = &retrieved_rt.GetProperties().at(0); } else { retrieved_prop_rt = &retrieved_rt.GetProperties().at(1); } - EXPECT_EQ(retrieved_prop_rt->GetName(), prop_ent.GetName()); + EXPECT_EQ(retrieved_prop_rt->GetName(), prop_rt.GetName()); EXPECT_EQ(retrieved_prop_rt->GetId(), inserted_prop.GetId()); EXPECT_EQ(retrieved_prop_rt->GetDataType(), prop_ent.GetDataType()); EXPECT_EQ(retrieved_prop_rt->GetImportance(), prop_rt.GetImportance()); @@ -454,7 +455,7 @@ TEST_F(test_transaction, insert_delete_with_property) { EXPECT_EQ(rec.GetName(), retrieved_rec.GetName()); EXPECT_EQ(inserted_rec.GetId(), retrieved_rec.GetId()); EXPECT_EQ(retrieved_rec.GetParents().size(), 1); - EXPECT_EQ(retrieved_rec.GetProperties().size(), 1); + EXPECT_EQ(retrieved_rec.GetProperties().size(), 2); const auto &retrieved_parent_rec = retrieved_rec.GetParents().at(0); EXPECT_EQ(retrieved_parent_rec.GetName(), rt.GetName());