6 files changed, 18 insertions, 13 deletions

diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index 58df2da..d41f235 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -11,6 +11,7 @@
 #include "modelresult.h"
 #include "pipeline.h"
 #include "log.h"
+#include "test.h"
 
 using namespace Sink;
 
@@ -28,6 +29,7 @@ class DummyResourceTest : public QObject
 private slots:
     void initTestCase()
     {
+        Sink::Test::initTest();
         Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
         auto factory = Sink::ResourceFactory::load("org.kde.dummy");
         QVERIFY(factory);
diff --git a/tests/mailquerybenchmark.cpp b/tests/mailquerybenchmark.cpp
index 20ee63c..4e58899 100644
--- a/tests/mailquerybenchmark.cpp
+++ b/tests/mailquerybenchmark.cpp
@@ -33,6 +33,7 @@
 #include <common/pipeline.h>
 #include <common/index.h>
 #include <common/indexupdater.h>
+#include <common/adaptorfactoryregistry.h>
 
 #include "hawd/dataset.h"
 #include "hawd/formatter.h"
@@ -59,12 +60,11 @@ class MailQueryBenchmark : public QObject
         TestResource::removeFromDisk(resourceIdentifier);
 
         auto pipeline = QSharedPointer<Sink::Pipeline>::create(resourceIdentifier);
+        pipeline->setResourceType("test");
 
-        auto mailFactory = QSharedPointer<TestMailAdaptorFactory>::create();
         auto indexer = QSharedPointer<DefaultIndexUpdater<Sink::ApplicationDomain::Mail>>::create();
 
         pipeline->setPreprocessors("mail", QVector<Sink::Preprocessor *>() << indexer.data());
-        pipeline->setAdaptorFactory("mail", mailFactory);
 
         auto domainTypeAdaptorFactory = QSharedPointer<TestMailAdaptorFactory>::create();
 
@@ -149,6 +149,7 @@ private slots:
     void init()
     {
         resourceIdentifier = "org.kde.test.instance1";
+        Sink::AdaptorFactoryRegistry::instance().registerFactory<Sink::ApplicationDomain::Mail, TestMailAdaptorFactory>("test");
     }
 
     void test50k()
diff --git a/tests/pipelinebenchmark.cpp b/tests/pipelinebenchmark.cpp
index 0133a6c..51481fd 100644
--- a/tests/pipelinebenchmark.cpp
+++ b/tests/pipelinebenchmark.cpp
@@ -33,6 +33,7 @@
 #include <common/pipeline.h>
 #include <common/index.h>
 #include <common/indexupdater.h>
+#include <common/adaptorfactoryregistry.h>
 
 #include "hawd/dataset.h"
 #include "hawd/formatter.h"
@@ -83,10 +84,8 @@ class PipelineBenchmark : public QObject
         TestResource::removeFromDisk(resourceIdentifier);
 
         auto pipeline = QSharedPointer<Sink::Pipeline>::create(resourceIdentifier);
-
-        auto mailFactory = QSharedPointer<TestMailAdaptorFactory>::create();
         pipeline->setPreprocessors("mail", preprocessors);
-        pipeline->setAdaptorFactory("mail", mailFactory);
+        pipeline->setResourceType("test");
 
         QTime time;
         time.start();
@@ -131,6 +130,7 @@ private slots:
     void init()
     {
         Sink::Log::setDebugOutputLevel(Sink::Log::Warning);
+        Sink::AdaptorFactoryRegistry::instance().registerFactory<Sink::ApplicationDomain::Mail, TestMailAdaptorFactory>("test");
         resourceIdentifier = "org.kde.test.instance1";
     }
 
diff --git a/tests/pipelinetest.cpp b/tests/pipelinetest.cpp
index 9290050..6ea2041 100644
--- a/tests/pipelinetest.cpp
+++ b/tests/pipelinetest.cpp
@@ -19,6 +19,7 @@
 #include "log.h"
 #include "domainadaptor.h"
 #include "definitions.h"
+#include "adaptorfactoryregistry.h"
 
 static void removeFromDisk(const QString &name)
 {
@@ -185,6 +186,7 @@ private slots:
     void initTestCase()
     {
         Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
+        Sink::AdaptorFactoryRegistry::instance().registerFactory<Sink::ApplicationDomain::Event, TestEventAdaptorFactory>("test");
     }
 
     void init()
@@ -198,9 +200,7 @@ private slots:
         auto command = createEntityCommand(createEvent(entityFbb));
 
         Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
-
-        auto adaptorFactory = QSharedPointer<TestEventAdaptorFactory>::create();
-        pipeline.setAdaptorFactory("event", adaptorFactory);
+        pipeline.setResourceType("test");
 
         pipeline.startTransaction();
         pipeline.newEntity(command.constData(), command.size());
@@ -216,9 +216,9 @@ private slots:
         auto command = createEntityCommand(createEvent(entityFbb, "summary", "description"));
 
         Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        pipeline.setResourceType("test");
 
         auto adaptorFactory = QSharedPointer<TestEventAdaptorFactory>::create();
-        pipeline.setAdaptorFactory("event", adaptorFactory);
 
         // Create the initial revision
         pipeline.startTransaction();
@@ -265,9 +265,9 @@ private slots:
         auto command = createEntityCommand(createEvent(entityFbb));
 
         Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        pipeline.setResourceType("test");
 
         auto adaptorFactory = QSharedPointer<TestEventAdaptorFactory>::create();
-        pipeline.setAdaptorFactory("event", adaptorFactory);
 
         // Create the initial revision
         pipeline.startTransaction();
@@ -309,7 +309,7 @@ private slots:
         flatbuffers::FlatBufferBuilder entityFbb;
         auto command = createEntityCommand(createEvent(entityFbb));
         Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
-        pipeline.setAdaptorFactory("event", QSharedPointer<TestEventAdaptorFactory>::create());
+        pipeline.setResourceType("test");
 
         // Create the initial revision
         pipeline.startTransaction();
@@ -346,9 +346,9 @@ private slots:
         TestProcessor testProcessor;
 
         Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        pipeline.setResourceType("test");
         pipeline.setPreprocessors("event", QVector<Sink::Preprocessor *>() << &testProcessor);
         pipeline.startTransaction();
-        pipeline.setAdaptorFactory("event", QSharedPointer<TestEventAdaptorFactory>::create());
 
         // Actual test
         {
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index a654931..6d7746e 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -9,6 +9,7 @@
 #include "resourceconfig.h"
 #include "log.h"
 #include "modelresult.h"
+#include "test.h"
 
 /**
  * Test of the query system using the dummy resource.
@@ -21,6 +22,7 @@ class QueryTest : public QObject
 private slots:
     void initTestCase()
     {
+        Sink::Test::initTest();
         Sink::Log::setDebugOutputLevel(Sink::Log::Trace);
         auto factory = Sink::ResourceFactory::load("org.kde.dummy");
         QVERIFY(factory);
diff --git a/tests/testimplementations.h b/tests/testimplementations.h
index 688875d..197602c 100644
--- a/tests/testimplementations.h
+++ b/tests/testimplementations.h
@@ -107,7 +107,7 @@ public:
 class TestResource : public Sink::GenericResource
 {
 public:
-    TestResource(const QByteArray &instanceIdentifier, QSharedPointer<Sink::Pipeline> pipeline) : Sink::GenericResource(instanceIdentifier, pipeline)
+    TestResource(const QByteArray &instanceIdentifier, QSharedPointer<Sink::Pipeline> pipeline) : Sink::GenericResource("test", instanceIdentifier, pipeline, QSharedPointer<Sink::ChangeReplay>(), QSharedPointer<Sink::Synchronizer>())
     {
     }