From c55054e899660f2d667af2c2e573a1267d47358e Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Mon, 13 Apr 2015 20:15:14 +0200 Subject: Use a queryrunner to execute queries. The queryrunner is responsible for running queries and keeping them up to date. This is required for self-updating queries. To get this to work properly the ResultProvider/emitter had to be fixed. The emitter now only lives as long as the client holds a reference to it, allowing the provider to detect when it is no longer necessary to keep the query alive (because noone is listening). In the process various lifetime issues have been fixed, that we're caused by lambdas capturing smartpointers, that then extended the lifetime of the associated objects unpredictably. --- common/test/clientapitest.cpp | 106 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 103 insertions(+), 3 deletions(-) (limited to 'common/test') diff --git a/common/test/clientapitest.cpp b/common/test/clientapitest.cpp index 24b3fb9..789c656 100644 --- a/common/test/clientapitest.cpp +++ b/common/test/clientapitest.cpp @@ -3,6 +3,22 @@ #include #include "../clientapi.h" +#include "../facade.h" +#include "../synclistresult.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 { @@ -11,18 +27,63 @@ public: virtual Async::Job create(const Akonadi2::ApplicationDomain::Event &domainObject){ return Async::null(); }; virtual Async::Job modify(const Akonadi2::ApplicationDomain::Event &domainObject){ return Async::null(); }; virtual Async::Job remove(const Akonadi2::ApplicationDomain::Event &domainObject){ return Async::null(); }; - virtual Async::Job load(const Akonadi2::Query &query, const std::function &resultCallback) + virtual Async::Job load(const Akonadi2::Query &query, const std::function &resultCallback) { - return Async::start([this, resultCallback](Async::Future &future) { + return Async::start([this, resultCallback](Async::Future &future) { qDebug() << "load called"; for(const auto &result : results) { resultCallback(result); } + future.setValue(0); future.setFinished(); }); } + Async::Job load(const Akonadi2::Query &query, const QSharedPointer > &resultProvider) + { + auto runner = QSharedPointer::create(query); + //The runner only lives as long as the resultProvider + resultProvider->setQueryRunner(runner); + runner->setQuery([this, resultProvider, query](qint64 oldRevision, qint64 newRevision) -> Async::Job { + qDebug() << "Creating query for revisions: " << oldRevision << newRevision; + return Async::start([this, resultProvider, query](Async::Future &future) { + //TODO only emit changes and don't replace everything + resultProvider->clear(); + //rerun query + std::function addCallback = std::bind(&Akonadi2::ResultProvider::add, resultProvider, std::placeholders::_1); + load(query, addCallback).then([resultProvider, &future](qint64 queriedRevision) { + //TODO set revision in result provider? + //TODO update all existing results with new revision + resultProvider->complete(); + 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 Async::start([runner](Async::Future &future) { + runner->run().then([&future]() { + //TODO if not live query, destroy runner. + future.setFinished(); + }).exec(); + }); + } + QList results; + QSharedPointer notifier; }; class ClientAPITest : public QObject @@ -30,21 +91,60 @@ class ClientAPITest : public QObject Q_OBJECT private Q_SLOTS: + void initTestCase() + { + Akonadi2::FacadeFactory::instance().resetFactory(); + } + void testLoad() { DummyResourceFacade facade; facade.results << QSharedPointer::create("resource", "id", 0, QSharedPointer()); - Akonadi2::FacadeFactory::instance().registerFacade("dummyresource", [facade](){ return new DummyResourceFacade(facade); }); + Akonadi2::FacadeFactory::instance().registerFacade("dummyresource", + [&facade](bool &externallyManaged) { + externallyManaged = true; + return &facade; + } + ); Akonadi2::Query query; query.resources << "dummyresource"; + query.liveQuery = false; async::SyncListResult result(Akonadi2::Store::load(query)); result.exec(); QCOMPARE(result.size(), 1); } + void testLiveQuery() + { + DummyResourceFacade facade; + facade.results << QSharedPointer::create("resource", "id", 0, QSharedPointer()); + + Akonadi2::FacadeFactory::instance().registerFacade("dummyresource", + [&facade](bool &externallManage){ + externallManage = true; + return &facade; + } + ); + + Akonadi2::Query query; + query.resources << "dummyresource"; + query.liveQuery = true; + + async::SyncListResult result(Akonadi2::Store::load(query)); + result.exec(); + QCOMPARE(result.size(), 1); + + //Enter a second result + facade.results << QSharedPointer::create("resource", "id2", 0, QSharedPointer()); + qWarning() << &facade; + QVERIFY(facade.notifier); + facade.notifier->revisionChanged(2); + QTRY_COMPARE(result.size(), 2); + } + }; QTEST_MAIN(ClientAPITest) -- cgit v1.2.3