4 files changed, 133 insertions, 96 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8257c8a..d3e6870 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,6 +2,7 @@ add_subdirectory(hawd)
 
 set(CMAKE_AUTOMOC ON)
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/hawd)
+include_directories (${CMAKE_CURRENT_BINARY_DIR}/../dummyresource)
 
 generate_flatbuffers(calendar)
 
@@ -13,14 +14,26 @@ macro(manual_tests)
     endforeach(_testname)
 endmacro(manual_tests)
 
+macro(auto_tests)
+    foreach(_testname ${ARGN})
+        add_executable(${_testname} ${_testname}.cpp)
+        add_test(${_testname} ${_testname})
+        qt5_use_modules(${_testname} Core Test Concurrent)
+        target_link_libraries(${_testname} akonadi2common libhawd)
+    endforeach(_testname)
+endmacro(auto_tests)
+
 manual_tests (
     storagebenchmark
+    dummyresourcebenchmark
+)
+
+auto_tests (
     storagetest
     dummyresourcetest
     domainadaptortest
     messagequeuetest
     indextest
-    dummyresourcebenchmark
 )
 
 target_link_libraries(dummyresourcetest akonadi2_resource_dummy)
diff --git a/tests/domainadaptortest.cpp b/tests/domainadaptortest.cpp
index cedbf94..1e285dc 100644
--- a/tests/domainadaptortest.cpp
+++ b/tests/domainadaptortest.cpp
@@ -13,89 +13,12 @@
 #include "metadata_generated.h"
 #include "entity_generated.h"
 
-class TestEventAdaptor : public Akonadi2::Domain::BufferAdaptor
-{
-public:
-    TestEventAdaptor()
-        : Akonadi2::Domain::BufferAdaptor()
-    {
-    }
-
-    void setProperty(const QString &key, const QVariant &value)
-    {
-        if (mResourceMapper->mWriteAccessors.contains(key)) {
-            // mResourceMapper.setProperty(key, value, mResourceBuffer);
-        } else {
-            // mLocalMapper.;
-        }
-    }
-
-    virtual QVariant getProperty(const QString &key) const
-    {
-        if (mResourceBuffer && mResourceMapper->mReadAccessors.contains(key)) {
-            return mResourceMapper->getProperty(key, mResourceBuffer);
-        } else if (mLocalBuffer) {
-            return mLocalMapper->getProperty(key, mLocalBuffer);
-        }
-        return QVariant();
-    }
-
-    Akonadi2::Domain::Buffer::Event const *mLocalBuffer;
-    Akonadi2::Domain::Buffer::Event const *mResourceBuffer;
-
-    QSharedPointer<PropertyMapper<Akonadi2::Domain::Buffer::Event> > mLocalMapper;
-    QSharedPointer<PropertyMapper<Akonadi2::Domain::Buffer::Event> > mResourceMapper;
-};
-
-class TestFactory : public DomainTypeAdaptorFactory<Akonadi2::Domain::Event, Akonadi2::Domain::Buffer::Event, Akonadi2::Domain::Buffer::Event>
+class TestFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Event, Akonadi2::ApplicationDomain::Buffer::Event, Akonadi2::ApplicationDomain::Buffer::Event, Akonadi2::ApplicationDomain::Buffer::EventBuilder, Akonadi2::ApplicationDomain::Buffer::EventBuilder>
 {
 public:
     TestFactory()
     {
-        mResourceMapper = QSharedPointer<PropertyMapper<Akonadi2::Domain::Buffer::Event> >::create();
-        mResourceMapper->mReadAccessors.insert("summary", [](Akonadi2::Domain::Buffer::Event const *buffer) -> QVariant {
-            if (buffer->summary()) {
-                return QString::fromStdString(buffer->summary()->c_str());
-            }
-            return QVariant();
-        });
-    }
-
-    virtual QSharedPointer<Akonadi2::Domain::BufferAdaptor> createAdaptor(const Akonadi2::Entity &entity)
-    {
-        Akonadi2::Domain::Buffer::Event const *resourceBuffer = 0;
-        if (auto resourceData = entity.resource()) {
-            flatbuffers::Verifier verifyer(resourceData->Data(), resourceData->size());
-            if (Akonadi2::Domain::Buffer::VerifyEventBuffer(verifyer)) {
-                resourceBuffer = Akonadi2::Domain::Buffer::GetEvent(resourceData->Data());
-                if (resourceBuffer->summary()) {
-                    qDebug() << QString::fromStdString(std::string(resourceBuffer->summary()->c_str()));
-                }
-            }
-        }
-
-        // Akonadi2::Metadata const *metadataBuffer = 0;
-        // if (auto metadataData = entity.metadata()) {
-        //     flatbuffers::Verifier verifyer(metadataData->Data(), metadataData->size());
-        //     if (Akonadi2::VerifyMetadataBuffer(verifyer)) {
-        //         metadataBuffer = Akonadi2::GetMetadata(metadataData);
-        //     }
-        // }
-
-        Akonadi2::Domain::Buffer::Event const *localBuffer = 0;
-        if (auto localData = entity.local()) {
-            flatbuffers::Verifier verifyer(localData->Data(), localData->size());
-            if (Akonadi2::Domain::Buffer::VerifyEventBuffer(verifyer)) {
-                localBuffer = Akonadi2::Domain::Buffer::GetEvent(localData);
-            }
-        }
-
-        auto adaptor = QSharedPointer<TestEventAdaptor>::create();
-        adaptor->mLocalBuffer = localBuffer;
-        adaptor->mResourceBuffer = resourceBuffer;
-        adaptor->mResourceMapper = mResourceMapper;
-        adaptor->mLocalMapper = mLocalMapper;
-        return adaptor;
+        mResourceWriteMapper = initializeWritePropertyMapper<Akonadi2::ApplicationDomain::Buffer::EventBuilder>();
     }
 };
 
@@ -111,6 +34,21 @@ private Q_SLOTS:
     {
     }
 
+    void testCreateBufferPart()
+    {
+        auto writeMapper = initializeWritePropertyMapper<Akonadi2::ApplicationDomain::Buffer::EventBuilder>();
+
+        Akonadi2::ApplicationDomain::Event event;
+        event.setProperty("summary", "foo");
+
+        flatbuffers::FlatBufferBuilder fbb;
+        auto pos = createBufferPart<Akonadi2::ApplicationDomain::Buffer::EventBuilder, Akonadi2::ApplicationDomain::Buffer::Event>(event, fbb, *writeMapper);
+        Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(fbb, pos);
+
+        flatbuffers::Verifier verifier(fbb.GetBufferPointer(), fbb.GetSize());
+        QVERIFY(verifier.VerifyBuffer<Akonadi2::ApplicationDomain::Buffer::Event>());
+    }
+
     void testAdaptor()
     {
         //Create entity buffer
@@ -127,12 +65,12 @@ private Q_SLOTS:
         static uint8_t rawData[100];
         auto attachment = m_fbb.CreateVector(rawData, 100);
 
-        auto builder = Akonadi2::Domain::Buffer::EventBuilder(m_fbb);
+        auto builder = Akonadi2::ApplicationDomain::Buffer::EventBuilder(m_fbb);
         builder.add_summary(summary);
         builder.add_description(description);
         builder.add_attachment(attachment);
         auto buffer = builder.Finish();
-        Akonadi2::Domain::Buffer::FinishEventBuffer(m_fbb, buffer);
+        Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(m_fbb, buffer);
 
         flatbuffers::FlatBufferBuilder fbb;
         Akonadi2::EntityBuffer::assembleEntityBuffer(fbb, metadataFbb.GetBufferPointer(), metadataFbb.GetSize(), m_fbb.GetBufferPointer(), m_fbb.GetSize(), m_fbb.GetBufferPointer(), m_fbb.GetSize());
diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp
index 01d9ca4..d83cb70 100644
--- a/tests/dummyresourcebenchmark.cpp
+++ b/tests/dummyresourcebenchmark.cpp
@@ -3,10 +3,17 @@
 #include <QString>
 
 #include "dummyresource/resourcefactory.h"
+#include "dummyresource/domainadaptor.h"
 #include "clientapi.h"
 #include "commands.h"
 #include "entitybuffer.h"
 
+#include "event_generated.h"
+#include "entity_generated.h"
+#include "metadata_generated.h"
+#include "createentity_generated.h"
+#include <iostream>
+
 static void removeFromDisk(const QString &name)
 {
     Akonadi2::Storage store(Akonadi2::Store::storageLocation(), name, Akonadi2::Storage::ReadWrite);
@@ -41,11 +48,11 @@ private Q_SLOTS:
         time.start();
         int num = 10000;
         for (int i = 0; i < num; i++) {
-            Akonadi2::Domain::Event event;
+            Akonadi2::ApplicationDomain::Event event;
             event.setProperty("uid", "testuid");
             QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
             event.setProperty("summary", "summaryValue");
-            Akonadi2::Store::create<Akonadi2::Domain::Event>(event, "org.kde.dummy");
+            Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy");
         }
         auto appendTime = time.elapsed();
 
@@ -57,7 +64,7 @@ private Q_SLOTS:
             query.processAll = true;
 
             query.propertyFilter.insert("uid", "nonexistantuid");
-            async::SyncListResult<Akonadi2::Domain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::Domain::Event>(query));
+            async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
             result.exec();
         }
         auto allProcessedTime = time.elapsed();
@@ -71,7 +78,7 @@ private Q_SLOTS:
             query.processAll = false;
 
             query.propertyFilter.insert("uid", "testuid");
-            async::SyncListResult<Akonadi2::Domain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::Domain::Event>(query));
+            async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
             result.exec();
             QCOMPARE(result.size(), num);
         }
@@ -79,6 +86,85 @@ private Q_SLOTS:
         qDebug() << "All processed: " << allProcessedTime << "/sec " << num*1000/allProcessedTime;
         qDebug() << "Query Time: " << time.elapsed() << "/sec " << num*1000/time.elapsed();
     }
+
+    void testWriteInProcess()
+    {
+        QTime time;
+        time.start();
+        int num = 10000;
+
+        Akonadi2::Pipeline pipeline("org.kde.dummy");
+        QSignalSpy revisionSpy(&pipeline, SIGNAL(revisionUpdated()));
+        DummyResource resource;
+        resource.configurePipeline(&pipeline);
+
+        flatbuffers::FlatBufferBuilder eventFbb;
+        eventFbb.Clear();
+        {
+            auto summary = eventFbb.CreateString("summary");
+            Akonadi2::ApplicationDomain::Buffer::EventBuilder eventBuilder(eventFbb);
+            eventBuilder.add_summary(summary);
+            auto eventLocation = eventBuilder.Finish();
+            Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(eventFbb, eventLocation);
+        }
+
+        flatbuffers::FlatBufferBuilder localFbb;
+        {
+            auto uid = localFbb.CreateString("testuid");
+            auto localBuilder = Akonadi2::ApplicationDomain::Buffer::EventBuilder(localFbb);
+            localBuilder.add_uid(uid);
+            auto location = localBuilder.Finish();
+            Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(localFbb, location);
+        }
+
+        flatbuffers::FlatBufferBuilder entityFbb;
+        Akonadi2::EntityBuffer::assembleEntityBuffer(entityFbb, 0, 0, eventFbb.GetBufferPointer(), eventFbb.GetSize(), localFbb.GetBufferPointer(), localFbb.GetSize());
+
+        flatbuffers::FlatBufferBuilder fbb;
+        auto type = fbb.CreateString(Akonadi2::ApplicationDomain::getTypeName<Akonadi2::ApplicationDomain::Event>().toStdString().data());
+        auto delta = fbb.CreateVector<uint8_t>(entityFbb.GetBufferPointer(), entityFbb.GetSize());
+        Akonadi2::Commands::CreateEntityBuilder builder(fbb);
+        builder.add_domainType(type);
+        builder.add_delta(delta);
+        auto location = builder.Finish();
+        Akonadi2::Commands::FinishCreateEntityBuffer(fbb, location);
+
+        const QByteArray command(reinterpret_cast<const char *>(fbb.GetBufferPointer()), fbb.GetSize());
+
+        for (int i = 0; i < num; i++) {
+            resource.processCommand(Akonadi2::Commands::CreateEntityCommand, command, command.size(), &pipeline);
+        }
+        auto appendTime = time.elapsed();
+
+        //Wait until all messages have been processed
+        resource.processAllMessages().exec().waitForFinished();
+
+        auto allProcessedTime = time.elapsed();
+
+        std::cout << "Append to messagequeue " << appendTime << std::endl;
+        std::cout << "All processed: " << allProcessedTime << "/sec " << num*1000/allProcessedTime << std::endl;
+    }
+
+    void testCreateCommand()
+    {
+        Akonadi2::ApplicationDomain::Event event;
+
+        QBENCHMARK {
+            auto mFactory = new DummyEventAdaptorFactory;
+            static flatbuffers::FlatBufferBuilder entityFbb;
+            entityFbb.Clear();
+            mFactory->createBuffer(event, entityFbb);
+
+            static flatbuffers::FlatBufferBuilder fbb;
+            fbb.Clear();
+            //This is the resource buffer type and not the domain type
+            auto type = fbb.CreateString("event");
+            // auto delta = fbb.CreateVector<uint8_t>(entityFbb.GetBufferPointer(), entityFbb.GetSize());
+            auto delta = Akonadi2::EntityBuffer::appendAsVector(fbb, entityFbb.GetBufferPointer(), entityFbb.GetSize());
+            auto location = Akonadi2::Commands::CreateCreateEntity(fbb, type, delta);
+            Akonadi2::Commands::FinishCreateEntityBuffer(fbb, location);
+        }
+    }
 };
 
 QTEST_MAIN(DummyResourceBenchmark)
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index b185664..5fed7cd 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -49,26 +49,26 @@ private Q_SLOTS:
         eventFbb.Clear();
         {
             auto summary = eventFbb.CreateString("summary");
-            Akonadi2::Domain::Buffer::EventBuilder eventBuilder(eventFbb);
+            Akonadi2::ApplicationDomain::Buffer::EventBuilder eventBuilder(eventFbb);
             eventBuilder.add_summary(summary);
             auto eventLocation = eventBuilder.Finish();
-            Akonadi2::Domain::Buffer::FinishEventBuffer(eventFbb, eventLocation);
+            Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(eventFbb, eventLocation);
         }
 
         flatbuffers::FlatBufferBuilder localFbb;
         {
             auto uid = localFbb.CreateString("testuid");
-            auto localBuilder = Akonadi2::Domain::Buffer::EventBuilder(localFbb);
+            auto localBuilder = Akonadi2::ApplicationDomain::Buffer::EventBuilder(localFbb);
             localBuilder.add_uid(uid);
             auto location = localBuilder.Finish();
-            Akonadi2::Domain::Buffer::FinishEventBuffer(localFbb, location);
+            Akonadi2::ApplicationDomain::Buffer::FinishEventBuffer(localFbb, location);
         }
 
         flatbuffers::FlatBufferBuilder entityFbb;
         Akonadi2::EntityBuffer::assembleEntityBuffer(entityFbb, 0, 0, eventFbb.GetBufferPointer(), eventFbb.GetSize(), localFbb.GetBufferPointer(), localFbb.GetSize());
 
         flatbuffers::FlatBufferBuilder fbb;
-        auto type = fbb.CreateString(Akonadi2::Domain::getTypeName<Akonadi2::Domain::Event>().toStdString().data());
+        auto type = fbb.CreateString(Akonadi2::ApplicationDomain::getTypeName<Akonadi2::ApplicationDomain::Event>().toStdString().data());
         auto delta = fbb.CreateVector<uint8_t>(entityFbb.GetBufferPointer(), entityFbb.GetSize());
         Akonadi2::Commands::CreateEntityBuilder builder(fbb);
         builder.add_domainType(type);
@@ -98,18 +98,18 @@ private Q_SLOTS:
 
     void testProperty()
     {
-        Akonadi2::Domain::Event event;
+        Akonadi2::ApplicationDomain::Event event;
         event.setProperty("uid", "testuid");
         QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
     }
 
     void testWriteToFacadeAndQueryByUid()
     {
-        Akonadi2::Domain::Event event;
+        Akonadi2::ApplicationDomain::Event event;
         event.setProperty("uid", "testuid");
         QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
         event.setProperty("summary", "summaryValue");
-        Akonadi2::Store::create<Akonadi2::Domain::Event>(event, "org.kde.dummy");
+        Akonadi2::Store::create<Akonadi2::ApplicationDomain::Event>(event, "org.kde.dummy");
 
         Akonadi2::Query query;
         query.resources << "org.kde.dummy";
@@ -117,7 +117,7 @@ private Q_SLOTS:
         query.processAll = true;
 
         query.propertyFilter.insert("uid", "testuid");
-        async::SyncListResult<Akonadi2::Domain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::Domain::Event>(query));
+        async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
         result.exec();
         QCOMPARE(result.size(), 1);
         auto value = result.first();
@@ -147,7 +147,7 @@ private Q_SLOTS:
         query.syncOnDemand = true;
         query.processAll = true;
 
-        async::SyncListResult<Akonadi2::Domain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::Domain::Event>(query));
+        async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
         result.exec();
         QVERIFY(!result.isEmpty());
         auto value = result.first();