1 files changed, 10 insertions, 13 deletions

diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 62db15b..16376b9 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -3,7 +3,8 @@
 #include <QString>
 
 #include "dummyresource/resourcefactory.h"
-#include "clientapi.h"
+#include "store.h"
+#include "resourcecontrol.h"
 #include "commands.h"
 #include "resourceconfig.h"
 #include "log.h"
@@ -23,17 +24,13 @@ private Q_SLOTS:
         Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
         auto factory = Sink::ResourceFactory::load("org.kde.dummy");
         QVERIFY(factory);
-        DummyResource::removeFromDisk("org.kde.dummy.instance1");
         ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
+        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
     }
 
     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();
+        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
     }
 
     void init()
@@ -90,7 +87,7 @@ private Q_SLOTS:
         query.liveQuery = false;
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         //We fetch after the data is available and don't rely on the live query mechanism to deliver the actual data
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
@@ -165,7 +162,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();
 
             auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
             QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
@@ -185,7 +182,7 @@ private Q_SLOTS:
         query.parentProperty = "parent";
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         //We fetch after the data is available and don't rely on the live query mechanism to deliver the actual data
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
@@ -214,7 +211,7 @@ private Q_SLOTS:
         query.propertyFilter.insert("uid", "test1");
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         //We fetch before the data is available and rely on the live query mechanism to deliver the actual data
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
@@ -234,7 +231,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();
 
             auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
             QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
@@ -255,7 +252,7 @@ private Q_SLOTS:
         query.propertyFilter.insert("folder", folderEntity->identifier());
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         //We fetch before the data is available and rely on the live query mechanism to deliver the actual data
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);