From 63919d3040295415306267df7b66e7a5e2c9395f Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 8 Jun 2015 10:47:57 +0200
Subject: Differentiate between resource name and instance identifier

---
 tests/dummyresourcetest.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'tests')

diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index 9523e5d..fe04d99 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -26,19 +26,19 @@ 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()
     {
-        Akonadi2::Store::shutdown("org.kde.dummy");
-        removeFromDisk("org.kde.dummy");
-        removeFromDisk("org.kde.dummy.userqueue");
-        removeFromDisk("org.kde.dummy.synchronizerqueue");
-        removeFromDisk("org.kde.dummy.index.uid");
+        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.index.uid");
         auto factory = Akonadi2::ResourceFactory::load("org.kde.dummy");
         QVERIFY(factory);
     }
@@ -83,7 +83,7 @@ private Q_SLOTS:
         }
 
         //Actual test
-        Akonadi2::Pipeline pipeline("org.kde.dummy");
+        Akonadi2::Pipeline pipeline("org.kde.dummy.instance1");
         QSignalSpy revisionSpy(&pipeline, SIGNAL(revisionUpdated()));
         DummyResource resource;
         resource.configurePipeline(&pipeline);
@@ -109,10 +109,10 @@ 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");
 
         Akonadi2::Query query;
-        query.resources << "org.kde.dummy";
+        query.resources << "org.kde.dummy.instance1";
         query.syncOnDemand = false;
         query.processAll = true;
 
@@ -126,7 +126,7 @@ private Q_SLOTS:
 
     void testResourceSync()
     {
-        Akonadi2::Pipeline pipeline("org.kde.dummy");
+        Akonadi2::Pipeline pipeline("org.kde.dummy.instance1");
         DummyResource resource;
         resource.configurePipeline(&pipeline);
         auto job = resource.synchronizeWithSource(&pipeline);
@@ -143,7 +143,7 @@ private Q_SLOTS:
     void testSyncAndFacade()
     {
         Akonadi2::Query query;
-        query.resources << "org.kde.dummy";
+        query.resources << "org.kde.dummy.instance1";
         query.syncOnDemand = true;
         query.processAll = true;
 
-- 
cgit v1.2.3