1 files changed, 11 insertions, 27 deletions

diff --git a/tests/maildirresourcetest.cpp b/tests/maildirresourcetest.cpp
index 8952ff2..146489d 100644
--- a/tests/maildirresourcetest.cpp
+++ b/tests/maildirresourcetest.cpp
@@ -320,10 +320,9 @@ private Q_SLOTS:
                     }
                     auto mail = mails.first();
 
-                    auto inspectionCommand = Akonadi2::Resources::Inspection::ExistenceInspection(*mail, true);
                     return Store::remove(*mail)
                         .then(Store::flushMessageQueue(query.resources)) //The change needs to be replayed already
-                        .then(Resources::inspect<Mail>(inspectionCommand));
+                        .then(Resources::inspect<Mail>(Resources::Inspection::ExistenceInspection(*mail, false)));
                 })
                 .then<void>([](){});
             })
@@ -338,45 +337,30 @@ private Q_SLOTS:
         using namespace Akonadi2::ApplicationDomain;
 
         auto query = Query::ResourceFilter("org.kde.maildir.instance1");
-        Akonadi2::Store::synchronize(query).exec().waitForFinished();
-        Akonadi2::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        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> >([](const QList<Mail::Ptr> &mails) -> KAsync::Job<void> {
-                    //Can't use QCOMPARE because it tries to return
+                .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);
-                    return Akonadi2::Store::modify(*mail);
+                    auto inspectionCommand = Resources::Inspection::PropertyInspection(*mail, "unread", true);
+                    return Store::modify(*mail)
+                        .then<void>(Store::flushMessageQueue(query.resources)) //The change needs to be replayed already
+                        .then(Resources::inspect<Mail>(inspectionCommand));
                 })
-                .then<void>(Akonadi2::Store::flushMessageQueue(query.resources))
-                .then<void, KAsync::Job<void> >([folder]() {
-                    return Store::fetchAll<Mail>(
-                        Query::PropertyFilter("folder", folder) + Query::RequestedProperties(QByteArrayList() << "folder" << "subject" << "unread")
-                    )
-                    .then<void, KAsync::Job<void>, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
-                        //Can't use QCOMPARE because it tries to return
-                        if (mails.size() != 1) {
-                            return KAsync::error<void>(1, "Wrong number of mails.");
-                        }
-                        auto mail = mails.first();
-                        //Can't use QCOMPARE because it tries to return
-                        if (mail->getProperty("unread").toBool() != true) {
-                            return KAsync::error<void>(1, "Wrong property value.");
-                        }
-                        auto inspectionCommand = Akonadi2::Resources::Inspection::PropertyInspection(*mail, "unread", true);
-                        return Akonadi2::Resources::inspect<Mail>(inspectionCommand);
-                    })
-                    .then<void>([](){});
-                });
+                .then<void>([](){});
             })
             .exec();
         result.waitForFinished();