From 12a87e1d6d5c0e4b5a5aacbfa880678629321c1d Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 7 Jul 2015 11:05:03 +0200
Subject: Use the resource instance name

---
 tests/dummyresourcebenchmark.cpp | 26 +++++++++++++-------------
 tests/dummyresourcetest.cpp      |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'tests')

diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp
index e350747..fd2cb01 100644
--- a/tests/dummyresourcebenchmark.cpp
+++ b/tests/dummyresourcebenchmark.cpp
@@ -29,18 +29,18 @@ private Q_SLOTS:
     {
         auto factory = Akonadi2::ResourceFactory::load("org.kde.dummy");
         QVERIFY(factory);
-        removeFromDisk("org.kde.dummy");
-        removeFromDisk("org.kde.dummy.userqueue");
-        removeFromDisk("org.kde.dummy.synchronizerqueue");
-        removeFromDisk("org.kde.dummy.index.uid");
+        removeFromDisk("org.kde.dummy.instance1");
+        removeFromDisk("org.kde.dummy.instance1.userqueue");
+        removeFromDisk("org.kde.dummy.instance1.synchronizerqueue");
+        removeFromDisk("org.kde.dummy.instance1.index.uid");
     }
 
     void cleanup()
     {
-        removeFromDisk("org.kde.dummy");
-        removeFromDisk("org.kde.dummy.userqueue");
-        removeFromDisk("org.kde.dummy.synchronizerqueue");
-        removeFromDisk("org.kde.dummy.index.uid");
+        removeFromDisk("org.kde.dummy.instance1");
+        removeFromDisk("org.kde.dummy.instance1.userqueue");
+        removeFromDisk("org.kde.dummy.instance1.synchronizerqueue");
+        removeFromDisk("org.kde.dummy.instance1.index.uid");
     }
 
     void testWriteToFacadeAndQueryByUid()
@@ -53,14 +53,14 @@ private Q_SLOTS:
             event.setProperty("uid", "testuid");
             QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
             event.setProperty("summary", "summaryValue");
-            Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy");
+            Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy.instance1");
         }
         auto appendTime = time.elapsed();
 
         //Ensure everything is processed
         {
             Akonadi2::Query query;
-            query.resources << "org.kde.dummy";
+            query.resources << "org.kde.dummy.instance1";
             query.syncOnDemand = false;
             query.processAll = true;
 
@@ -74,7 +74,7 @@ private Q_SLOTS:
         {
             time.start();
             Akonadi2::Query query;
-            query.resources << "org.kde.dummy";
+            query.resources << "org.kde.dummy.instance1";
             query.syncOnDemand = false;
             query.processAll = false;
 
@@ -94,9 +94,9 @@ private Q_SLOTS:
         time.start();
         int num = 10000;
 
-        Akonadi2::Pipeline pipeline("org.kde.dummy");
+        Akonadi2::Pipeline pipeline("org.kde.dummy.instance1");
         QSignalSpy revisionSpy(&pipeline, SIGNAL(revisionUpdated()));
-        DummyResource resource;
+        DummyResource resource("org.kde.dummy.instance1");
         resource.configurePipeline(&pipeline);
 
         flatbuffers::FlatBufferBuilder eventFbb;
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index 4c27b10..1c3b09b 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -85,7 +85,7 @@ private Q_SLOTS:
         //Actual test
         Akonadi2::Pipeline pipeline("org.kde.dummy.instance1");
         QSignalSpy revisionSpy(&pipeline, SIGNAL(revisionUpdated()));
-        DummyResource resource;
+        DummyResource resource("org.kde.dummy.instance1");
         resource.configurePipeline(&pipeline);
         resource.processCommand(Akonadi2::Commands::CreateEntityCommand, command, command.size(), &pipeline);
         resource.processCommand(Akonadi2::Commands::CreateEntityCommand, command, command.size(), &pipeline);
@@ -178,7 +178,7 @@ private Q_SLOTS:
     void testResourceSync()
     {
         Akonadi2::Pipeline pipeline("org.kde.dummy.instance1");
-        DummyResource resource;
+        DummyResource resource("org.kde.dummy.instance1");
         resource.configurePipeline(&pipeline);
         auto job = resource.synchronizeWithSource(&pipeline);
         //TODO pass in optional timeout?
-- 
cgit v1.2.3