1 files changed, 20 insertions, 18 deletions

diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index 82c713d..7d9ad24 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -3,10 +3,11 @@
 #include <QString>
 
 #include "dummyresource/resourcefactory.h"
-#include "clientapi.h"
+#include "store.h"
 #include "commands.h"
 #include "entitybuffer.h"
 #include "resourceconfig.h"
+#include "resourcecontrol.h"
 #include "modelresult.h"
 #include "pipeline.h"
 #include "log.h"
@@ -19,6 +20,9 @@
 class DummyResourceTest : public QObject
 {
     Q_OBJECT
+
+    QTime time;
+
 private Q_SLOTS:
     void initTestCase()
     {
@@ -29,20 +33,18 @@ private Q_SLOTS:
         ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
     }
 
-    void cleanup()
-    {
-        Sink::Store::shutdown(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
-        DummyResource::removeFromDisk("org.kde.dummy.instance1");
-        auto factory = Sink::ResourceFactory::load("org.kde.dummy");
-        QVERIFY(factory);
-        Sink::Store::start(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
-    }
-
     void init()
     {
         qDebug();
         qDebug() << "-----------------------------------------";
         qDebug();
+        time.start();
+    }
+
+    void cleanup()
+    {
+        qDebug() << "Test took " << time.elapsed();
+        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
     }
 
     void testProperty()
@@ -64,7 +66,7 @@ private Q_SLOTS:
         query.resources << "org.kde.dummy.instance1";
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         query.propertyFilter.insert("uid", "testuid");
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
@@ -88,7 +90,7 @@ private Q_SLOTS:
         query.resources << "org.kde.dummy.instance1";
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         query.propertyFilter.insert("uid", "testuid");
 
@@ -116,7 +118,7 @@ private Q_SLOTS:
         query.resources << "org.kde.dummy.instance1";
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         query.propertyFilter.insert("summary", "summaryValue2");
 
@@ -150,7 +152,7 @@ private Q_SLOTS:
 
         //Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
         QTRY_VERIFY(model->rowCount(QModelIndex()) >= 1);
@@ -167,7 +169,7 @@ private Q_SLOTS:
 
         //Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
         QTRY_VERIFY(model->rowCount(QModelIndex()) >= 1);
@@ -190,7 +192,7 @@ private Q_SLOTS:
         query.propertyFilter.insert("uid", "testuid");
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         //Test create
         Sink::ApplicationDomain::Event event2;
@@ -209,7 +211,7 @@ private Q_SLOTS:
         Sink::Store::modify<Sink::ApplicationDomain::Event>(event2).exec().waitForFinished();
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         //Test modify
         {
@@ -224,7 +226,7 @@ private Q_SLOTS:
         Sink::Store::remove<Sink::ApplicationDomain::Event>(event2).exec().waitForFinished();
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         //Test remove
         {