1 files changed, 98 insertions, 12 deletions

diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp
index 3ca8eaa..496b7ef 100644
--- a/tests/mailtest.cpp
+++ b/tests/mailtest.cpp
@@ -42,6 +42,7 @@ void MailTest::initTestCase()
     VERIFYEXEC(Store::create(resource));
 
     mResourceInstanceIdentifier = resource.identifier();
+    mCapabilities = resource.getProperty("capabilities").value<QByteArrayList>();
 }
 
 void MailTest::cleanup()
@@ -131,13 +132,8 @@ void MailTest::testCreateModifyDeleteFolder()
 
 void MailTest::testCreateModifyDeleteMail()
 {
-
     const auto subject = QString::fromLatin1("Foobar");
 
-    Query query;
-    query.resources << mResourceInstanceIdentifier;
-    query.request<Mail::Folder>().request<Mail::Subject>();
-
     auto folder = Folder::create(mResourceInstanceIdentifier);
     folder.setName("folder");
     VERIFYEXEC(Store::create(folder));
@@ -151,7 +147,7 @@ void MailTest::testCreateModifyDeleteMail()
     mail.setFolder(folder);
 
     VERIFYEXEC(Store::create(mail));
-    VERIFYEXEC(ResourceControl::flushMessageQueue(query.resources));
+    VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Mail>(Query::RequestedProperties(QByteArrayList() << Mail::Folder::name << Mail::Subject::name << Mail::MimeMessage::name))
             .then<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) {
@@ -160,14 +156,13 @@ void MailTest::testCreateModifyDeleteMail()
                 QCOMPARE(mail.getSubject(), subject);
                 QCOMPARE(mail.getFolder(), folder.identifier());
                 QVERIFY(QFile(mail.getMimeMessagePath()).exists());
-
-                // 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)));
             });
         VERIFYEXEC(job);
     }
 
+    VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Mail>(ResourceControl::Inspection::ExistenceInspection(mail, true)));
+    VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Folder>(ResourceControl::Inspection::CacheIntegrityInspection(folder)));
+
     const auto subject2 = QString::fromLatin1("Foobar2");
     auto message2 = KMime::Message::Ptr::create();
     message2->subject(true)->fromUnicodeString(subject2, "utf8");
@@ -175,7 +170,7 @@ void MailTest::testCreateModifyDeleteMail()
     mail.setMimeMessage(message2->encodedContent());
 
     VERIFYEXEC(Store::modify(mail));
-    VERIFYEXEC(ResourceControl::flushMessageQueue(query.resources));
+    VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Mail>(Query::RequestedProperties(QByteArrayList() << Mail::Folder::name << Mail::Subject::name))
             .then<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) {
@@ -188,9 +183,11 @@ void MailTest::testCreateModifyDeleteMail()
             });
         VERIFYEXEC(job);
     }
+    VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Mail>(ResourceControl::Inspection::ExistenceInspection(mail, true)));
+    VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Folder>(ResourceControl::Inspection::CacheIntegrityInspection(folder)));
 
     VERIFYEXEC(Store::remove(mail));
-    VERIFYEXEC(ResourceControl::flushMessageQueue(query.resources));
+    VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
     {
         auto job = Store::fetchAll<Mail>(Query::RequestedProperties(QByteArrayList() << Mail::Folder::name << Mail::Subject::name))
             .then<void, QList<Mail::Ptr>>([=](const QList<Mail::Ptr> &mails) {
@@ -198,6 +195,95 @@ void MailTest::testCreateModifyDeleteMail()
             });
         VERIFYEXEC(job);
     }
+    VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Mail>(ResourceControl::Inspection::ExistenceInspection(mail, false)));
+    VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Folder>(ResourceControl::Inspection::CacheIntegrityInspection(folder)));
+}
+
+void MailTest::testMarkMailAsRead()
+{
+    auto folder = Folder::create(mResourceInstanceIdentifier);
+    folder.setName("folder");
+    VERIFYEXEC(Store::create(folder));
+
+    auto message = KMime::Message::Ptr::create();
+    message->subject(true)->fromUnicodeString("subject", "utf8");
+    message->assemble();
+
+    auto mail = Mail::create(mResourceInstanceIdentifier);
+    mail.setMimeMessage(message->encodedContent());
+    mail.setFolder(folder);
+    mail.setUnread(false);
+    VERIFYEXEC(Store::create(mail));
+    VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+
+    auto job = Store::fetchAll<Mail>(Query::ResourceFilter(mResourceInstanceIdentifier) +
+                                Query::RequestedProperties(QByteArrayList() << Mail::Folder::name
+                                                                            << Mail::Subject::name))
+        .then<void, KAsync::Job<void>, QList<Mail::Ptr>>([this](const QList<Mail::Ptr> &mails) {
+            ASYNCCOMPARE(mails.size(), 1);
+            auto mail = mails.first();
+            mail->setProperty("unread", true);
+            return Store::modify(*mail)
+                .then<void>(ResourceControl::flushReplayQueue(QByteArrayList() << mResourceInstanceIdentifier)) // The change needs to be replayed already
+                .then(ResourceControl::inspect<Mail>(ResourceControl::Inspection::PropertyInspection(*mail, Mail::Unread::name, true)))
+                .then(ResourceControl::inspect<Mail>(ResourceControl::Inspection::PropertyInspection(*mail, Mail::Subject::name, mail->getSubject())));
+        });
+    VERIFYEXEC(job);
+
+    // Verify that we can still query for all relevant information
+    auto job2 = Store::fetchAll<Mail>(
+                        Query::ResourceFilter(mResourceInstanceIdentifier) + Query::RequestedProperties(QByteArrayList() << Mail::Folder::name
+                                                                                                                         << Mail::Subject::name
+                                                                                                                         << Mail::MimeMessage::name
+                                                                                                                         << Mail::Unread::name))
+        .then<void, KAsync::Job<void>, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+            ASYNCCOMPARE(mails.size(), 1);
+            auto mail = mails.first();
+            ASYNCVERIFY(!mail->getSubject().isEmpty());
+            ASYNCCOMPARE(mail->getUnread(), true);
+            ASYNCVERIFY(QFileInfo(mail->getMimeMessagePath()).exists());
+            return KAsync::null<void>();
+        });
+    VERIFYEXEC(job2);
+}
+
+void MailTest::testCreateDraft()
+{
+    if (!mCapabilities.contains("drafts")) {
+        QSKIP("Resource doesn't have the drafts capability");
+    }
+
+    auto message = KMime::Message::Ptr::create();
+    message->subject(true)->fromUnicodeString(QString::fromLatin1("Foobar"), "utf8");
+    message->assemble();
+
+    auto mail = ApplicationDomain::Mail::create(mResourceInstanceIdentifier);
+    mail.setMimeMessage(message->encodedContent());
+    mail.setDraft(true);
+
+    VERIFYEXEC(Store::create(mail));
+    VERIFYEXEC(ResourceControl::flushMessageQueue(QByteArrayList() << mResourceInstanceIdentifier));
+
+    QByteArray folderIdentifier;
+    auto job = Store::fetchOne<ApplicationDomain::Mail>(Query::IdentityFilter(mail.identifier()) + Query::RequestedProperties(QByteArrayList() << Mail::MimeMessage::name << Mail::Folder::name))
+        .then<void, ApplicationDomain::Mail>([&](const ApplicationDomain::Mail &mail) {
+            folderIdentifier = mail.getProperty("folder").toByteArray();
+            QVERIFY(!folderIdentifier.isEmpty());
+        });
+    VERIFYEXEC(job);
+
+    //Ensure we can also query by folder
+    auto job2 = Store::fetchAll<ApplicationDomain::Mail>(Query::PropertyFilter("folder", folderIdentifier))
+        .then<void, QList<ApplicationDomain::Mail::Ptr> >([&](const QList<ApplicationDomain::Mail::Ptr> &mails) {
+            bool found = false;
+            for (const auto m : mails) {
+                if (m->identifier() == mail.identifier()) {
+                    found = true;
+                }
+            }
+            QVERIFY(found);
+        });
+    VERIFYEXEC(job2);
 }
 
 #include "mailtest.moc"