1 files changed, 25 insertions, 15 deletions

diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp
index 242ac76..6eaf065 100644
--- a/tests/dummyresourcebenchmark.cpp
+++ b/tests/dummyresourcebenchmark.cpp
@@ -7,9 +7,9 @@
 #include "clientapi.h"
 #include "commands.h"
 #include "entitybuffer.h"
-#include "synclistresult.h"
 #include "pipeline.h"
 #include "log.h"
+#include "resourceconfig.h"
 
 #include "event_generated.h"
 #include "entity_generated.h"
@@ -24,18 +24,20 @@
 class DummyResourceBenchmark : public QObject
 {
     Q_OBJECT
+private:
+    int num;
 private Q_SLOTS:
     void initTestCase()
     {
         Akonadi2::Log::setDebugOutputLevel(Akonadi2::Log::Warning);
         auto factory = Akonadi2::ResourceFactory::load("org.kde.dummy");
         QVERIFY(factory);
-        DummyResource::removeFromDisk("org.kde.dummy.instance1");
+        ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
+        num = 5000;
     }
 
     void cleanup()
     {
-        DummyResource::removeFromDisk("org.kde.dummy.instance1");
     }
 
     static KAsync::Job<void> waitForCompletion(QList<KAsync::Future<void> > &futures)
@@ -68,11 +70,12 @@ private Q_SLOTS:
         });
     }
 
-    void testWriteToFacadeAndQueryByUid()
+    void testWriteToFacade()
     {
+        DummyResource::removeFromDisk("org.kde.dummy.instance1");
+
         QTime time;
         time.start();
-        int num = 100;
         QList<KAsync::Future<void> > waitCondition;
         for (int i = 0; i < num; i++) {
             Akonadi2::ApplicationDomain::Event event("org.kde.dummy.instance1");
@@ -90,13 +93,17 @@ private Q_SLOTS:
             query.resources << "org.kde.dummy.instance1";
             query.syncOnDemand = false;
             query.processAll = true;
-
-            query.propertyFilter.insert("uid", "nonexistantuid");
-            async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
-            result.exec();
+            Akonadi2::Store::synchronize(query).exec().waitForFinished();
         }
         auto allProcessedTime = time.elapsed();
+        qDebug() << "Append to messagequeue " << appendTime;
+        qDebug() << "All processed: " << allProcessedTime << "/sec " << num*1000/allProcessedTime;
+    }
 
+    void testQueryByUid()
+    {
+        QTime time;
+        time.start();
         //Measure query
         {
             time.start();
@@ -106,20 +113,17 @@ private Q_SLOTS:
             query.processAll = false;
 
             query.propertyFilter.insert("uid", "testuid");
-            async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
-            result.exec();
-            QCOMPARE(result.size(), num);
+            auto model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Event>(query);
+            QTRY_COMPARE(model->rowCount(QModelIndex()), num);
         }
-        qDebug() << "Append to messagequeue " << appendTime;
-        qDebug() << "All processed: " << allProcessedTime << "/sec " << num*1000/allProcessedTime;
         qDebug() << "Query Time: " << time.elapsed() << "/sec " << num*1000/time.elapsed();
     }
 
     void testWriteInProcess()
     {
+        DummyResource::removeFromDisk("org.kde.dummy.instance1");
         QTime time;
         time.start();
-        int num = 100;
 
         auto pipeline = QSharedPointer<Akonadi2::Pipeline>::create("org.kde.dummy.instance1");
         DummyResource resource("org.kde.dummy.instance1", pipeline);
@@ -191,6 +195,12 @@ private Q_SLOTS:
             Akonadi2::Commands::FinishCreateEntityBuffer(fbb, location);
         }
     }
+
+    //This allows to run individual parts without doing a cleanup, but still cleaning up normally
+    void testCleanupForCompleteTest()
+    {
+        DummyResource::removeFromDisk("org.kde.dummy.instance1");
+    }
 };
 
 QTEST_MAIN(DummyResourceBenchmark)