Merge branch 'f-query' into f-files

test/test_transaction.cpp

@@ -41,11 +41,22 @@ protected:
   void SetUp() override {}
 
   void TearDown() override {
-    // TODO(tf): delete all created entities
+    const auto &connection =
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
+    auto query_transaction(connection->CreateTransaction());
+    query_transaction->Query("FIND ENTITY WITH id > 99");
+    query_transaction->Execute();
+    if (query_transaction->GetResultSet().Size() > 0) {
+      for (const Entity &entity : query_transaction->GetResultSet()) {
+        auto delete_transaction(connection->CreateTransaction());
+        delete_transaction->DeleteById(entity.GetId());
+        delete_transaction->Execute();
+      }
+    }
   }
 };
 
-TEST_F(test_transaction, DISABLED_retrieve_manufacturer_by_id) {
+TEST(test_transaction, DISABLED_retrieve_manufacturer_by_id) {
   const auto &connection =
     caosdb::connection::ConnectionManager::GetDefaultConnection();
 
@@ -70,7 +81,7 @@ TEST_F(test_transaction, DISABLED_retrieve_manufacturer_by_id) {
   EXPECT_EQ(version, entity.GetVersionId());
 }
 
-TEST_F(test_transaction, retrieve_non_existing) {
+TEST(test_transaction, retrieve_non_existing) {
   const auto &connection =
     caosdb::connection::ConnectionManager::GetDefaultConnection();
 
@@ -95,7 +106,7 @@ TEST_F(test_transaction, retrieve_non_existing) {
             MessageCode::ENTITY_DOES_NOT_EXIST);
 }
 
-TEST_F(test_transaction, insert_delete) {
+TEST(test_transaction, insert_delete) {
   const auto &connection =
     caosdb::connection::ConnectionManager::GetDefaultConnection();
 
@@ -142,7 +153,7 @@ TEST_F(test_transaction, insert_delete) {
   EXPECT_FALSE(deleted_entity.HasErrors());
 }
 
-TEST_F(test_transaction, insert_delete_with_parent) {
+TEST(test_transaction, insert_delete_with_parent) {
   const auto &connection =
     caosdb::connection::ConnectionManager::GetDefaultConnection();
 
@@ -393,7 +404,7 @@ TEST(test_transaction, insert_delete_with_property) {
   ASSERT_FALSE(prop_delete_status.IsError());
 }
 
-TEST_F(test_transaction, test_multi_retrieve) {
+TEST(test_transaction, test_multi_retrieve) {
   const auto &connection =
     caosdb::connection::ConnectionManager::GetDefaultConnection();
 
@@ -421,7 +432,7 @@ TEST_F(test_transaction, test_multi_retrieve) {
             MessageCode::ENTITY_DOES_NOT_EXIST);
 }
 
-TEST_F(test_transaction, insert_update_delete) {
+TEST(test_transaction, insert_update_delete) {
   const auto &connection =
     caosdb::connection::ConnectionManager::GetDefaultConnection();
 
@@ -488,7 +499,39 @@ TEST_F(test_transaction, insert_update_delete) {
   EXPECT_FALSE(deleted_entity.HasErrors());
 }
 
-// TODO(fspreck) Insert a Record with a parent and a Property. Check
-// for success and delete everything.
+TEST(test_transaction, test_query) {
+  const auto &connection =
+    caosdb::connection::ConnectionManager::GetDefaultConnection();
+
+  auto insert_transaction(connection->CreateTransaction());
+
+  Entity entity;
+  entity.SetRole("RecordType");
+  entity.SetName("RT1");
+  insert_transaction->InsertEntity(&entity);
+  insert_transaction->ExecuteAsynchronously();
+
+  auto insert_status = insert_transaction->WaitForIt();
+
+  ASSERT_TRUE(insert_status.IsTerminated());
+  ASSERT_FALSE(insert_status.IsError());
+
+  const auto &insert_result_set =
+    dynamic_cast<const UniqueResult &>(insert_transaction->GetResultSet());
+
+  const auto &new_entity = insert_result_set.GetEntity();
+  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(),
+            new_entity.GetId());
+}
+
+// TODO(fspreck) Add tests for unique queries, count queries, and mixed
+// transactions (FIND + RetrieveById, COUNT + RetrieveById).
 
 } // namespace caosdb::transaction