1 files changed, 5 insertions, 6 deletions

diff --git a/tests/modelinteractivitytest.cpp b/tests/modelinteractivitytest.cpp
index 14c9fd0..3f6e697 100644
--- a/tests/modelinteractivitytest.cpp
+++ b/tests/modelinteractivitytest.cpp
@@ -4,7 +4,8 @@
 #include <iostream>
 
 #include "dummyresource/resourcefactory.h"
-#include "clientapi.h"
+#include "store.h"
+#include "resourcecontrol.h"
 #include "commands.h"
 #include "resourceconfig.h"
 #include "log.h"
@@ -46,15 +47,13 @@ private Q_SLOTS:
     void initTestCase()
     {
         Sink::Log::setDebugOutputLevel(Sink::Log::Warning);
-        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");
-        Sink::Store::start(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
     }
 
     void init()
@@ -75,7 +74,7 @@ private Q_SLOTS:
         query.resources << "org.kde.dummy.instance1";
         query.liveQuery = true;
 
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         //Test
         QTime time;