Merge branch 'f-extended-c' into f-consolidation

test/test_transaction.cpp

@@ -328,6 +328,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
   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());
   EXPECT_EQ(retrieved_rt.GetProperties().size(), 1);
 
   const auto &retrieved_prop_rt = retrieved_rt.GetProperties().at(0);
@@ -420,6 +421,7 @@ TEST_F(test_transaction, test_multi_retrieve) {
   // 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(),
@@ -529,9 +531,7 @@ TEST_F(test_transaction, test_query) {
   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);
 }