WIP: consolidation

test/test_transaction.cpp

@@ -19,7 +19,7 @@
  *
  */
 #include "caosdb/connection.h" // for Connection, ConnectionManager
-#include "caosdb/data_type.h" // for AtomicDataType
+#include "caosdb/data_type.h"  // for AtomicDataType
 #include "caosdb/entity.h"     // for Entity, Messages, Message
 #include "caosdb/file_transmission/FileWriter.h" // for FileWriter
 #include "caosdb/message_code.h"       // for ENTITY_DOES_NOT_EXIST, Messag...
@@ -38,13 +38,13 @@
 
 namespace fs = boost::filesystem;
 namespace caosdb::transaction {
-using caosdb::entity::Importance;
-using caosdb::entity::Role;
 using caosdb::entity::AtomicDataType;
 using caosdb::entity::Entity;
+using caosdb::entity::Importance;
 using caosdb::entity::MessageCode;
 using caosdb::entity::Parent;
 using caosdb::entity::Property;
+using caosdb::entity::Role;
 
 class test_transaction : public ::testing::Test {
 protected:
@@ -81,30 +81,6 @@ protected:
   }
 };
 
-TEST_F(test_transaction, DISABLED_retrieve_manufacturer_by_id) {
-  const auto &connection =
-    caosdb::connection::ConnectionManager::GetDefaultConnection();
-
-  const auto *id = "107";
-  const auto *role = "RecordType";
-  const auto *name = "Manufacturer";
-  const auto *description = "A generic manufacturer of all kinds of products";
-  const auto *version = "0bea8f7b17f0130fa5701a6c3849b9f8bfa0651b";
-
-  auto transaction(connection->CreateTransaction());
-  transaction->RetrieveById(id);
-  transaction->Execute();
-
-  const auto &result_set = transaction->GetResultSet();
-
-  const auto &entity = result_set.at(0);
-  EXPECT_EQ(id, entity.GetId());
-  EXPECT_EQ(name, entity.GetName());
-  EXPECT_EQ(role, entity.GetRole());
-  EXPECT_EQ(description, entity.GetDescription());
-  EXPECT_EQ(version, entity.GetVersionId());
-}
-
 TEST_F(test_transaction, retrieve_non_existing) {
   const auto &connection =
     caosdb::connection::ConnectionManager::GetDefaultConnection();
@@ -667,7 +643,7 @@ TEST_F(test_transaction, test_file_upload) {
     caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   Entity file;
-  file.SetRole("File");
+  file.SetRole(Role::FILE);
   file.SetFilePath("test.txt");
   file.SetLocalPath(test_upload_file_1);
 
@@ -692,7 +668,7 @@ TEST_F(test_transaction, test_file_download) {
     caosdb::connection::ConnectionManager::GetDefaultConnection();
 
   Entity file;
-  file.SetRole("File");
+  file.SetRole(Role::FILE);
   file.SetFilePath("test.txt");
   file.SetLocalPath(test_upload_file_1);