Wrap references in a Reerence type.

This allows us to make sure that references are not taken out of
context (the resource).
Because we need to use the type-specific accessors more we also ran into
a problem that we cannot "downcast" a reference with the change
recording still working, for that we have the cast<T>() operator now.

5 files changed, 38 insertions, 48 deletions

diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 4a33d17..4afe328 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -148,7 +148,7 @@ private slots:
         auto facade = TestDummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade();
         auto folder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
         auto subfolder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
-        subfolder->setProperty("parent", "id");
+        subfolder->setParent("id");
         facade->results << folder << subfolder;
         ResourceConfig::addResource("dummyresource.instance1", "dummyresource");
 
@@ -170,7 +170,7 @@ private slots:
         auto facade = TestDummyResourceFacade<Sink::ApplicationDomain::Folder>::registerFacade();
         auto folder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
         auto subfolder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("resource", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
-        subfolder->setProperty("parent", "id");
+        subfolder->setParent("id");
         facade->results << folder << subfolder;
         ResourceConfig::addResource("dummyresource.instance1", "dummyresource");
 
@@ -192,7 +192,7 @@ private slots:
         auto folder = QSharedPointer<Sink::ApplicationDomain::Folder>::create("dummyresource.instance1", "id", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
         auto subfolder =
             QSharedPointer<Sink::ApplicationDomain::Folder>::create("dummyresource.instance1", "subId", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
-        subfolder->setProperty("parent", "id");
+        subfolder->setParent("id");
         facade->results << folder << subfolder;
         ResourceConfig::addResource("dummyresource.instance1", "dummyresource");
 
diff --git a/tests/domainadaptortest.cpp b/tests/domainadaptortest.cpp
index 4fd04db..a17152e 100644
--- a/tests/domainadaptortest.cpp
+++ b/tests/domainadaptortest.cpp
@@ -110,6 +110,7 @@ private slots:
         Sink::ApplicationDomain::Mail mail;
         mail.setExtractedSubject("summary");
         mail.setMimeMessage("foobar");
+        mail.setFolder("folder");
 
         flatbuffers::FlatBufferBuilder metadataFbb;
         auto metadataBuilder = Sink::MetadataBuilder(metadataFbb);
@@ -134,6 +135,7 @@ private slots:
             Sink::ApplicationDomain::Mail readMail{QByteArray{}, QByteArray{}, 0, adaptor};
             QCOMPARE(readMail.getSubject(), mail.getSubject());
             QCOMPARE(readMail.getMimeMessage(), mail.getMimeMessage());
+            QCOMPARE(readMail.getFolder(), mail.getFolder());
         }
 
     }
diff --git a/tests/mailquerybenchmark.cpp b/tests/mailquerybenchmark.cpp
index 702239d..0e2f6fa 100644
--- a/tests/mailquerybenchmark.cpp
+++ b/tests/mailquerybenchmark.cpp
@@ -69,11 +69,11 @@ class MailQueryBenchmark : public QObject
         const auto date = QDateTime::currentDateTimeUtc();
         for (int i = 0; i < count; i++) {
             auto domainObject = Mail::Ptr::create();
-            domainObject->setProperty("uid", "uid");
-            domainObject->setProperty("subject", QString("subject%1").arg(i));
-            domainObject->setProperty("date", date.addSecs(count));
-            domainObject->setProperty("folder", "folder1");
-            // domainObject->setProperty("attachment", attachment);
+            domainObject->setUid("uid");
+            domainObject->setExtractedSubject(QString("subject%1").arg(i));
+            domainObject->setExtractedDate(date.addSecs(count));
+            domainObject->setFolder("folder1");
+            // domainObject->setAttachment(attachment);
             const auto command = createCommand<Mail>(*domainObject, *domainTypeAdaptorFactory);
             pipeline->newEntity(command.data(), command.size());
         }
diff --git a/tests/pipelinebenchmark.cpp b/tests/pipelinebenchmark.cpp
index 2e614ef..341c733 100644
--- a/tests/pipelinebenchmark.cpp
+++ b/tests/pipelinebenchmark.cpp
@@ -73,10 +73,10 @@ class PipelineBenchmark : public QObject
         const auto date = QDateTime::currentDateTimeUtc();
         for (int i = 0; i < count; i++) {
             auto domainObject = Sink::ApplicationDomain::Mail::Ptr::create();
-            domainObject->setProperty("uid", "uid");
-            domainObject->setProperty("subject", QString("subject%1").arg(i));
-            domainObject->setProperty("date", date.addSecs(count));
-            domainObject->setProperty("folder", "folder1");
+            domainObject->setUid("uid");
+            domainObject->setExtractedSubject(QString("subject%1").arg(i));
+            domainObject->setExtractedDate(date.addSecs(count));
+            domainObject->setFolder("folder1");
             // domainObject->setProperty("attachment", attachment);
             const auto command = createCommand<Sink::ApplicationDomain::Mail>(*domainObject, *domainTypeAdaptorFactory);
             pipeline->newEntity(command.data(), command.size());
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 2eb1239..574e68d 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -228,25 +228,13 @@ private slots:
     {
         // Setup
         {
-            Folder folder("sink.dummy.instance1");
-            Sink::Store::create<Folder>(folder).exec().waitForFinished();
-
-            Sink::Query query;
-            query.resourceFilter("sink.dummy.instance1");
-
+            auto folder = ApplicationDomainType::createEntity<Folder>("sink.dummy.instance1");
+            VERIFYEXEC(Sink::Store::create<Folder>(folder));
+            auto subfolder = ApplicationDomainType::createEntity<Folder>("sink.dummy.instance1");
+            subfolder.setParent(folder.identifier());
+            VERIFYEXEC(Sink::Store::create<Folder>(subfolder));
             // Ensure all local data is processed
             VERIFYEXEC(Sink::ResourceControl::flushMessageQueue(QByteArrayList() << "sink.dummy.instance1"));
-
-            auto model = Sink::Store::loadModel<Folder>(query);
-            QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
-            QCOMPARE(model->rowCount(), 1);
-
-            auto folderEntity = model->index(0, 0).data(Sink::Store::DomainObjectRole).value<Folder::Ptr>();
-            QVERIFY(!folderEntity->identifier().isEmpty());
-
-            Folder subfolder("sink.dummy.instance1");
-            subfolder.setProperty("parent", folderEntity->identifier());
-            Sink::Store::create<Folder>(subfolder).exec().waitForFinished();
         }
 
         // Test
@@ -271,14 +259,14 @@ private slots:
         // Setup
         {
             Mail mail("sink.dummy.instance1");
-            mail.setProperty("uid", "test1");
+            mail.setUid("test1");
             mail.setProperty("sender", "doe@example.org");
             Sink::Store::create<Mail>(mail).exec().waitForFinished();
         }
 
         {
             Mail mail("sink.dummy.instance1");
-            mail.setProperty("uid", "test2");
+            mail.setUid("test2");
             mail.setProperty("sender", "doe@example.org");
             Sink::Store::create<Mail>(mail).exec().waitForFinished();
         }
@@ -319,8 +307,8 @@ private slots:
             QVERIFY(!folderEntity->identifier().isEmpty());
 
             Mail mail("sink.dummy.instance1");
-            mail.setProperty("uid", "test1");
-            mail.setProperty("folder", folderEntity->identifier());
+            mail.setUid("test1");
+            mail.setFolder(folderEntity->identifier());
             Sink::Store::create<Mail>(mail).exec().waitForFinished();
         }
 
@@ -363,18 +351,18 @@ private slots:
             QVERIFY(!folderEntity->identifier().isEmpty());
 
             Mail mail("sink.dummy.instance1");
-            mail.setProperty("uid", "test1");
-            mail.setProperty("folder", folderEntity->identifier());
+            mail.setUid("test1");
+            mail.setFolder(folderEntity->identifier());
             Sink::Store::create<Mail>(mail).exec().waitForFinished();
 
             Mail mail1("sink.dummy.instance1");
-            mail1.setProperty("uid", "test1");
-            mail1.setProperty("folder", "foobar");
+            mail1.setUid("test1");
+            mail1.setFolder("foobar");
             Sink::Store::create<Mail>(mail1).exec().waitForFinished();
 
             Mail mail2("sink.dummy.instance1");
-            mail2.setProperty("uid", "test2");
-            mail2.setProperty("folder", folderEntity->identifier());
+            mail2.setUid("test2");
+            mail2.setFolder(folderEntity->identifier());
             Sink::Store::create<Mail>(mail2).exec().waitForFinished();
         }
 
@@ -417,23 +405,23 @@ private slots:
             const auto date = QDateTime(QDate(2015, 7, 7), QTime(12, 0));
             {
                 Mail mail("sink.dummy.instance1");
-                mail.setProperty("uid", "testSecond");
-                mail.setProperty("folder", folderEntity->identifier());
-                mail.setProperty("date", date.addDays(-1));
+                mail.setUid("testSecond");
+                mail.setFolder(folderEntity->identifier());
+                mail.setExtractedDate(date.addDays(-1));
                 Sink::Store::create<Mail>(mail).exec().waitForFinished();
             }
             {
                 Mail mail("sink.dummy.instance1");
-                mail.setProperty("uid", "testLatest");
-                mail.setProperty("folder", folderEntity->identifier());
-                mail.setProperty("date", date);
+                mail.setUid("testLatest");
+                mail.setFolder(folderEntity->identifier());
+                mail.setExtractedDate(date);
                 Sink::Store::create<Mail>(mail).exec().waitForFinished();
             }
             {
                 Mail mail("sink.dummy.instance1");
-                mail.setProperty("uid", "testLast");
-                mail.setProperty("folder", folderEntity->identifier());
-                mail.setProperty("date", date.addDays(-2));
+                mail.setUid("testLast");
+                mail.setFolder(folderEntity->identifier());
+                mail.setExtractedDate(date.addDays(-2));
                 Sink::Store::create<Mail>(mail).exec().waitForFinished();
             }
         }