2 files changed, 32 insertions, 29 deletions

diff --git a/tests/accountstest.cpp b/tests/accountstest.cpp
index e0a99c2..260602c 100644
--- a/tests/accountstest.cpp
+++ b/tests/accountstest.cpp
@@ -22,8 +22,8 @@ private slots:
 
     void init()
     {
-        ConfigStore("accounts").clear();
-        ConfigStore("resources").clear();
+        ConfigStore("accounts", "type").clear();
+        ConfigStore("resources", Sink::ApplicationDomain::SinkResource::ResourceType::name).clear();
     }
 
     void testLoad()
@@ -34,17 +34,17 @@ private slots:
         QString accountName("name");
         QString accountIcon("icon");
         auto account = ApplicationDomainType::createEntity<SinkAccount>();
-        account.setProperty("type", "maildir");
-        account.setProperty("name", accountName);
-        account.setProperty("icon", accountIcon);
+        account.setAccountType("maildir");
+        account.setName(accountName);
+        account.setIcon(accountIcon);
         Store::create(account).exec().waitForFinished();
 
         Store::fetchAll<SinkAccount>(Query()).syncThen<void, QList<SinkAccount::Ptr>>([&](const QList<SinkAccount::Ptr> &accounts) {
             QCOMPARE(accounts.size(), 1);
             auto account = accounts.first();
-            QCOMPARE(account->getProperty("type").toString(), QString("maildir"));
-            QCOMPARE(account->getProperty("name").toString(), accountName);
-            QCOMPARE(account->getProperty("icon").toString(), accountIcon);
+            QCOMPARE(account->getAccountType(), QString("maildir"));
+            QCOMPARE(account->getName(), accountName);
+            QCOMPARE(account->getIcon(), accountIcon);
         })
         .exec().waitForFinished();
 
@@ -52,8 +52,8 @@ private slots:
         QString smtpUsername("smtpUsername");
         QString smtpPassword("smtpPassword");
         auto resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "sink.mailtransport");
-        resource.setProperty("account", account.identifier());
+        resource.setResourceType("sink.mailtransport");
+        resource.setAccount(account);
         resource.setProperty("server", smtpServer);
         resource.setProperty("username", smtpUsername);
         resource.setProperty("password", smtpPassword);
@@ -63,7 +63,7 @@ private slots:
         Store::fetchAll<SinkResource>(Query()).syncThen<void, QList<SinkResource::Ptr>>([&](const QList<SinkResource::Ptr> &resources) {
             QCOMPARE(resources.size(), 1);
             auto resource = resources.first();
-            QCOMPARE(resource->getProperty("type").toString(), QString("sink.mailtransport"));
+            QCOMPARE(resource->getResourceType(), QByteArray("sink.mailtransport"));
             QCOMPARE(resource->getProperty("server").toString(), smtpServer);
         })
         .exec().waitForFinished();
diff --git a/tests/resourceconfigtest.cpp b/tests/resourceconfigtest.cpp
index 70a37f0..c06b0fb 100644
--- a/tests/resourceconfigtest.cpp
+++ b/tests/resourceconfigtest.cpp
@@ -11,6 +11,9 @@
 #include "test.h"
 #include "testutils.h"
 
+using namespace Sink;
+using namespace Sink::ApplicationDomain;
+
 /**
  * Test of the resource configuration.
  */
@@ -31,43 +34,43 @@ private slots:
         ResourceConfig::clear();
         Sink::FacadeFactory::instance().registerStaticFacades();
 
-        Sink::ApplicationDomain::SinkResource res("", "dummyresource.identifier1", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+        SinkResource res("", "dummyresource.identifier1", 0, QSharedPointer<MemoryBufferAdaptor>::create());
         res.setProperty("identifier", "dummyresource.identifier1");
-        res.setProperty("type", "dummyresource");
+        res.setProperty(SinkResource::ResourceType::name, "dummyresource");
 
         Sink::Store::create(res).exec().waitForFinished();
         {
             Sink::Query query;
-            query.filter("type", Sink::Query::Comparator("dummyresource"));
-            auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkResource>(query);
+            query.filter<SinkResource::ResourceType>("dummyresource");
+            auto model = Sink::Store::loadModel<SinkResource>(query);
             QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
         }
 
         Sink::Store::remove(res).exec().waitForFinished();
         {
             Sink::Query query;
-            query.filter("type", Sink::Query::Comparator("dummyresource"));
-            auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkResource>(query);
+            query.filter<SinkResource::ResourceType>("dummyresource");
+            auto model = Sink::Store::loadModel<SinkResource>(query);
             QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
             QCOMPARE(model->rowCount(QModelIndex()), 0);
         }
     }
 
-    void testLoadResourceByCapabiity()
+    void testLoadResourceByCapability()
     {
         ResourceConfig::clear();
         Sink::FacadeFactory::instance().registerStaticFacades();
 
-        Sink::ApplicationDomain::SinkResource res("", "dummyresource.identifier1", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+        SinkResource res("", "dummyresource.identifier1", 0, QSharedPointer<MemoryBufferAdaptor>::create());
         res.setProperty("identifier", "dummyresource.identifier1");
-        res.setProperty("type", "dummyresource");
-        res.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << "foo"));
+        res.setResourceType("dummyresource");
+        res.setCapabilities(QByteArrayList() << "foo");
 
         Sink::Store::create(res).exec().waitForFinished();
         {
             Sink::Query query;
-            query.filter("type", Sink::Query::Comparator("dummyresource"));
-            auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkResource>(Sink::Query::CapabilityFilter("foo"));
+            query.filter<SinkResource::ResourceType>("dummyresource");
+            auto model = Sink::Store::loadModel<SinkResource>(Query().containsFilter<SinkResource::Capabilities>("foo"));
             QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
         }
 
@@ -79,20 +82,20 @@ private slots:
         ResourceConfig::clear();
         Sink::FacadeFactory::instance().registerStaticFacades();
 
-        auto res = Sink::ApplicationDomain::DummyResource::create("");
+        auto res = DummyResource::create("");
         VERIFYEXEC(Sink::Store::create(res));
         {
             Sink::Query query;
             query.liveQuery = true;
-            query.request<Sink::ApplicationDomain::SinkResource::Status>();
-            auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkResource>(query);
+            query.request<SinkResource::Status>();
+            auto model = Sink::Store::loadModel<SinkResource>(query);
             QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
-            auto resource = model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::SinkResource::Ptr>();
-            QCOMPARE(resource->getStatus(), static_cast<int>(Sink::ApplicationDomain::OfflineStatus));
+            auto resource = model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<SinkResource::Ptr>();
+            QCOMPARE(resource->getStatus(), static_cast<int>(OfflineStatus));
 
             //Synchronize to connect
             VERIFYEXEC(Sink::Store::synchronize(query));
-            QTRY_COMPARE(model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::SinkResource::Ptr>()->getStatus(), static_cast<int>(Sink::ApplicationDomain::ConnectedStatus));
+            QTRY_COMPARE(model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<SinkResource::Ptr>()->getStatus(), static_cast<int>(ConnectedStatus));
         }
 
         VERIFYEXEC(Sink::Store::remove(res));