Avoid shutdowns where we can.

4 files changed, 8 insertions, 21 deletions

diff --git a/common/clientapi.h b/common/clientapi.h
index 45c5390..19d42e0 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -111,7 +111,9 @@ public:
     static void removeFromDisk(const QByteArray &resourceIdentifier);
 
     /**
-     * Removes a resource from disk.
+     * Removes all resource data from disk.
+     * 
+     * This will not touch the configuration. All commands that that arrived at the resource before this command will be dropped. All commands that arrived later will be executed.
      */
     static KAsync::Job<void> removeDataFromDisk(const QByteArray &resourceIdentifier);
 
diff --git a/tests/inspectiontest.cpp b/tests/inspectiontest.cpp
index c876aa9..70806fa 100644
--- a/tests/inspectiontest.cpp
+++ b/tests/inspectiontest.cpp
@@ -21,17 +21,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()
diff --git a/tests/modelinteractivitytest.cpp b/tests/modelinteractivitytest.cpp
index 14c9fd0..7b7d131 100644
--- a/tests/modelinteractivitytest.cpp
+++ b/tests/modelinteractivitytest.cpp
@@ -46,15 +46,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()
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 62db15b..cac81c5 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -23,17 +23,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()