3 files changed, 49 insertions, 3 deletions

diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index d027266..3b90e6c 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -64,6 +64,9 @@ private Q_SLOTS:
         query.syncOnDemand = false;
         query.processAll = true;
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         query.propertyFilter.insert("uid", "testuid");
         async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
         result.exec();
@@ -88,6 +91,9 @@ private Q_SLOTS:
         query.syncOnDemand = false;
         query.processAll = true;
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         query.propertyFilter.insert("uid", "testuid");
         async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
         result.exec();
@@ -114,6 +120,9 @@ private Q_SLOTS:
         query.syncOnDemand = false;
         query.processAll = true;
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         query.propertyFilter.insert("summary", "summaryValue2");
         async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
         result.exec();
@@ -145,6 +154,9 @@ private Q_SLOTS:
         query.syncOnDemand = true;
         query.processAll = true;
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
         result.exec();
         QVERIFY(!result.isEmpty());
@@ -160,6 +172,9 @@ private Q_SLOTS:
         query.syncOnDemand = true;
         query.processAll = true;
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         async::SyncListResult<Akonadi2::ApplicationDomain::Mail::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Mail>(query));
         result.exec();
         QVERIFY(!result.isEmpty());
@@ -182,6 +197,9 @@ private Q_SLOTS:
         query.processAll = true;
         query.propertyFilter.insert("uid", "testuid");
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         //Test create
         Akonadi2::ApplicationDomain::Event event2;
         {
@@ -198,6 +216,9 @@ private Q_SLOTS:
         event2.setProperty("summary", "summaryValue2");
         Akonadi2::Store::modify<Akonadi2::ApplicationDomain::Event>(event2).exec().waitForFinished();
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         //Test modify
         {
             async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
@@ -210,6 +231,9 @@ private Q_SLOTS:
 
         Akonadi2::Store::remove<Akonadi2::ApplicationDomain::Event>(event2).exec().waitForFinished();
 
+        //Ensure all local data is processed
+        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+
         //Test remove
         {
             async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 9f4b3bb..47d977b 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -57,11 +57,33 @@ private Q_SLOTS:
         query.syncOnDemand = false;
         query.processAll = true;
 
-        auto model = new ModelResult<Akonadi2::ApplicationDomain::Mail>(query, QList<QByteArray>() << "summary" << "uid");
+        auto model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Mail>(query);
         model->fetchMore(QModelIndex());
         QTRY_COMPARE(model->rowCount(), 1);
     }
 
+    void testSingleWithDelay()
+    {
+        //Setup
+        {
+            Akonadi2::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Akonadi2::Store::create<Akonadi2::ApplicationDomain::Mail>(mail).exec().waitForFinished();
+        }
+
+        //Test
+        Akonadi2::Query query;
+        query.resources << "org.kde.dummy.instance1";
+        query.syncOnDemand = false;
+        query.processAll = true;
+        query.liveQuery = true;
+
+        auto model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Mail>(query);
+        QTest::qWait(200);
+        model->fetchMore(QModelIndex());
+        QVERIFY(model->rowCount() < 2);
+        QTRY_COMPARE(model->rowCount(), 1);
+    }
+
     // void testTree()
     // {
     //     //Setup
diff --git a/tests/testimplementations.h b/tests/testimplementations.h
index eee78b0..1436c68 100644
--- a/tests/testimplementations.h
+++ b/tests/testimplementations.h
@@ -85,8 +85,8 @@ public Q_SLOTS:
 class TestResourceFacade : public Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Event>
 {
 public:
-    TestResourceFacade(const QByteArray &instanceIdentifier, const QSharedPointer<EntityStorage<Akonadi2::ApplicationDomain::Event> > storage, const QSharedPointer<Akonadi2::ResourceAccessInterface> resourceAccess)
-        : Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Event>(instanceIdentifier, QSharedPointer<TestEventAdaptorFactory>::create(), storage, resourceAccess)
+    TestResourceFacade(const QByteArray &instanceIdentifier, const QSharedPointer<Akonadi2::ResourceAccessInterface> resourceAccess)
+        : Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Event>(instanceIdentifier, QSharedPointer<TestEventAdaptorFactory>::create(), resourceAccess)
     {
 
     }