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. --- examples/imapresource/tests/imapmailtest.cpp | 85 ++++++++++++++++++++++++++++ tests/mailtest.cpp | 58 ------------------- tests/mailtest.h | 1 - 3 files changed, 85 insertions(+), 59 deletions(-) diff --git a/examples/imapresource/tests/imapmailtest.cpp b/examples/imapresource/tests/imapmailtest.cpp index e1dee0d..cab529b 100644 --- a/examples/imapresource/tests/imapmailtest.cpp +++ b/examples/imapresource/tests/imapmailtest.cpp @@ -1,11 +1,32 @@ +/* + * Copyright (C) 2016 Christian Mollekopf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ #include #include +#include #include #include "common/test.h" #include "common/domain/applicationdomaintype.h" #include "common/secretstore.h" +#include "common/resourcecontrol.h" +#include "common/store.h" using namespace Sink; using namespace Sink::ApplicationDomain; @@ -42,6 +63,70 @@ protected: Sink::SecretStore::instance().insert(resource.identifier(), "doe"); return resource; } + +private slots: + + void testBogusMessageAppend() + { + using namespace Sink; + using namespace Sink::ApplicationDomain; + + 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))); + } + + } }; QTEST_MAIN(ImapMailTest) 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