F files

test/test_transaction.cpp

@@ -18,18 +18,26 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/connection.h"         // for Connection, ConnectionManager
-#include "caosdb/entity.h"             // for Entity, Messages, Message
+#include "caosdb/connection.h" // for Connection, ConnectionManager
+#include "caosdb/entity.h"     // for Entity, Messages, Message
+#include "caosdb/file_transmission/file_reader.h" // for FileReader
+#include "caosdb/file_transmission/file_writer.h" // for FileWriter
 #include "caosdb/message_code.h"       // for ENTITY_DOES_NOT_EXIST, Messag...
 #include "caosdb/status_code.h"        // for SUCCESS, StatusCode
-#include "caosdb/transaction.h"        // for Entity, Transaction, UniqueRe...
+#include "caosdb/transaction.h"        // for Entity, Transaction,...
 #include "caosdb/transaction_status.h" // for TransactionStatus, StatusCode
-#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 <boost/filesystem/operations.hpp>  // for remove
+#include <boost/filesystem/path.hpp>        // for path
+#include <boost/filesystem/path_traits.hpp> // for filesystem
+#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 <iostream>
+#include <memory> // for unique_ptr, allocator, __shar...
+#include <string> // for string
+#include <vector> // for vector
+
+namespace fs = boost::filesystem;
 namespace caosdb::transaction {
 using caosdb::entity::Entity;
 using caosdb::entity::MessageCode;
@@ -38,15 +46,30 @@ using caosdb::entity::Property;
 
 class test_transaction : public ::testing::Test {
 protected:
-  void SetUp() override {}
+  fs::path test_upload_file_1;
+  fs::path test_download_file_1;
+
+  void SetUp() override {
+    test_upload_file_1 = fs::path("test_upload_file_1_delete_me.dat");
+    test_download_file_1 = fs::path("test_download_file_1_delete_me.dat");
+
+    FileWriter writer(test_upload_file_1);
+    std::string buffer(1024, 'c');
+    for (int i = 0; i < 8; i++) {
+      writer.write(buffer);
+    }
+  }
 
   void TearDown() override {
+    fs::remove(test_upload_file_1);
+    fs::remove(test_download_file_1);
+
     const auto &connection =
-      caosdb::connection::ConnectionManager::GetDefaultConnection();
+        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) {
+    if (query_transaction->GetResultSet().size() > 0) {
       auto delete_transaction(connection->CreateTransaction());
       for (const Entity &entity : query_transaction->GetResultSet()) {
         delete_transaction->DeleteById(entity.GetId());
@@ -58,7 +81,7 @@ protected:
 
 TEST_F(test_transaction, DISABLED_retrieve_manufacturer_by_id) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   const auto *id = "107";
   const auto *role = "RecordType";
@@ -70,10 +93,9 @@ TEST_F(test_transaction, DISABLED_retrieve_manufacturer_by_id) {
   transaction->RetrieveById(id);
   transaction->Execute();
 
-  const auto &result_set =
-    dynamic_cast<const UniqueResult &>(transaction->GetResultSet());
+  const auto &result_set = 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());
@@ -83,7 +105,7 @@ TEST_F(test_transaction, DISABLED_retrieve_manufacturer_by_id) {
 
 TEST_F(test_transaction, retrieve_non_existing) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto transaction(connection->CreateTransaction());
 
@@ -95,20 +117,19 @@ TEST_F(test_transaction, retrieve_non_existing) {
   EXPECT_EQ(status.GetCode(), TransactionStatus::TRANSACTION_ERROR().GetCode());
   ASSERT_EQ(status.GetCode(), StatusCode::GENERIC_TRANSACTION_ERROR);
 
-  const auto &result_set =
-    dynamic_cast<const UniqueResult &>(transaction->GetResultSet());
+  const auto &result_set = 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);
-  EXPECT_EQ(entity.GetErrors().At(0).GetCode(),
+  ASSERT_EQ(entity.GetErrors().size(), 1);
+  EXPECT_EQ(entity.GetErrors().at(0).GetCode(),
             MessageCode::ENTITY_DOES_NOT_EXIST);
 }
 
 TEST_F(test_transaction, insert_without_delete) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insert_transaction(connection->CreateTransaction());
 
@@ -123,22 +144,21 @@ TEST_F(test_transaction, insert_without_delete) {
   ASSERT_TRUE(insert_status.IsTerminated());
   ASSERT_FALSE(insert_status.IsError());
 
-  const auto &insert_result_set =
-    dynamic_cast<const UniqueResult &>(insert_transaction->GetResultSet());
+  const auto &insert_result_set = 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
   EXPECT_TRUE(new_entity.HasWarnings());
-  EXPECT_EQ(new_entity.GetWarnings().Size(), 1);
-  EXPECT_EQ(new_entity.GetWarnings().At(0).GetCode(),
+  EXPECT_EQ(new_entity.GetWarnings().size(), 1);
+  EXPECT_EQ(new_entity.GetWarnings().at(0).GetCode(),
             MessageCode::ENTITY_HAS_NO_PROPERTIES);
 }
 
 TEST_F(test_transaction, insert_delete) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insert_transaction(connection->CreateTransaction());
 
@@ -153,16 +173,15 @@ TEST_F(test_transaction, insert_delete) {
   ASSERT_TRUE(insert_status.IsTerminated());
   ASSERT_FALSE(insert_status.IsError());
 
-  const auto &insert_result_set =
-    dynamic_cast<const UniqueResult &>(insert_transaction->GetResultSet());
+  const auto &insert_result_set = 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
   EXPECT_TRUE(new_entity.HasWarnings());
-  EXPECT_EQ(new_entity.GetWarnings().Size(), 1);
-  EXPECT_EQ(new_entity.GetWarnings().At(0).GetCode(),
+  EXPECT_EQ(new_entity.GetWarnings().size(), 1);
+  EXPECT_EQ(new_entity.GetWarnings().at(0).GetCode(),
             MessageCode::ENTITY_HAS_NO_PROPERTIES);
 
   auto delete_transaction(connection->CreateTransaction());
@@ -175,17 +194,16 @@ TEST_F(test_transaction, insert_delete) {
   ASSERT_TRUE(delete_status.IsTerminated());
   ASSERT_FALSE(delete_status.IsError());
 
-  const auto &delete_result_set =
-    dynamic_cast<const UniqueResult &>(delete_transaction->GetResultSet());
+  const auto &delete_result_set = 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());
 }
 
 TEST_F(test_transaction, insert_delete_with_parent) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insert_transaction(connection->CreateTransaction());
 
@@ -200,10 +218,9 @@ TEST_F(test_transaction, insert_delete_with_parent) {
   ASSERT_TRUE(insert_status.IsTerminated());
   ASSERT_FALSE(insert_status.IsError());
 
-  const auto &insert_result_set =
-    dynamic_cast<const UniqueResult &>(insert_transaction->GetResultSet());
+  const auto &insert_result_set = 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");
@@ -223,10 +240,9 @@ TEST_F(test_transaction, insert_delete_with_parent) {
   ASSERT_TRUE(rec_insert_status.IsTerminated());
   ASSERT_FALSE(rec_insert_status.IsError());
 
-  const auto &rec_result_set =
-    dynamic_cast<const UniqueResult &>(rec_transaction->GetResultSet());
+  const auto &rec_result_set = 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());
 
@@ -240,14 +256,13 @@ TEST_F(test_transaction, insert_delete_with_parent) {
   ASSERT_TRUE(rec_retrieve_status.IsTerminated());
   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();
+  const auto &retrieve_result_set = 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);
-  EXPECT_EQ(retrieved_rec.GetParents().At(0).GetId(), inserted_rt.GetId());
-  EXPECT_EQ(retrieved_rec.GetParents().At(0).GetName(), rt.GetName());
+  EXPECT_EQ(retrieved_rec.GetParents().size(), 1);
+  EXPECT_EQ(retrieved_rec.GetParents().at(0).GetId(), inserted_rt.GetId());
+  EXPECT_EQ(retrieved_rec.GetParents().at(0).GetName(), rt.GetName());
 
   auto rec_deletion(connection->CreateTransaction());
 
@@ -272,7 +287,7 @@ TEST_F(test_transaction, insert_delete_with_parent) {
 
 TEST_F(test_transaction, insert_delete_with_property) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   // Create and insert property
   Entity prop_ent;
@@ -289,10 +304,9 @@ TEST_F(test_transaction, insert_delete_with_property) {
   ASSERT_TRUE(prop_insert_status.IsTerminated());
   ASSERT_FALSE(prop_insert_status.IsError());
 
-  const auto &prop_result_set =
-    dynamic_cast<const UniqueResult &>(prop_insertion->GetResultSet());
+  const auto &prop_result_set = 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
@@ -304,6 +318,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
   Entity rt;
   rt.SetRole("RecordType");
   rt.SetName("TestRT");
+  rt.SetDescription("Some description");
   rt.AppendProperty(prop_rt);
 
   auto rt_insertion(connection->CreateTransaction());
@@ -315,10 +330,9 @@ TEST_F(test_transaction, insert_delete_with_property) {
   ASSERT_TRUE(rt_insert_status.IsTerminated());
   ASSERT_FALSE(rt_insert_status.IsError());
 
-  const auto &rt_result_set =
-    dynamic_cast<const UniqueResult &>(rt_insertion->GetResultSet());
+  const auto &rt_result_set = 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
@@ -330,15 +344,15 @@ TEST_F(test_transaction, insert_delete_with_property) {
   ASSERT_TRUE(rt_retrieve_status.IsTerminated());
   ASSERT_FALSE(rt_retrieve_status.IsError());
 
-  const auto &rt_retrieve_results =
-    dynamic_cast<const UniqueResult &>(rt_retrieval->GetResultSet());
+  const auto &rt_retrieve_results = 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(retrieved_rt.GetProperties().Size(), 1);
+  EXPECT_EQ(rt.GetDescription(), retrieved_rt.GetDescription());
+  EXPECT_EQ(retrieved_rt.GetProperties().size(), 1);
 
-  const auto &retrieved_prop_rt = retrieved_rt.GetProperties().At(0);
+  const auto &retrieved_prop_rt = retrieved_rt.GetProperties().at(0);
   EXPECT_EQ(retrieved_prop_rt.GetName(), prop_ent.GetName());
   EXPECT_EQ(retrieved_prop_rt.GetId(), inserted_prop.GetId());
   EXPECT_EQ(retrieved_prop_rt.GetDatatype(), prop_ent.GetDatatype());
@@ -370,10 +384,9 @@ TEST_F(test_transaction, insert_delete_with_property) {
   ASSERT_TRUE(rec_insert_status.IsTerminated());
   ASSERT_FALSE(rec_insert_status.IsError());
 
-  const auto &rec_result_set =
-    dynamic_cast<const UniqueResult &>(rec_insertion->GetResultSet());
+  const auto &rec_result_set = 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
@@ -385,20 +398,20 @@ TEST_F(test_transaction, insert_delete_with_property) {
   ASSERT_TRUE(rec_retrieve_status.IsTerminated());
   ASSERT_FALSE(rec_retrieve_status.IsError());
 
-  const auto &rec_retrieve_results =
-    dynamic_cast<const UniqueResult &>(rec_retrieval->GetResultSet());
+  const auto &rec_retrieve_results = 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);
-  EXPECT_EQ(retrieved_rec.GetProperties().Size(), 1);
+  EXPECT_EQ(retrieved_rec.GetParents().size(), 1);
+  EXPECT_EQ(retrieved_rec.GetProperties().size(), 1);
 
-  const auto &retrieved_parent_rec = retrieved_rec.GetParents().At(0);
+  const auto &retrieved_parent_rec = retrieved_rec.GetParents().at(0);
   EXPECT_EQ(retrieved_parent_rec.GetName(), rt.GetName());
   EXPECT_EQ(retrieved_parent_rec.GetId(), inserted_rt.GetId());
+  EXPECT_EQ(retrieved_parent_rec.GetDescription(), rt.GetDescription());
 
-  const auto &retrieved_prop_rec = retrieved_rec.GetProperties().At(0);
+  const auto &retrieved_prop_rec = retrieved_rec.GetProperties().at(0);
   EXPECT_EQ(retrieved_prop_rec.GetName(), prop_ent.GetName());
   EXPECT_EQ(retrieved_prop_rec.GetId(), inserted_prop.GetId());
   EXPECT_EQ(retrieved_prop_rec.GetDatatype(), prop_ent.GetDatatype());
@@ -407,7 +420,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
 
 TEST_F(test_transaction, test_multi_retrieve) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto transaction(connection->CreateTransaction());
 
@@ -418,24 +431,27 @@ 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");
-  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");
+  // Exists so should be fine ...
+  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(),
+  // ... 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(),
             MessageCode::ENTITY_DOES_NOT_EXIST);
 }
 
 TEST_F(test_transaction, insert_update_delete) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   // INSERT
   auto insert_transaction(connection->CreateTransaction());
@@ -451,10 +467,9 @@ TEST_F(test_transaction, insert_update_delete) {
   ASSERT_TRUE(insert_status.IsTerminated());
   ASSERT_FALSE(insert_status.IsError());
 
-  const auto &insert_result_set =
-    dynamic_cast<const UniqueResult &>(insert_transaction->GetResultSet());
+  const auto &insert_result_set = 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());
 
@@ -465,7 +480,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);
@@ -475,8 +490,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());
@@ -492,17 +507,16 @@ TEST_F(test_transaction, insert_update_delete) {
   ASSERT_TRUE(delete_status.IsTerminated());
   ASSERT_FALSE(delete_status.IsError());
 
-  const auto &delete_result_set =
-    dynamic_cast<const UniqueResult &>(delete_transaction->GetResultSet());
+  const auto &delete_result_set = 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());
 }
 
 TEST_F(test_transaction, test_query) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   auto insert_transaction(connection->CreateTransaction());
 
@@ -517,33 +531,34 @@ TEST_F(test_transaction, test_query) {
   ASSERT_TRUE(insert_status.IsTerminated());
   ASSERT_FALSE(insert_status.IsError());
 
-  const auto &insert_result_set =
-    dynamic_cast<const UniqueResult &>(insert_transaction->GetResultSet());
+  const auto &insert_result_set = 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));
 
   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
-  EXPECT_EQ(count_query_trans->GetResultSet().Size(), 0);
+  EXPECT_EQ(count_query_trans->GetResultSet().size(), 0);
   EXPECT_EQ(count_query_trans->GetCountResult(), 1);
 }
 
 TEST_F(test_transaction, test_query_with_retrieve) {
   const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   // rt1
   Entity rt1;
@@ -559,10 +574,9 @@ 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 UniqueResult &>(insert_rt1_transaction->GetResultSet());
+  const auto &insert_rt1_results = 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());
 
@@ -580,10 +594,9 @@ 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 UniqueResult &>(insert_rt2_transaction->GetResultSet());
+  const auto &insert_rt2_results = 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());
 
@@ -601,10 +614,9 @@ 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 UniqueResult &>(insert_rt3_transaction->GetResultSet());
+  const auto &insert_rt3_results = 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());
 
@@ -619,7 +631,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(),
@@ -637,7 +649,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());
@@ -652,8 +664,85 @@ 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);
 }
 
+TEST_F(test_transaction, test_file_upload) {
+  const auto &connection =
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
+
+  Entity file;
+  file.SetRole("File");
+  file.SetFilePath("test.txt");
+  file.SetLocalPath(test_upload_file_1);
+
+  auto insert_transaction(connection->CreateTransaction());
+  insert_transaction->InsertEntity(&file);
+  insert_transaction->ExecuteAsynchronously();
+
+  auto insert_status = insert_transaction->WaitForIt();
+
+  ASSERT_TRUE(insert_status.IsTerminated());
+  EXPECT_EQ(insert_status.GetCode(), StatusCode::SUCCESS);
+
+  const auto &insert_results = insert_transaction->GetResultSet();
+
+  const auto &inserted_file = insert_results.at(0);
+  EXPECT_FALSE(inserted_file.GetId().empty());
+  EXPECT_FALSE(inserted_file.HasErrors());
+
+  // Check file once more
+  auto count_query(connection->CreateTransaction());
+  count_query->Query("COUNT FILE WHICH IS STORED AT 'test.txt'");
+  count_query->ExecuteAsynchronously();
+  auto count_and_retrieve_status = count_query->WaitForIt();
+  ASSERT_TRUE(count_and_retrieve_status.IsTerminated());
+  ASSERT_FALSE(count_and_retrieve_status.IsError());
+  EXPECT_EQ(count_query->GetCountResult(), 1);
+}
+
+TEST_F(test_transaction, test_file_up_n_download) {
+  const auto &connection =
+      caosdb::connection::ConnectionManager::GetDefaultConnection();
+
+  Entity file;
+  file.SetRole("File");
+  file.SetFilePath("test.txt");
+  file.SetLocalPath(test_upload_file_1);
+
+  auto insert_transaction(connection->CreateTransaction());
+  insert_transaction->InsertEntity(&file);
+  insert_transaction->Execute();
+
+  const auto &insert_results = insert_transaction->GetResultSet();
+
+  const auto &inserted_file = insert_results.at(0);
+  ASSERT_FALSE(inserted_file.GetId().empty());
+  ASSERT_FALSE(inserted_file.HasErrors());
+
+  auto download_transaction(connection->CreateTransaction());
+  download_transaction->RetrieveAndDownloadFilesById(
+      inserted_file.GetId(), test_download_file_1.string());
+  download_transaction->ExecuteAsynchronously();
+  ASSERT_EQ(download_transaction->WaitForIt().GetCode(), StatusCode::SUCCESS);
+
+  const auto &download_results = download_transaction->GetResultSet();
+  ASSERT_EQ(download_results.size(), 1);
+
+  const auto &downloaded_file = download_results.at(0);
+  ASSERT_FALSE(downloaded_file.GetId().empty());
+  ASSERT_FALSE(downloaded_file.HasErrors());
+  EXPECT_EQ(downloaded_file.GetLocalPath().string(),
+            test_download_file_1.string());
+
+  FileReader reader_remote(test_upload_file_1);
+  std::string buffer_local(1024, 'c');
+  std::string buffer_remote(1024, 'c');
+  for (int i = 0; i < 8; i++) {
+    reader_remote.read(buffer_remote);
+    EXPECT_EQ(buffer_remote, buffer_local);
+  }
+}
+
 } // namespace caosdb::transaction