2 files changed, 58 insertions, 99 deletions

diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 9b8c27e..27139c2 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -7,20 +7,6 @@
 #include "synclistresult.h"
 #include "resourceconfig.h"
 
-class RevisionNotifier : public QObject
-{
-    Q_OBJECT
-public:
-    RevisionNotifier() : QObject() {};
-    void notify(qint64 revision)
-    {
-        emit revisionChanged(revision);
-    }
-
-Q_SIGNALS:
-    void revisionChanged(qint64);
-};
-
 class DummyResourceFacade : public Akonadi2::StoreFacade<Akonadi2::ApplicationDomain::Event>
 {
 public:
@@ -28,70 +14,17 @@ public:
     KAsync::Job<void> create(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return KAsync::null<void>(); };
     KAsync::Job<void> modify(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return KAsync::null<void>(); };
     KAsync::Job<void> remove(const Akonadi2::ApplicationDomain::Event &domainObject) Q_DECL_OVERRIDE { return KAsync::null<void>(); };
-
-    KAsync::Job<qint64> load(const Akonadi2::Query &query, const std::function<void(const Akonadi2::ApplicationDomain::Event::Ptr &)> &resultCallback)
+    KAsync::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > &resultProvider) Q_DECL_OVERRIDE
     {
-        return KAsync::start<qint64>([this, resultCallback](KAsync::Future<qint64> &future) {
-            qDebug() << "load called";
-            for(const auto &result : results) {
-                resultCallback(result);
-            }
-            future.setValue(0);
-            future.setFinished();
-        });
-    }
-
-    KAsync::Job<void> load(const Akonadi2::Query &query, const QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > &resultProvider) Q_DECL_OVERRIDE 
-    {
-        auto runner = QSharedPointer<QueryRunner>::create(query);
-        //The runner only lives as long as the resultProvider
-        resultProvider->setQueryRunner(runner);
-        QWeakPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > weakResultProvider = resultProvider;
         capturedResultProvider = resultProvider;
-        runner->setQuery([this, weakResultProvider, query](qint64 oldRevision, qint64 newRevision) -> KAsync::Job<qint64> {
-            qDebug() << "Creating query for revisions: " << oldRevision << newRevision;
-            return KAsync::start<qint64>([this, weakResultProvider, query](KAsync::Future<qint64> &future) {
-                auto resultProvider = weakResultProvider.toStrongRef();
-                if (!resultProvider) {
-                    Warning() << "Tried executing query after result provider is already gone";
-                    future.setError(0, QString());
-                    future.setFinished();
-                    return;
-                }
-                //TODO only emit changes and don't replace everything
-                resultProvider->clear();
-                //rerun query
-                std::function<void(const Akonadi2::ApplicationDomain::Event::Ptr &)> addCallback = std::bind(&Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr>::add, resultProvider, std::placeholders::_1);
-                load(query, addCallback).then<void, qint64>([resultProvider, &future, query](qint64 queriedRevision) {
-                    future.setValue(queriedRevision);
-                    future.setFinished();
-                }).exec();
-            });
-        });
-
-        //Ensure the notification is emitted in the right thread
-        //Otherwise we get crashes as we call revisionChanged from the test.
-        if (!notifier) {
-            notifier.reset(new RevisionNotifier);
-        }
-
-        //TODO somehow disconnect as resultNotifier is destroyed. Otherwise we keep the runner alive forever.
-        if (query.liveQuery) {
-            QObject::connect(notifier.data(), &RevisionNotifier::revisionChanged, [runner](qint64 newRevision) {
-                runner->revisionChanged(newRevision);
-            });
-        }
-
-        return KAsync::start<void>([runner](KAsync::Future<void> &future) {
-            runner->run().then<void>([&future]() {
-                //TODO if not live query, destroy runner.
-                future.setFinished();
-            }).exec();
+        return KAsync::start<void>([this, resultProvider, query]() {
+            for (const auto &res : results) {
+                resultProvider->add(res);
+            }
         });
     }
 
     QList<Akonadi2::ApplicationDomain::Event::Ptr> results;
-    QSharedPointer<RevisionNotifier> notifier;
     QWeakPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> > capturedResultProvider;
 };
 
@@ -117,7 +50,6 @@ private Q_SLOTS:
         ResourceConfig::clear();
     }
 
-
     void testLoad()
     {
         auto facade = registerDummyFacade();
@@ -133,27 +65,7 @@ private Q_SLOTS:
         QCOMPARE(result.size(), 1);
     }
 
-    void testLiveQuery()
-    {
-        auto facade = registerDummyFacade();
-        facade->results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
-        ResourceConfig::addResource("dummyresource.instance1", "dummyresource");
-
-        Akonadi2::Query query;
-        query.resources << "dummyresource.instance1";
-        query.liveQuery = true;
-
-        async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(Akonadi2::Store::load<Akonadi2::ApplicationDomain::Event>(query));
-        result.exec();
-        QCOMPARE(result.size(), 1);
-
-        //Enter a second result
-        facade->results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id2", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
-        QVERIFY(facade->notifier);
-        facade->notifier->revisionChanged(2);
-        QTRY_COMPARE(result.size(), 2);
-    }
-
+    //The query provider is supposed to delete itself
     void testQueryLifetime()
     {
         auto facade = registerDummyFacade();
@@ -169,7 +81,7 @@ private Q_SLOTS:
             result.exec();
             QCOMPARE(result.size(), 1);
         }
-        //It's running in a separate thread, so we have to wait for a moment.
+        //It's running in a separate thread, so we have to wait for a moment until the query provider deletes itself.
         QTRY_VERIFY(!facade->capturedResultProvider);
     }
 
diff --git a/tests/genericfacadetest.cpp b/tests/genericfacadetest.cpp
index fa086d1..7aaec23 100644
--- a/tests/genericfacadetest.cpp
+++ b/tests/genericfacadetest.cpp
@@ -35,11 +35,25 @@ public:
     QList<Akonadi2::ApplicationDomain::Event::Ptr> mResults;
 };
 
+class TestResourceAccess : public Akonadi2::ResourceAccessInterface
+{
+    Q_OBJECT
+public:
+    virtual ~TestResourceAccess() {};
+    KAsync::Job<void> sendCommand(int commandId) Q_DECL_OVERRIDE { return KAsync::null<void>(); }
+    KAsync::Job<void> sendCommand(int commandId, flatbuffers::FlatBufferBuilder &fbb) Q_DECL_OVERRIDE { return KAsync::null<void>(); }
+    KAsync::Job<void> synchronizeResource(bool remoteSync, bool localSync) Q_DECL_OVERRIDE { return KAsync::null<void>(); }
+
+public Q_SLOTS:
+    void open() Q_DECL_OVERRIDE {}
+    void close() Q_DECL_OVERRIDE {}
+};
+
 class TestResourceFacade : public Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Event>
 {
 public:
-    TestResourceFacade(const QByteArray &instanceIdentifier, const QSharedPointer<EntityStorage<Akonadi2::ApplicationDomain::Event> > storage)
-        : Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Event>(instanceIdentifier, QSharedPointer<TestEventAdaptorFactory>::create(), storage)
+    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)
     {
 
     }
@@ -58,11 +72,12 @@ private Q_SLOTS:
     {
         Akonadi2::Query query;
         query.liveQuery = false;
-        auto resultSet = QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> >::create();
 
+        auto resultSet = QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> >::create();
         auto storage = QSharedPointer<TestEntityStorage>::create("identifier", QSharedPointer<TestEventAdaptorFactory>::create());
+        auto resourceAccess = QSharedPointer<TestResourceAccess>::create();
         storage->mResults << Akonadi2::ApplicationDomain::Event::Ptr::create();
-        TestResourceFacade facade("identifier", storage);
+        TestResourceFacade facade("identifier", storage, resourceAccess);
 
         async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(resultSet->emitter());
 
@@ -74,6 +89,38 @@ private Q_SLOTS:
 
         QCOMPARE(result.size(), 1);
     }
+
+    void testLiveQuery()
+    {
+        Akonadi2::Query query;
+        query.liveQuery = true;
+
+        auto resultSet = QSharedPointer<Akonadi2::ResultProvider<Akonadi2::ApplicationDomain::Event::Ptr> >::create();
+        auto storage = QSharedPointer<TestEntityStorage>::create("identifier", QSharedPointer<TestEventAdaptorFactory>::create());
+        auto resourceAccess = QSharedPointer<TestResourceAccess>::create();
+        storage->mResults << Akonadi2::ApplicationDomain::Event::Ptr::create();
+        TestResourceFacade facade("identifier", storage, resourceAccess);
+
+        async::SyncListResult<Akonadi2::ApplicationDomain::Event::Ptr> result(resultSet->emitter());
+
+        facade.load(query, resultSet).exec().waitForFinished();
+        resultSet->initialResultSetComplete();
+
+        result.exec();
+        QCOMPARE(result.size(), 1);
+
+        //Enter a second result
+        storage->mResults.clear();
+        storage->mResults << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id2", 0, QSharedPointer<Akonadi2::ApplicationDomain::BufferAdaptor>());
+        resourceAccess->emit revisionChanged(2);
+
+        //Hack to get event loop in synclistresult to abort again
+        resultSet->initialResultSetComplete();
+        result.exec();
+
+        // QTRY_COMPARE(result.size(), 2);
+        QCOMPARE(result.size(), 2);
+    }
 };
 
 QTEST_MAIN(GenericFacadeTest)