1 files changed, 101 insertions, 77 deletions

diff --git a/tests/maildirresourcetest.cpp b/tests/maildirresourcetest.cpp
index 6e7818a..ec4f6a4 100644
--- a/tests/maildirresourcetest.cpp
+++ b/tests/maildirresourcetest.cpp
@@ -87,11 +87,10 @@ private Q_SLOTS:
     {
         Akonadi2::Query query;
         query.resources << "org.kde.maildir.instance1";
-        query.syncOnDemand = true;
-        query.processAll = true;
 
         //Ensure all local data is processed
         Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Folder>(query);
         QTRY_VERIFY(model->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool());
@@ -102,12 +101,11 @@ private Q_SLOTS:
     {
         Akonadi2::Query query;
         query.resources << "org.kde.maildir.instance1";
-        query.syncOnDemand = true;
-        query.processAll = true;
         query.parentProperty = "parent";
 
         //Ensure all local data is processed
         Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Folder>(query);
         QTRY_VERIFY(model->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool());
@@ -120,34 +118,27 @@ private Q_SLOTS:
 
     void testListMailsOfFolder()
     {
-        {
-            Akonadi2::Query query;
-            query.resources << "org.kde.maildir.instance1";
-            query.syncOnDemand = true;
-            query.processAll = true;
-
-            //Ensure all local data is processed
-            Akonadi2::Store::synchronize(query).exec().waitForFinished();
-        }
-        QByteArray folderIdentifier;
-        {
-            Akonadi2::Query query;
-            query.resources << "org.kde.maildir.instance1";
-            query.requestedProperties << "folder" << "name";
-
-            auto model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Folder>(query);
-            QTRY_VERIFY(model->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool());
-            QVERIFY(model->rowCount(QModelIndex()) > 1);
-            folderIdentifier = model->index(1, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Folder::Ptr>()->identifier();
-        }
-
-        Akonadi2::Query query;
-        query.resources << "org.kde.maildir.instance1";
-        query.requestedProperties << "folder" << "subject";
-        query.propertyFilter.insert("folder", folderIdentifier);
-        auto mailModel = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Mail>(query);
-        QTRY_VERIFY(mailModel->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool());
-        QVERIFY(mailModel->rowCount(QModelIndex()) >= 1);
+        using namespace Akonadi2;
+        using namespace Akonadi2::ApplicationDomain;
+        //Ensure all local data is processed
+        auto query = Query::ResourceFilter("org.kde.maildir.instance1");
+        Store::synchronize(query).exec().waitForFinished();
+        Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        auto result = Store::fetchOne<Folder>(
+                Query::ResourceFilter("org.kde.maildir.instance1") + Query::RequestedProperties(QByteArrayList() << "name")
+            )
+            .then<QList<Mail::Ptr>, Folder>([](const Folder &folder) {
+                Trace() << "Found a folder" << folder.identifier();
+                return Store::fetchAll<Mail>(
+                    Query::PropertyFilter("folder", folder) + Query::RequestedProperties(QByteArrayList() << "folder" << "subject")
+                );
+            })
+            .then<void, QList<Mail::Ptr> >([](const QList<Mail::Ptr> &mails) {
+                QVERIFY(mails.size() >= 1);
+            })
+            .exec();
+        result.waitForFinished();
+        QVERIFY(!result.errorCode());
     }
 
     void testMailContent()
@@ -155,11 +146,10 @@ private Q_SLOTS:
         Akonadi2::Query query;
         query.resources << "org.kde.maildir.instance1";
         query.requestedProperties << "folder" << "subject" << "mimeMessage" << "date";
-        query.syncOnDemand = true;
-        query.processAll = true;
 
         //Ensure all local data is processed
         Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto mailModel = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Mail>(query);
         QTRY_VERIFY(mailModel->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool());
@@ -175,12 +165,11 @@ private Q_SLOTS:
     {
         Akonadi2::Query query;
         query.resources << "org.kde.maildir.instance1";
-        query.syncOnDemand = true;
-        query.processAll = true;
         query.requestedProperties << "name";
 
         //Ensure all local data is processed
         Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto targetPath = tempDir.path() + "/maildir1/";
         QDir dir(targetPath);
@@ -188,6 +177,7 @@ private Q_SLOTS:
 
         //Ensure all local data is processed
         Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Folder>(query);
         QTRY_VERIFY(model->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool());
@@ -199,15 +189,15 @@ private Q_SLOTS:
     {
         Akonadi2::Query query;
         query.resources << "org.kde.maildir.instance1";
-        query.syncOnDemand = true;
-        query.processAll = true;
         query.requestedProperties << "folder" << "subject";
 
         //Ensure all local data is processed
         Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         //Ensure all local data is processed
         Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto mailModel = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Mail>(query);
         QTRY_VERIFY(mailModel->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool());
@@ -218,12 +208,11 @@ private Q_SLOTS:
     {
         Akonadi2::Query query;
         query.resources << "org.kde.maildir.instance1";
-        query.syncOnDemand = true;
-        query.processAll = true;
         query.requestedProperties << "folder" << "subject";
 
         //Ensure all local data is processed
         Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto targetPath = tempDir.path() + "/maildir1/cur/1365777830.R28.localhost.localdomain:2,S";
         QFile file(targetPath);
@@ -231,6 +220,7 @@ private Q_SLOTS:
 
         //Ensure all local data is processed
         Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto mailModel = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Mail>(query);
         QTRY_VERIFY(mailModel->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool());
@@ -241,11 +231,9 @@ private Q_SLOTS:
     {
         Akonadi2::Query query;
         query.resources << "org.kde.maildir.instance1";
-        query.syncOnDemand = false;
-        query.processAll = true;
 
         //Ensure all local data is processed
-        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         Akonadi2::ApplicationDomain::Folder folder("org.kde.maildir.instance1");
         folder.setProperty("name", "testCreateFolder");
@@ -253,7 +241,7 @@ private Q_SLOTS:
         Akonadi2::Store::create(folder).exec().waitForFinished();
 
         //Ensure all local data is processed
-        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto targetPath = tempDir.path() + "/maildir1/testCreateFolder";
         QFileInfo file(targetPath);
@@ -265,15 +253,13 @@ private Q_SLOTS:
     {
         Akonadi2::Query query;
         query.resources << "org.kde.maildir.instance1";
-        query.syncOnDemand = false;
-        query.processAll = true;
 
         auto targetPath = tempDir.path() + "/maildir1/testCreateFolder";
 
         Akonadi2::ApplicationDomain::Folder folder("org.kde.maildir.instance1");
         folder.setProperty("name", "testCreateFolder");
         Akonadi2::Store::create(folder).exec().waitForFinished();
-        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
         QTRY_VERIFY(QFileInfo(targetPath).exists());
 
         Akonadi2::Query folderQuery;
@@ -285,7 +271,7 @@ private Q_SLOTS:
         auto createdFolder = model->index(0, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Folder::Ptr>();
 
         Akonadi2::Store::remove(*createdFolder).exec().waitForFinished();
-        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
         QTRY_VERIFY(!QFileInfo(targetPath).exists());
     }
 
@@ -293,11 +279,9 @@ private Q_SLOTS:
     {
         Akonadi2::Query query;
         query.resources << "org.kde.maildir.instance1";
-        query.syncOnDemand = false;
-        query.processAll = true;
 
         //Ensure all local data is processed
-        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         Akonadi2::ApplicationDomain::Mail mail("org.kde.maildir.instance1");
         mail.setProperty("name", "testCreateMail");
@@ -305,7 +289,7 @@ private Q_SLOTS:
         Akonadi2::Store::create(mail).exec().waitForFinished();
 
         //Ensure all local data is processed
-        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto targetPath = tempDir.path() + "/maildir1/new";
         QDir dir(targetPath);
@@ -315,32 +299,72 @@ private Q_SLOTS:
 
     void testRemoveMail()
     {
-        Akonadi2::Query query;
-        query.resources << "org.kde.maildir.instance1";
-        query.syncOnDemand = true;
-        query.processAll = true;
-        Akonadi2::Store::synchronize(query).exec().waitForFinished();
-
-        Akonadi2::Query folderQuery;
-        folderQuery.resources << "org.kde.maildir.instance1";
-        folderQuery.propertyFilter.insert("name", "maildir1");
-        auto model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Folder>(folderQuery);
-        QTRY_VERIFY(model->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool());
-        QCOMPARE(model->rowCount(QModelIndex()), 1);
-        auto folder = model->index(0, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Folder::Ptr>();
-
-        Akonadi2::Query mailQuery;
-        mailQuery.resources << "org.kde.maildir.instance1";
-        mailQuery.propertyFilter.insert("folder", folder->identifier());
-        auto mailModel = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Mail>(mailQuery);
-        QTRY_VERIFY(mailModel->data(QModelIndex(), Akonadi2::Store::ChildrenFetchedRole).toBool());
-        QCOMPARE(mailModel->rowCount(QModelIndex()), 1);
-        auto mail = mailModel->index(0, 0, QModelIndex()).data(Akonadi2::Store::DomainObjectRole).value<Akonadi2::ApplicationDomain::Mail::Ptr>();
-
-        Akonadi2::Store::remove(*mail).exec().waitForFinished();
-        Akonadi2::Store::synchronize(query).exec().waitForFinished();
+        using namespace Akonadi2;
+        using namespace Akonadi2::ApplicationDomain;
+
+        auto query = Query::ResourceFilter("org.kde.maildir.instance1");
+        Store::synchronize(query).exec().waitForFinished();
+        Store::flushMessageQueue(query.resources).exec().waitForFinished();
+
+        auto result = Store::fetchOne<Folder>(
+                Query::ResourceFilter("org.kde.maildir.instance1") + Query::PropertyFilter("name", "maildir1") + Query::RequestedProperties(QByteArrayList() << "name")
+            )
+            .then<void, KAsync::Job<void>, Folder>([query](const Folder &folder) {
+                return Store::fetchAll<Mail>(
+                    Query::PropertyFilter("folder", folder) + Query::RequestedProperties(QByteArrayList() << "folder" << "subject")
+                )
+                .then<void, KAsync::Job<void>, QList<Mail::Ptr> >([query](const QList<Mail::Ptr> &mails) {
+                    //Can't use QCOMPARE because it tries to return FIXME Implement ASYNCCOMPARE
+                    if (mails.size() != 1) {
+                        return KAsync::error<void>(1, "Wrong number of mails.");
+                    }
+                    auto mail = mails.first();
+
+                    return Store::remove(*mail)
+                        .then(Store::flushReplayQueue(query.resources)) //The change needs to be replayed already
+                        .then(Resources::inspect<Mail>(Resources::Inspection::ExistenceInspection(*mail, false)));
+                })
+                .then<void>([](){});
+            })
+            .exec();
+        result.waitForFinished();
+        QVERIFY(!result.errorCode());
+    }
 
-        QTRY_COMPARE(QDir(tempDir.path() + "/maildir1/cur", QString(), QDir::NoSort, QDir::Files).count(), static_cast<unsigned int>(0));
+    void testMarkMailAsRead()
+    {
+        using namespace Akonadi2;
+        using namespace Akonadi2::ApplicationDomain;
+
+        auto query = Query::ResourceFilter("org.kde.maildir.instance1");
+        Store::synchronize(query).exec().waitForFinished();
+        Store::flushMessageQueue(query.resources).exec().waitForFinished();
+
+        auto result = Store::fetchOne<Folder>(
+                Query::ResourceFilter("org.kde.maildir.instance1") + Query::PropertyFilter("name", "maildir1") + Query::RequestedProperties(QByteArrayList() << "name")
+            )
+            .then<void, KAsync::Job<void>, Folder>([query](const Folder &folder) {
+                Trace() << "Found a folder" << folder.identifier();
+                return Store::fetchAll<Mail>(
+                    Query::PropertyFilter("folder", folder) + Query::RequestedProperties(QByteArrayList() << "folder" << "subject")
+                )
+                .then<void, KAsync::Job<void>, QList<Mail::Ptr> >([query](const QList<Mail::Ptr> &mails) {
+                    //Can't use QCOMPARE because it tries to return FIXME Implement ASYNCCOMPARE
+                    if (mails.size() != 1) {
+                        return KAsync::error<void>(1, "Wrong number of mails.");
+                    }
+                    auto mail = mails.first();
+                    mail->setProperty("unread", true);
+                    auto inspectionCommand = Resources::Inspection::PropertyInspection(*mail, "unread", true);
+                    return Store::modify(*mail)
+                        .then<void>(Store::flushReplayQueue(query.resources)) //The change needs to be replayed already
+                        .then(Resources::inspect<Mail>(inspectionCommand));
+                })
+                .then<void>([](){});
+            })
+            .exec();
+        result.waitForFinished();
+        QVERIFY(!result.errorCode());
     }
 
 };