9 files changed, 15 insertions, 30 deletions

diff --git a/examples/imapresource/tests/imapmailsyncbenchmark.cpp b/examples/imapresource/tests/imapmailsyncbenchmark.cpp
index 824b769..a53c148 100644
--- a/examples/imapresource/tests/imapmailsyncbenchmark.cpp
+++ b/examples/imapresource/tests/imapmailsyncbenchmark.cpp
@@ -90,17 +90,12 @@ private slots:
 
     void cleanup()
     {
-        //TODO the shutdown job fails if the resource is already shut down
-        // VERIFYEXEC(ResourceControl::shutdown(mResourceInstanceIdentifier));
-        ResourceControl::shutdown(mResourceInstanceIdentifier).exec().waitForFinished();
+        VERIFYEXEC(ResourceControl::shutdown(mResourceInstanceIdentifier));
         removeResourceFromDisk(mResourceInstanceIdentifier);
     }
 
     void init()
     {
-        qDebug();
-        qDebug() << "-----------------------------------------";
-        qDebug();
         VERIFYEXEC(ResourceControl::start(mResourceInstanceIdentifier));
     }
 
diff --git a/examples/mailtransportresource/tests/mailtransporttest.cpp b/examples/mailtransportresource/tests/mailtransporttest.cpp
index e44aa23..410e17b 100644
--- a/examples/mailtransportresource/tests/mailtransporttest.cpp
+++ b/examples/mailtransportresource/tests/mailtransporttest.cpp
@@ -41,13 +41,12 @@ private slots:
 
     void cleanup()
     {
-        // VERIFYEXEC(ResourceControl::shutdown(mResourceInstanceIdentifier));
-        // removeResourceFromDisk(mResourceInstanceIdentifier);
+        VERIFYEXEC(ResourceControl::shutdown(mResourceInstanceIdentifier));
     }
 
     void init()
     {
-        // VERIFYEXEC(ResourceControl::start(mResourceInstanceIdentifier));
+        VERIFYEXEC(ResourceControl::start(mResourceInstanceIdentifier));
     }
 
     void testSendMail()
diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp
index 8c6afb4..d0ecef7 100644
--- a/tests/dummyresourcebenchmark.cpp
+++ b/tests/dummyresourcebenchmark.cpp
@@ -50,7 +50,7 @@ private slots:
     void testCommandResponsiveness()
     {
         // Test responsiveness including starting the process.
-        Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished();
+        VERIFYEXEC(Sink::Store::removeDataFromDisk("sink.dummy.instance1"));
 
         QTime time;
         time.start();
@@ -76,13 +76,13 @@ private slots:
         QTRY_VERIFY(gotNotification);
 
         QVERIFY2(duration < 100, QString::fromLatin1("Processing a create command took more than 100ms: %1").arg(duration).toLatin1());
-        Sink::ResourceControl::shutdown("sink.dummy.instance1").exec().waitForFinished();
+        VERIFYEXEC(Sink::ResourceControl::shutdown("sink.dummy.instance1"));
         qDebug() << "Single command took [ms]: " << duration;
     }
 
     void testWriteToFacade()
     {
-        Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished();
+        VERIFYEXEC(Sink::Store::removeDataFromDisk("sink.dummy.instance1"));
 
         QTime time;
         time.start();
@@ -147,7 +147,7 @@ private slots:
 
     void testWriteInProcess()
     {
-        Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished();
+        VERIFYEXEC(Sink::Store::removeDataFromDisk("sink.dummy.instance1"));
         QTime time;
         time.start();
 
@@ -235,7 +235,7 @@ private slots:
     // This allows to run individual parts without doing a cleanup, but still cleaning up normally
     void testCleanupForCompleteTest()
     {
-        Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished();
+        VERIFYEXEC(Sink::Store::removeDataFromDisk("sink.dummy.instance1"));
     }
 
 private:
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index 2ff31e5..be6e3a5 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -49,7 +49,7 @@ private slots:
     void cleanup()
     {
         qDebug() << "Test took " << time.elapsed();
-        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
+        VERIFYEXEC(Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")));
     }
 
     void testProperty()
diff --git a/tests/inspectiontest.cpp b/tests/inspectiontest.cpp
index 3e8a103..2879801 100644
--- a/tests/inspectiontest.cpp
+++ b/tests/inspectiontest.cpp
@@ -7,6 +7,7 @@
 #include "resourcecontrol.h"
 #include "resourceconfig.h"
 #include "log.h"
+#include "testutils.h"
 
 /**
  * Test of inspection system using the dummy resource.
@@ -22,7 +23,7 @@ private slots:
         auto factory = Sink::ResourceFactory::load("sink.dummy");
         QVERIFY(factory);
         ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
-        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
+        VERIFYEXEC(Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")));
     }
 
     void testInspection_data()
diff --git a/tests/mailsynctest.cpp b/tests/mailsynctest.cpp
index 98ac685..7edda32 100644
--- a/tests/mailsynctest.cpp
+++ b/tests/mailsynctest.cpp
@@ -49,17 +49,12 @@ void MailSyncTest::initTestCase()
 
 void MailSyncTest::cleanup()
 {
-    //TODO the shutdown job fails if the resource is already shut down
-    // VERIFYEXEC(ResourceControl::shutdown(mResourceInstanceIdentifier));
-    ResourceControl::shutdown(mResourceInstanceIdentifier).exec().waitForFinished();
+    VERIFYEXEC(ResourceControl::shutdown(mResourceInstanceIdentifier));
     removeResourceFromDisk(mResourceInstanceIdentifier);
 }
 
 void MailSyncTest::init()
 {
-    qDebug();
-    qDebug() << "-----------------------------------------";
-    qDebug();
     VERIFYEXEC(ResourceControl::start(mResourceInstanceIdentifier));
 }
 
diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp
index 3339838..ae5295e 100644
--- a/tests/mailtest.cpp
+++ b/tests/mailtest.cpp
@@ -55,9 +55,6 @@ void MailTest::cleanup()
 
 void MailTest::init()
 {
-    qDebug();
-    qDebug() << "-----------------------------------------";
-    qDebug();
     VERIFYEXEC(ResourceControl::start(mResourceInstanceIdentifier));
 }
 
diff --git a/tests/mailthreadtest.cpp b/tests/mailthreadtest.cpp
index 917e3e2..3684514 100644
--- a/tests/mailthreadtest.cpp
+++ b/tests/mailthreadtest.cpp
@@ -52,9 +52,7 @@ void MailThreadTest::initTestCase()
 
 void MailThreadTest::cleanup()
 {
-    //TODO the shutdown job fails if the resource is already shut down
-    // VERIFYEXEC(ResourceControl::shutdown(mResourceInstanceIdentifier));
-    ResourceControl::shutdown(mResourceInstanceIdentifier).exec().waitForFinished();
+    VERIFYEXEC(ResourceControl::shutdown(mResourceInstanceIdentifier));
     removeResourceFromDisk(mResourceInstanceIdentifier);
 }
 
diff --git a/tests/modelinteractivitytest.cpp b/tests/modelinteractivitytest.cpp
index df0c772..6d1c51c 100644
--- a/tests/modelinteractivitytest.cpp
+++ b/tests/modelinteractivitytest.cpp
@@ -54,12 +54,12 @@ private slots:
     {
         Sink::Test::initTest();
         ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
-        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
+        VERIFYEXEC(Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")));
     }
 
     void cleanup()
     {
-        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
+        VERIFYEXEC(Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")));
     }
 
     void init()