From 78d9ca435ff06675da79426e09fe9be32106ce35 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 18 May 2018 11:38:29 +0200 Subject: Moved the bogus message test to the imap test. Maildir will happly store anything. --- tests/mailtest.cpp | 58 ------------------------------------------------------ tests/mailtest.h | 1 - 2 files changed, 59 deletions(-) (limited to 'tests') diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp index 8e20fae..9b70309 100644 --- a/tests/mailtest.cpp +++ b/tests/mailtest.cpp @@ -475,61 +475,3 @@ void MailTest::testModifyMailToTrash() VERIFYEXEC(ResourceControl::inspect(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(Query().request().request().request()); - QCOMPARE(mails.size(), 1); - bogusMail = mails.at(0); - - VERIFYEXEC(ResourceControl::flushReplayQueue(mResourceInstanceIdentifier)); - VERIFYEXEC(ResourceControl::inspect(ResourceControl::Inspection::ExistenceInspection(mail, false))); - //The cache will be off by one (because we failed to replay) - // VERIFYEXEC(ResourceControl::inspect(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(Query().request().request().request()); - 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(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(ResourceControl::Inspection::ExistenceInspection(mail, true))); - //The cache will be off by one (because we failed to replay) - VERIFYEXEC(ResourceControl::inspect(ResourceControl::Inspection::CacheIntegrityInspection(folder))); - } - -} diff --git a/tests/mailtest.h b/tests/mailtest.h index 757da1b..b827188 100644 --- a/tests/mailtest.h +++ b/tests/mailtest.h @@ -53,7 +53,6 @@ private slots: void testModifyMailToDraft(); void testModifyMailToTrash(); - void testBogusMessageAppend(); }; } -- cgit v1.2.3