From dd1364151f0f572091331dfb885225d2e3ab72c5 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 6 Jul 2016 19:24:51 +0200
Subject: Fixed tests

---
 tests/pipelinetest.cpp       | 26 +++++++++++++-------------
 tests/resourceconfigtest.cpp | 10 +++-------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/tests/pipelinetest.cpp b/tests/pipelinetest.cpp
index c6ee9ab..fc23cc9 100644
--- a/tests/pipelinetest.cpp
+++ b/tests/pipelinetest.cpp
@@ -349,11 +349,11 @@ private slots:
     {
         flatbuffers::FlatBufferBuilder entityFbb;
 
-        TestProcessor testProcessor;
+        auto testProcessor = new TestProcessor;
 
         Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
         pipeline.setResourceType("test");
-        pipeline.setPreprocessors("event", QVector<Sink::Preprocessor *>() << &testProcessor);
+        pipeline.setPreprocessors("event", QVector<Sink::Preprocessor *>() << testProcessor);
         pipeline.startTransaction();
         // pipeline.setAdaptorFactory("event", QSharedPointer<TestEventAdaptorFactory>::create());
 
@@ -361,10 +361,10 @@ private slots:
         {
             auto command = createEntityCommand(createEvent(entityFbb));
             pipeline.newEntity(command.constData(), command.size());
-            QCOMPARE(testProcessor.newUids.size(), 1);
-            QCOMPARE(testProcessor.newRevisions.size(), 1);
+            QCOMPARE(testProcessor->newUids.size(), 1);
+            QCOMPARE(testProcessor->newRevisions.size(), 1);
             // Key doesn't contain revision and is just the uid
-            QCOMPARE(testProcessor.newUids.at(0), Sink::Storage::uidFromKey(testProcessor.newUids.at(0)));
+            QCOMPARE(testProcessor->newUids.at(0), Sink::Storage::uidFromKey(testProcessor->newUids.at(0)));
         }
         pipeline.commit();
         entityFbb.Clear();
@@ -375,10 +375,10 @@ private slots:
         {
             auto modifyCommand = modifyEntityCommand(createEvent(entityFbb, "summary2"), uid, 1);
             pipeline.modifiedEntity(modifyCommand.constData(), modifyCommand.size());
-            QCOMPARE(testProcessor.modifiedUids.size(), 1);
-            QCOMPARE(testProcessor.modifiedRevisions.size(), 1);
+            QCOMPARE(testProcessor->modifiedUids.size(), 1);
+            QCOMPARE(testProcessor->modifiedRevisions.size(), 1);
             // Key doesn't contain revision and is just the uid
-            QCOMPARE(testProcessor.modifiedUids.at(0), Sink::Storage::uidFromKey(testProcessor.modifiedUids.at(0)));
+            QCOMPARE(testProcessor->modifiedUids.at(0), Sink::Storage::uidFromKey(testProcessor->modifiedUids.at(0)));
         }
         pipeline.commit();
         entityFbb.Clear();
@@ -386,12 +386,12 @@ private slots:
         {
             auto deleteCommand = deleteEntityCommand(uid, 1);
             pipeline.deletedEntity(deleteCommand.constData(), deleteCommand.size());
-            QCOMPARE(testProcessor.deletedUids.size(), 1);
-            QCOMPARE(testProcessor.deletedUids.size(), 1);
-            QCOMPARE(testProcessor.deletedSummaries.size(), 1);
+            QCOMPARE(testProcessor->deletedUids.size(), 1);
+            QCOMPARE(testProcessor->deletedUids.size(), 1);
+            QCOMPARE(testProcessor->deletedSummaries.size(), 1);
             // Key doesn't contain revision and is just the uid
-            QCOMPARE(testProcessor.deletedUids.at(0), Sink::Storage::uidFromKey(testProcessor.deletedUids.at(0)));
-            QCOMPARE(testProcessor.deletedSummaries.at(0), QByteArray("summary2"));
+            QCOMPARE(testProcessor->deletedUids.at(0), Sink::Storage::uidFromKey(testProcessor->deletedUids.at(0)));
+            QCOMPARE(testProcessor->deletedSummaries.at(0), QByteArray("summary2"));
         }
     }
 };
diff --git a/tests/resourceconfigtest.cpp b/tests/resourceconfigtest.cpp
index 42f8b70..d5f98d3 100644
--- a/tests/resourceconfigtest.cpp
+++ b/tests/resourceconfigtest.cpp
@@ -80,17 +80,13 @@ private slots:
         ResourceConfig::clear();
         Sink::FacadeFactory::instance().registerStaticFacades();
 
-        Sink::ApplicationDomain::SinkResource res("", "dummyresource.identifier1", 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
-        res.setProperty("identifier", "dummyresource.identifier1");
-        res.setProperty("type", "org.kde.dummy");
-        res.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << "foo"));
-
-        Sink::Store::create(res).exec().waitForFinished();
+        auto res = Sink::ApplicationDomain::DummyResource::create("");
+        VERIFYEXEC(Sink::Store::create(res));
         {
             Sink::Query query;
             query.liveQuery = true;
             query.request<Sink::ApplicationDomain::SinkResource::Status>();
-            auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkResource>(Sink::Query::CapabilityFilter("foo"));
+            auto model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkResource>(query);
             QTRY_COMPARE(model->rowCount(QModelIndex()), 1);
             auto resource = model->data(model->index(0, 0, QModelIndex()), Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::SinkResource::Ptr>();
             QCOMPARE(resource->getStatus(), static_cast<int>(Sink::ApplicationDomain::OfflineStatus));
-- 
cgit v1.2.3