4 files changed, 12 insertions, 28 deletions

diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 8d84cf8..0e4c3af 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -168,6 +168,13 @@ KAsync::Job<void> DummyResource::synchronizeWithSource()
     });
 }
 
+void DummyResource::removeFromDisk(const QByteArray &instanceIdentifier)
+{
+    Akonadi2::Storage(Akonadi2::storageLocation(), instanceIdentifier, Akonadi2::Storage::ReadWrite).removeFromDisk();
+    Akonadi2::Storage(Akonadi2::storageLocation(), instanceIdentifier + ".userqueue", Akonadi2::Storage::ReadWrite).removeFromDisk();
+    Akonadi2::Storage(Akonadi2::storageLocation(), instanceIdentifier + ".synchronizerqueue", Akonadi2::Storage::ReadWrite).removeFromDisk();
+    Akonadi2::Storage(Akonadi2::storageLocation(), instanceIdentifier + ".event.index.uid", Akonadi2::Storage::ReadWrite).removeFromDisk();
+}
 
 DummyResourceFactory::DummyResourceFactory(QObject *parent)
     : Akonadi2::ResourceFactory(parent)
diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h
index 55cfbd3..196d29a 100644
--- a/examples/dummyresource/resourcefactory.h
+++ b/examples/dummyresource/resourcefactory.h
@@ -34,6 +34,7 @@ class DummyResource : public Akonadi2::GenericResource
 public:
     DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer<Akonadi2::Pipeline> &pipeline = QSharedPointer<Akonadi2::Pipeline>());
     KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE;
+    static void removeFromDisk(const QByteArray &instanceIdentifier);
 private:
     void createEvent(const QByteArray &rid, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb);
     void createMail(const QByteArray &rid, const QMap<QString, QVariant> &data, flatbuffers::FlatBufferBuilder &entityFbb);
diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp
index 5e674b3..c020c6b 100644
--- a/tests/dummyresourcebenchmark.cpp
+++ b/tests/dummyresourcebenchmark.cpp
@@ -18,12 +18,6 @@
 
 #include <iostream>
 
-static void removeFromDisk(const QString &name)
-{
-    Akonadi2::Storage store(Akonadi2::Store::storageLocation(), name, Akonadi2::Storage::ReadWrite);
-    store.removeFromDisk();
-}
-
 class DummyResourceBenchmark : public QObject
 {
     Q_OBJECT
@@ -33,18 +27,12 @@ private Q_SLOTS:
         Akonadi2::Log::setDebugOutputLevel(Akonadi2::Log::Warning);
         auto factory = Akonadi2::ResourceFactory::load("org.kde.dummy");
         QVERIFY(factory);
-        removeFromDisk("org.kde.dummy.instance1");
-        removeFromDisk("org.kde.dummy.instance1.userqueue");
-        removeFromDisk("org.kde.dummy.instance1.synchronizerqueue");
-        removeFromDisk("org.kde.dummy.instance1.index.uid");
+        DummyResource::removeFromDisk("org.kde.dummy.instance1");
     }
 
     void cleanup()
     {
-        removeFromDisk("org.kde.dummy.instance1");
-        removeFromDisk("org.kde.dummy.instance1.userqueue");
-        removeFromDisk("org.kde.dummy.instance1.synchronizerqueue");
-        removeFromDisk("org.kde.dummy.instance1.index.uid");
+        DummyResource::removeFromDisk("org.kde.dummy.instance1");
     }
 
     static KAsync::Job<void> waitForCompletion(QList<KAsync::Future<void> > &futures)
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index 731f013..9d7d092 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -11,12 +11,6 @@
 #include "pipeline.h"
 #include "log.h"
 
-static void removeFromDisk(const QString &name)
-{
-    Akonadi2::Storage store(Akonadi2::Store::storageLocation(), name, Akonadi2::Storage::ReadWrite);
-    store.removeFromDisk();
-}
-
 class DummyResourceTest : public QObject
 {
     Q_OBJECT
@@ -26,20 +20,14 @@ private Q_SLOTS:
         Akonadi2::Log::setDebugOutputLevel(Akonadi2::Log::Trace);
         auto factory = Akonadi2::ResourceFactory::load("org.kde.dummy");
         QVERIFY(factory);
-        removeFromDisk("org.kde.dummy.instance1");
-        removeFromDisk("org.kde.dummy.instance1.userqueue");
-        removeFromDisk("org.kde.dummy.instance1.synchronizerqueue");
-        removeFromDisk("org.kde.dummy.instance1.event.index.uid");
+        DummyResource::removeFromDisk("org.kde.dummy.instance1");
         ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
     }
 
     void cleanup()
     {
         Akonadi2::Store::shutdown("org.kde.dummy.instance1");
-        removeFromDisk("org.kde.dummy.instance1");
-        removeFromDisk("org.kde.dummy.instance1.userqueue");
-        removeFromDisk("org.kde.dummy.instance1.synchronizerqueue");
-        removeFromDisk("org.kde.dummy.instance1.event.index.uid");
+        DummyResource::removeFromDisk("org.kde.dummy.instance1");
         auto factory = Akonadi2::ResourceFactory::load("org.kde.dummy");
         QVERIFY(factory);
     }