1 files changed, 59 insertions, 0 deletions

diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp
index 88cacd2..8e20fae 100644
--- a/tests/mailtest.cpp
+++ b/tests/mailtest.cpp
@@ -474,3 +474,62 @@ void MailTest::testModifyMailToTrash()
     }
     VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Mail>(ResourceControl::Inspection::ExistenceInspection(mail, true)));
 }
+
+void MailTest::testBogusMessageAppend()
+{
+    auto folder = Folder::create(mResourceInstanceIdentifier);
+    folder.setName("bogusfolder");
+    VERIFYEXEC(Store::create(folder));
+
+    Mail bogusMail;
+    {
+        auto mail = Mail::create(mResourceInstanceIdentifier);
+        mail.setMimeMessage("Bogus message: \0 this doesn't make any sense and contains NUL.");
+        mail.setFolder(folder);
+
+        VERIFYEXEC(Store::create(mail));
+
+        VERIFYEXEC(ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
+        auto mails = Store::read<Mail>(Query().request<Mail::Folder>().request<Mail::Subject>().request<Mail::MimeMessage>());
+        QCOMPARE(mails.size(), 1);
+        bogusMail = mails.at(0);
+
+        VERIFYEXEC(ResourceControl::flushReplayQueue(mResourceInstanceIdentifier));
+        VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Mail>(ResourceControl::Inspection::ExistenceInspection(mail, false)));
+        //The cache will be off by one (because we failed to replay)
+        // VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Folder>(ResourceControl::Inspection::CacheIntegrityInspection(folder)));
+    }
+
+
+    //Ensure we can still append further messages:
+    {
+        auto mail = Mail::create(mResourceInstanceIdentifier);
+        {
+            auto message = KMime::Message::Ptr::create();
+            message->subject(true)->fromUnicodeString("Subject", "utf8");
+            message->assemble();
+            mail.setMimeMessage(message->encodedContent(true));
+        }
+        mail.setFolder(folder);
+        VERIFYEXEC(Store::create(mail));
+
+        VERIFYEXEC(ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
+        auto mails = Store::read<Mail>(Query().request<Mail::Folder>().request<Mail::Subject>().request<Mail::MimeMessage>());
+        QCOMPARE(mails.size(), 2);
+
+        VERIFYEXEC(ResourceControl::flushReplayQueue(mResourceInstanceIdentifier));
+        //The mail is still not available, because we'll end up trying to replay the bogus mail again.
+        VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Mail>(ResourceControl::Inspection::ExistenceInspection(mail, false)));
+
+        //Fix the situation by deleting the bogus mail and retrying to sync.
+        VERIFYEXEC(Store::remove(bogusMail));
+        VERIFYEXEC(ResourceControl::flushMessageQueue(mResourceInstanceIdentifier));
+        VERIFYEXEC(ResourceControl::flushReplayQueue(mResourceInstanceIdentifier));
+
+        //This will fail because we still try to resync the previous mail
+        VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Mail>(ResourceControl::Inspection::ExistenceInspection(mail, true)));
+        //The cache will be off by one (because we failed to replay)
+        VERIFYEXEC(ResourceControl::inspect<ApplicationDomain::Folder>(ResourceControl::Inspection::CacheIntegrityInspection(folder)));
+    }
+
+}