1 files changed, 30 insertions, 0 deletions

diff --git a/tests/clientapitest.cpp b/tests/clientapitest.cpp
index 78e1d1e..86150ee 100644
--- a/tests/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -33,6 +33,7 @@ public:
     KAsync::Job<void> create(const T &domainObject) Q_DECL_OVERRIDE { return KAsync::null<void>(); };
     KAsync::Job<void> modify(const T &domainObject) Q_DECL_OVERRIDE { return KAsync::null<void>(); };
     KAsync::Job<void> remove(const T &domainObject) Q_DECL_OVERRIDE { return KAsync::null<void>(); };
+    KAsync::Job<void> inspect(const Akonadi2::Inspection &) Q_DECL_OVERRIDE { return KAsync::null<void>(); };
     QPair<KAsync::Job<void>, typename Akonadi2::ResultEmitter<typename T::Ptr>::Ptr > load(const Akonadi2::Query &query) Q_DECL_OVERRIDE
     {
         auto resultProvider = new Akonadi2::ResultProvider<typename T::Ptr>();
@@ -265,9 +266,38 @@ private Q_SLOTS:
         Akonadi2::Query query;
         query.liveQuery = false;
 
+        int childrenFetchedCount = 0;
         auto model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Event>(query);
+        QObject::connect(model.data(), &QAbstractItemModel::dataChanged, [&childrenFetchedCount](const QModelIndex &, const QModelIndex &, const QVector<int> &roles) {
+            if (roles.contains(Akonadi2::Store::ChildrenFetchedRole)) {
+                childrenFetchedCount++;
+            }
+        });
         QTRY_VERIFY(model->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool());
         QCOMPARE(model->rowCount(QModelIndex()), 2);
+        //Ensure children fetched is only emitted once (when all resources are done)
+        QTest::qWait(50);
+        QCOMPARE(childrenFetchedCount, 1);
+    }
+
+    void testImperativeLoad()
+    {
+        auto facade = DummyResourceFacade<Akonadi2::ApplicationDomain::Event>::registerFacade();
+        facade->results << QSharedPointer<Akonadi2::ApplicationDomain::Event>::create("resource", "id", 0, QSharedPointer<Akonadi2::ApplicationDomain::MemoryBufferAdaptor>::create());
+        ResourceConfig::addResource("dummyresource.instance1", "dummyresource");
+
+        Akonadi2::Query query;
+        query.resources << "dummyresource.instance1";
+        query.liveQuery = false;
+
+        bool gotValue = false;
+        auto result = Akonadi2::Store::fetchOne<Akonadi2::ApplicationDomain::Event>(query)
+            .then<void, Akonadi2::ApplicationDomain::Event>([&gotValue](const Akonadi2::ApplicationDomain::Event &event) {
+                gotValue = true;
+            }).exec();
+        result.waitForFinished();
+        QVERIFY(!result.errorCode());
+        QVERIFY(gotValue);
     }