1 files changed, 5 insertions, 13 deletions

diff --git a/tests/inspectiontest.cpp b/tests/inspectiontest.cpp
index c876aa9..79e5863 100644
--- a/tests/inspectiontest.cpp
+++ b/tests/inspectiontest.cpp
@@ -3,7 +3,8 @@
 #include <QString>
 
 #include "dummyresource/resourcefactory.h"
-#include "clientapi.h"
+#include "store.h"
+#include "resourcecontrol.h"
 #include "resourceconfig.h"
 #include "log.h"
 
@@ -21,17 +22,8 @@ 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");
-    }
-
-    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 testInspection_data()
@@ -50,8 +42,8 @@ private Q_SLOTS:
         Mail mail(QByteArray("org.kde.dummy.instance1"), QByteArray("identifier"), 0, QSharedPointer<MemoryBufferAdaptor::MemoryBufferAdaptor>::create());
 
         //testInspection is a magic property that the dummyresource supports
-        auto inspectionCommand = Resources::Inspection::PropertyInspection(mail, "testInspection", success);
-        auto result = Resources::inspect<Mail>(inspectionCommand).exec();
+        auto inspectionCommand = ResourceControl::Inspection::PropertyInspection(mail, "testInspection", success);
+        auto result = ResourceControl::inspect<Mail>(inspectionCommand).exec();
         result.waitForFinished();
         if (success) {
             QVERIFY(!result.errorCode());