1 files changed, 96 insertions, 61 deletions

diff --git a/tests/maildirresourcetest.cpp b/tests/maildirresourcetest.cpp
index 6ad6ca6..28a1d44 100644
--- a/tests/maildirresourcetest.cpp
+++ b/tests/maildirresourcetest.cpp
@@ -3,7 +3,8 @@
 #include <QString>
 
 #include "maildirresource/maildirresource.h"
-#include "clientapi.h"
+#include "store.h"
+#include "resourcecontrol.h"
 #include "commands.h"
 #include "entitybuffer.h"
 #include "resourceconfig.h"
@@ -68,7 +69,7 @@ private Q_SLOTS:
 
     void cleanup()
     {
-        Sink::Store::shutdown(QByteArray("org.kde.maildir.instance1")).exec().waitForFinished();
+        Sink::ResourceControl::shutdown(QByteArray("org.kde.maildir.instance1")).exec().waitForFinished();
         MaildirResource::removeFromDisk("org.kde.maildir.instance1");
         QDir dir(targetPath);
         dir.removeRecursively();
@@ -80,7 +81,7 @@ private Q_SLOTS:
         qDebug() << "-----------------------------------------";
         qDebug();
         copyRecursively(TESTDATAPATH "/maildir1", targetPath);
-        Sink::Store::start(QByteArray("org.kde.maildir.instance1")).exec().waitForFinished();
+        Sink::ResourceControl::start(QByteArray("org.kde.maildir.instance1")).exec().waitForFinished();
     }
 
     void testListFolders()
@@ -90,7 +91,7 @@ private Q_SLOTS:
 
         //Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
         QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
@@ -105,7 +106,7 @@ private Q_SLOTS:
 
         //Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
         QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
@@ -123,7 +124,7 @@ private Q_SLOTS:
         //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();
+        ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
         auto result = Store::fetchOne<Folder>(
                 Query::ResourceFilter("org.kde.maildir.instance1") + Query::RequestedProperties(QByteArrayList() << "name")
             )
@@ -149,7 +150,7 @@ private Q_SLOTS:
 
         //Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto mailModel = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
         QTRY_VERIFY(mailModel->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
@@ -158,6 +159,9 @@ private Q_SLOTS:
         QVERIFY(!mail->getProperty("subject").toString().isEmpty());
         QVERIFY(!mail->getProperty("mimeMessage").toString().isEmpty());
         QVERIFY(mail->getProperty("date").toDateTime().isValid());
+
+        QFileInfo info(mail->getProperty("mimeMessage").toString());
+        QVERIFY(info.exists());
     }
 
 
@@ -169,7 +173,7 @@ private Q_SLOTS:
 
         //Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto targetPath = tempDir.path() + "/maildir1/";
         QDir dir(targetPath);
@@ -177,7 +181,7 @@ private Q_SLOTS:
 
         //Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
         QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
@@ -193,11 +197,11 @@ private Q_SLOTS:
 
         //Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         //Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto mailModel = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
         QTRY_VERIFY(mailModel->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
@@ -212,7 +216,7 @@ private Q_SLOTS:
 
         //Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto targetPath = tempDir.path() + "/maildir1/cur/1365777830.R28.localhost.localdomain:2,S";
         QFile file(targetPath);
@@ -220,7 +224,7 @@ private Q_SLOTS:
 
         //Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto mailModel = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
         QTRY_VERIFY(mailModel->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
@@ -233,7 +237,7 @@ private Q_SLOTS:
         query.resources << "org.kde.maildir.instance1";
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         Sink::ApplicationDomain::Folder folder("org.kde.maildir.instance1");
         folder.setProperty("name", "testCreateFolder");
@@ -241,7 +245,7 @@ private Q_SLOTS:
         Sink::Store::create(folder).exec().waitForFinished();
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto targetPath = tempDir.path() + "/maildir1/testCreateFolder";
         QFileInfo file(targetPath);
@@ -259,7 +263,7 @@ private Q_SLOTS:
         Sink::ApplicationDomain::Folder folder("org.kde.maildir.instance1");
         folder.setProperty("name", "testCreateFolder");
         Sink::Store::create(folder).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
         QTRY_VERIFY(QFileInfo(targetPath).exists());
 
         Sink::Query folderQuery;
@@ -271,7 +275,7 @@ private Q_SLOTS:
         auto createdFolder = model->index(0, 0, QModelIndex()).data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Folder::Ptr>();
 
         Sink::Store::remove(*createdFolder).exec().waitForFinished();
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
         QTRY_VERIFY(!QFileInfo(targetPath).exists());
     }
 
@@ -281,15 +285,16 @@ private Q_SLOTS:
         query.resources << "org.kde.maildir.instance1";
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         Sink::ApplicationDomain::Mail mail("org.kde.maildir.instance1");
         mail.setProperty("name", "testCreateMail");
+        //FIXME instead of properties, ensure the mimeMessage property is used and the file is moved as expected
 
         Sink::Store::create(mail).exec().waitForFinished();
 
         //Ensure all local data is processed
-        Sink::Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto targetPath = tempDir.path() + "/maildir1/new";
         QDir dir(targetPath);
@@ -304,29 +309,28 @@ private Q_SLOTS:
 
         auto query = Query::ResourceFilter("org.kde.maildir.instance1");
         Store::synchronize(query).exec().waitForFinished();
-        Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
 
         auto result = Store::fetchOne<Folder>(
-                Query::ResourceFilter("org.kde.maildir.instance1") + Query::PropertyFilter("name", "maildir1") + Query::RequestedProperties(QByteArrayList() << "name")
+            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>, 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();
+            .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(ResourceControl::flushReplayQueue(query.resources)) //The change needs to be replayed already
+                    .then(ResourceControl::inspect<Mail>(ResourceControl::Inspection::ExistenceInspection(*mail, false)));
+            });
+        })
+        .exec();
         result.waitForFinished();
         QVERIFY(!result.errorCode());
     }
@@ -338,33 +342,64 @@ private Q_SLOTS:
 
         auto query = Query::ResourceFilter("org.kde.maildir.instance1");
         Store::synchronize(query).exec().waitForFinished();
-        Store::flushMessageQueue(query.resources).exec().waitForFinished();
+        ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
+
+        Folder f;
 
         auto result = Store::fetchOne<Folder>(
-                Query::ResourceFilter("org.kde.maildir.instance1") + Query::PropertyFilter("name", "maildir1") + Query::RequestedProperties(QByteArrayList() << "name")
+            Query::ResourceFilter("org.kde.maildir.instance1") + Query::PropertyFilter("name", "maildir1") + Query::RequestedProperties(QByteArrayList() << "name")
+        )
+        .then<void, KAsync::Job<void>, Folder>([query, &f](const Folder &folder) {
+            f = folder;
+            return Store::fetchAll<Mail>(
+                Query::ResourceFilter("org.kde.maildir.instance1") + Query::PropertyFilter("folder", folder) + Query::RequestedProperties(QByteArrayList() << "folder" << "subject")
             )
-            .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();
+            .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 Store::modify(*mail)
+                .then<void>(ResourceControl::flushReplayQueue(query.resources)) //The change needs to be replayed already
+                .then(ResourceControl::inspect<Mail>(ResourceControl::Inspection::PropertyInspection(*mail, "unread", true)))
+                .then(ResourceControl::inspect<Mail>(ResourceControl::Inspection::PropertyInspection(*mail, "subject", mail->getProperty("subject"))));
+            });
+        })
+        .exec();
         result.waitForFinished();
         QVERIFY(!result.errorCode());
+
+        //Verify that we can still query for all relevant information
+        auto result2 = Store::fetchAll<Mail>(
+            Query::ResourceFilter("org.kde.maildir.instance1") + Query::PropertyFilter("folder", f) + Query::RequestedProperties(QByteArrayList() << "folder" << "subject" << "mimeMessage" << "unread")
+        )
+        .then<void, KAsync::Job<void>, QList<Mail::Ptr> >([](const QList<Mail::Ptr> &mails) {
+            //Can't use QCOMPARE because it tries to return FIXME Implement ASYNCCOMPARE
+            if (mails.size() != 1) {
+                qWarning() << "Wrong number of mails";
+                return KAsync::error<void>(1, "Wrong number of mails.");
+            }
+            auto mail = mails.first();
+            if (mail->getProperty("subject").toString().isEmpty()) {
+                qWarning() << "Wrong subject";
+                return KAsync::error<void>(1, "Wrong subject.");
+            }
+            if (mail->getProperty("unread").toBool() != true) {
+                qWarning() << "Not unread";
+                return KAsync::error<void>(1, "Not unread.");
+            }
+            QFileInfo info(mail->getProperty("mimeMessage").toString());
+            if (!info.exists()) {
+                qWarning() << "Wrong subject";
+                return KAsync::error<void>(1, "Can't find mime message.");
+            }
+            return KAsync::null<void>();
+        })
+        .exec();
+        result2.waitForFinished();
+        QVERIFY(!result2.errorCode());
     }
 
 };