From 9b2257d680a5e4fa2fda8cf3302f25054a06710e Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Sun, 28 Dec 2014 14:44:50 +0100 Subject: Buffers wrapped into entity buffer, async command progress tracking. --- tests/dummyresourcefacadetest.cpp | 15 ++++----------- tests/dummyresourcetest.cpp | 15 ++++++++++++++- 2 files changed, 18 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/dummyresourcefacadetest.cpp b/tests/dummyresourcefacadetest.cpp index d815e9b..e4d27fc 100644 --- a/tests/dummyresourcefacadetest.cpp +++ b/tests/dummyresourcefacadetest.cpp @@ -51,17 +51,10 @@ private Q_SLOTS: query.ids << "key50"; query.resources << "dummyresource"; - auto result = Akonadi2::Store::load(query); - bool complete = false; - QVector results; - result->onAdded([&results](const Akonadi2::Domain::Event::Ptr &e) { - results << e; - }); - result->onComplete([&complete]() { - complete = true; - }); - QTRY_VERIFY(complete); - QCOMPARE(results.size(), 1); + //FIXME avoid sync somehow. No synchronizer access here (perhaps configure the instance above accordingly?) + async::SyncListResult result(Akonadi2::Store::load(query)); + result.exec(); + QCOMPARE(result.size(), 1); Akonadi2::Storage storage(testDataPath, dbName); storage.removeFromDisk(); diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp index 75d29de..0c02675 100644 --- a/tests/dummyresourcetest.cpp +++ b/tests/dummyresourcetest.cpp @@ -2,7 +2,7 @@ #include -#include "common/resource.h" +#include "dummyresource/resourcefactory.h" #include "clientapi.h" class DummyResourceTest : public QObject @@ -13,12 +13,23 @@ private Q_SLOTS: { auto factory = Akonadi2::ResourceFactory::load("org.kde.dummy"); QVERIFY(factory); + Akonadi2::Storage store(Akonadi2::Store::storageLocation(), "org.kde.dummy", Akonadi2::Storage::ReadWrite); + store.removeFromDisk(); } void cleanupTestCase() { } + void testResource() + { + Akonadi2::Pipeline pipeline("org.kde.dummy"); + DummyResource resource; + auto job = resource.synchronizeWithSource(&pipeline); + auto future = job.exec(); + QTRY_VERIFY(future.isFinished()); + } + void testSync() { Akonadi2::Query query; @@ -27,6 +38,8 @@ private Q_SLOTS: async::SyncListResult result(Akonadi2::Store::load(query)); result.exec(); QVERIFY(!result.isEmpty()); + auto value = result.first(); + qDebug() << value->getProperty("summary"); } }; -- cgit v1.2.3