Skip to content
Snippets Groups Projects
Verified Commit 50955570 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

WIP: consolidation

parent 7ff53664
No related branches found
No related tags found
1 merge request!9F consolidation
This commit is part of merge request !9. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
test/test_transaction.cpp
+ 20
− 41
View file @ 50955570
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* *
*/ */
#include "caosdb/connection.h" // for Connection, ConnectionManager #include "caosdb/connection.h" // for Connection, ConnectionManager
#include "caosdb/data_type.h" // for AtomicDataType
#include "caosdb/entity.h" // for Entity, Messages, Message #include "caosdb/entity.h" // for Entity, Messages, Message
#include "caosdb/message_code.h" // for ENTITY_DOES_NOT_EXIST, Messag... #include "caosdb/message_code.h" // for ENTITY_DOES_NOT_EXIST, Messag...
#include "caosdb/status_code.h" // for SUCCESS, StatusCode #include "caosdb/status_code.h" // for SUCCESS, StatusCode
...@@ -31,6 +32,9 @@ ...@@ -31,6 +32,9 @@
#include <string> // for string #include <string> // for string
#include <vector> // for vector #include <vector> // for vector
namespace caosdb::transaction { namespace caosdb::transaction {
using caosdb::entity::Importance;
using caosdb::entity::Role;
using caosdb::entity::AtomicDataType;
using caosdb::entity::Entity; using caosdb::entity::Entity;
using caosdb::entity::MessageCode; using caosdb::entity::MessageCode;
using caosdb::entity::Parent; using caosdb::entity::Parent;
...@@ -56,31 +60,6 @@ protected: ...@@ -56,31 +60,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 =
dynamic_cast<const UniqueResult &>(transaction->GetResultSet());
const auto &entity = result_set.GetEntity();
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) { TEST_F(test_transaction, retrieve_non_existing) {
const auto &connection = const auto &connection =
caosdb::connection::ConnectionManager::GetDefaultConnection(); caosdb::connection::ConnectionManager::GetDefaultConnection();
...@@ -113,7 +92,7 @@ TEST_F(test_transaction, insert_without_delete) { ...@@ -113,7 +92,7 @@ TEST_F(test_transaction, insert_without_delete) {
auto insert_transaction(connection->CreateTransaction()); auto insert_transaction(connection->CreateTransaction());
Entity entity; Entity entity;
entity.SetRole("RecordType"); entity.SetRole(Role::RECORD_TYPE);
entity.SetName("RT1"); entity.SetName("RT1");
insert_transaction->InsertEntity(&entity); insert_transaction->InsertEntity(&entity);
insert_transaction->ExecuteAsynchronously(); insert_transaction->ExecuteAsynchronously();
...@@ -143,7 +122,7 @@ TEST_F(test_transaction, insert_delete) { ...@@ -143,7 +122,7 @@ TEST_F(test_transaction, insert_delete) {
auto insert_transaction(connection->CreateTransaction()); auto insert_transaction(connection->CreateTransaction());
Entity entity; Entity entity;
entity.SetRole("RecordType"); entity.SetRole(Role::RECORD_TYPE);
entity.SetName("RT1"); entity.SetName("RT1");
insert_transaction->InsertEntity(&entity); insert_transaction->InsertEntity(&entity);
insert_transaction->ExecuteAsynchronously(); insert_transaction->ExecuteAsynchronously();
...@@ -190,7 +169,7 @@ TEST_F(test_transaction, insert_delete_with_parent) { ...@@ -190,7 +169,7 @@ TEST_F(test_transaction, insert_delete_with_parent) {
auto insert_transaction(connection->CreateTransaction()); auto insert_transaction(connection->CreateTransaction());
Entity rt; Entity rt;
rt.SetRole("RecordType"); rt.SetRole(Role::RECORD_TYPE);
rt.SetName("TestRT"); rt.SetName("TestRT");
insert_transaction->InsertEntity(&rt); insert_transaction->InsertEntity(&rt);
insert_transaction->ExecuteAsynchronously(); insert_transaction->ExecuteAsynchronously();
...@@ -206,7 +185,7 @@ TEST_F(test_transaction, insert_delete_with_parent) { ...@@ -206,7 +185,7 @@ TEST_F(test_transaction, insert_delete_with_parent) {
const auto &inserted_rt = insert_result_set.GetEntity(); const auto &inserted_rt = insert_result_set.GetEntity();
Entity rec; Entity rec;
rec.SetRole("Record"); rec.SetRole(Role::RECORD);
rec.SetName("TestRec"); rec.SetName("TestRec");
Parent parent; Parent parent;
...@@ -276,9 +255,9 @@ TEST_F(test_transaction, insert_delete_with_property) { ...@@ -276,9 +255,9 @@ TEST_F(test_transaction, insert_delete_with_property) {
// Create and insert property // Create and insert property
Entity prop_ent; Entity prop_ent;
prop_ent.SetRole("Property"); prop_ent.SetRole(Role::PROPERTY);
prop_ent.SetName("TestProperty"); prop_ent.SetName("TestProperty");
prop_ent.SetDatatype("TEXT"); prop_ent.SetDataType(AtomicDataType::TEXT);
auto prop_insertion(connection->CreateTransaction()); auto prop_insertion(connection->CreateTransaction());
prop_insertion->InsertEntity(&prop_ent); prop_insertion->InsertEntity(&prop_ent);
...@@ -299,10 +278,10 @@ TEST_F(test_transaction, insert_delete_with_property) { ...@@ -299,10 +278,10 @@ TEST_F(test_transaction, insert_delete_with_property) {
Property prop_rt; Property prop_rt;
prop_rt.SetName(prop_ent.GetName()); prop_rt.SetName(prop_ent.GetName());
prop_rt.SetId(inserted_prop.GetId()); prop_rt.SetId(inserted_prop.GetId());
prop_rt.SetImportance("SUGGESTED"); prop_rt.SetImportance(Importance::SUGGESTED);
Entity rt; Entity rt;
rt.SetRole("RecordType"); rt.SetRole(Role::RECORD_TYPE);
rt.SetName("TestRT"); rt.SetName("TestRT");
rt.AppendProperty(prop_rt); rt.AppendProperty(prop_rt);
...@@ -341,7 +320,7 @@ TEST_F(test_transaction, insert_delete_with_property) { ...@@ -341,7 +320,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
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.GetName(), prop_ent.GetName());
EXPECT_EQ(retrieved_prop_rt.GetId(), inserted_prop.GetId()); EXPECT_EQ(retrieved_prop_rt.GetId(), inserted_prop.GetId());
EXPECT_EQ(retrieved_prop_rt.GetDatatype(), prop_ent.GetDatatype()); EXPECT_EQ(retrieved_prop_rt.GetDataType(), prop_ent.GetDataType());
EXPECT_EQ(retrieved_prop_rt.GetImportance(), prop_rt.GetImportance()); EXPECT_EQ(retrieved_prop_rt.GetImportance(), prop_rt.GetImportance());
// create and insert record of the above record type with a property // create and insert record of the above record type with a property
...@@ -357,7 +336,7 @@ TEST_F(test_transaction, insert_delete_with_property) { ...@@ -357,7 +336,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
Entity rec; Entity rec;
rec.SetName("TestRec"); rec.SetName("TestRec");
rec.SetRole("Record"); rec.SetRole(Role::RECORD);
rec.AppendParent(parent); rec.AppendParent(parent);
rec.AppendProperty(prop_rec); rec.AppendProperty(prop_rec);
...@@ -401,7 +380,7 @@ TEST_F(test_transaction, insert_delete_with_property) { ...@@ -401,7 +380,7 @@ TEST_F(test_transaction, insert_delete_with_property) {
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.GetName(), prop_ent.GetName());
EXPECT_EQ(retrieved_prop_rec.GetId(), inserted_prop.GetId()); EXPECT_EQ(retrieved_prop_rec.GetId(), inserted_prop.GetId());
EXPECT_EQ(retrieved_prop_rec.GetDatatype(), prop_ent.GetDatatype()); EXPECT_EQ(retrieved_prop_rec.GetDataType(), prop_ent.GetDataType());
EXPECT_EQ(retrieved_prop_rec.GetValue(), prop_rec.GetValue()); EXPECT_EQ(retrieved_prop_rec.GetValue(), prop_rec.GetValue());
} }
...@@ -441,7 +420,7 @@ TEST_F(test_transaction, insert_update_delete) { ...@@ -441,7 +420,7 @@ TEST_F(test_transaction, insert_update_delete) {
auto insert_transaction(connection->CreateTransaction()); auto insert_transaction(connection->CreateTransaction());
Entity entity; Entity entity;
entity.SetRole("RecordType"); entity.SetRole(Role::RECORD_TYPE);
entity.SetName("RT1"); entity.SetName("RT1");
insert_transaction->InsertEntity(&entity); insert_transaction->InsertEntity(&entity);
insert_transaction->ExecuteAsynchronously(); insert_transaction->ExecuteAsynchronously();
...@@ -507,7 +486,7 @@ TEST_F(test_transaction, test_query) { ...@@ -507,7 +486,7 @@ TEST_F(test_transaction, test_query) {
auto insert_transaction(connection->CreateTransaction()); auto insert_transaction(connection->CreateTransaction());
Entity entity; Entity entity;
entity.SetRole("RecordType"); entity.SetRole(Role::RECORD_TYPE);
entity.SetName("RT1"); entity.SetName("RT1");
insert_transaction->InsertEntity(&entity); insert_transaction->InsertEntity(&entity);
insert_transaction->ExecuteAsynchronously(); insert_transaction->ExecuteAsynchronously();
...@@ -547,7 +526,7 @@ TEST_F(test_transaction, test_query_with_retrieve) { ...@@ -547,7 +526,7 @@ TEST_F(test_transaction, test_query_with_retrieve) {
// rt1 // rt1
Entity rt1; Entity rt1;
rt1.SetRole("RecordType"); rt1.SetRole(Role::RECORD_TYPE);
rt1.SetName("TestRT1"); rt1.SetName("TestRT1");
auto insert_rt1_transaction(connection->CreateTransaction()); auto insert_rt1_transaction(connection->CreateTransaction());
...@@ -568,7 +547,7 @@ TEST_F(test_transaction, test_query_with_retrieve) { ...@@ -568,7 +547,7 @@ TEST_F(test_transaction, test_query_with_retrieve) {
// rt2 // rt2
Entity rt2; Entity rt2;
rt2.SetRole("RecordType"); rt2.SetRole(Role::RECORD_TYPE);
rt2.SetName("TestRT2"); rt2.SetName("TestRT2");
auto insert_rt2_transaction(connection->CreateTransaction()); auto insert_rt2_transaction(connection->CreateTransaction());
...@@ -589,7 +568,7 @@ TEST_F(test_transaction, test_query_with_retrieve) { ...@@ -589,7 +568,7 @@ TEST_F(test_transaction, test_query_with_retrieve) {
// rt3 // rt3
Entity rt3; Entity rt3;
rt3.SetRole("RecordType"); rt3.SetRole(Role::RECORD_TYPE);
rt3.SetName("TestRT3"); rt3.SetName("TestRT3");
auto insert_rt3_transaction(connection->CreateTransaction()); auto insert_rt3_transaction(connection->CreateTransaction());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment