From 903960116eb3329631702723bba11f5463eff573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Knau=C3=9F?= Date: Fri, 22 Jul 2016 13:23:17 +0200 Subject: fixes the build issues --- .../domain/mimetreeparser/tests/interfacetest.cpp | 54 +++++++++++++--------- 1 file changed, 33 insertions(+), 21 deletions(-) (limited to 'framework/domain/mimetreeparser/tests/interfacetest.cpp') diff --git a/framework/domain/mimetreeparser/tests/interfacetest.cpp b/framework/domain/mimetreeparser/tests/interfacetest.cpp index 88691539..822d530c 100644 --- a/framework/domain/mimetreeparser/tests/interfacetest.cpp +++ b/framework/domain/mimetreeparser/tests/interfacetest.cpp @@ -48,34 +48,38 @@ private slots: void testTextMail() { Parser parser(readMailFromFile("plaintext.mbox")); - auto contentPart = parser.collectContentPart(); + auto contentPartList = parser.collectContentParts(); + QCOMPARE(contentPartList.size(), 1); + auto contentPart = contentPartList[0]; QVERIFY((bool)contentPart); - QCOMPARE(contentPart->availableContents(), ContentPart::PlainText); - auto contentList = contentPart->content(ContentPart::PlainText); + QCOMPARE(contentPart->availableContents(), "plaintext"); + auto contentList = contentPart->content("plaintext"); QCOMPARE(contentList.size(), 1); QCOMPARE(contentList[0]->content(), QStringLiteral("If you can see this text it means that your email client couldn't display our newsletter properly.\nPlease visit this link to view the newsletter on our website: http://www.gog.com/newsletter/").toLocal8Bit()); QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit()); QCOMPARE(contentList[0]->encryptions().size(), 0); QCOMPARE(contentList[0]->signatures().size(), 0); - contentList = contentPart->content(ContentPart::Html); + contentList = contentPart->content("html"); QCOMPARE(contentList.size(), 0); } void testTextAlternative() { Parser parser(readMailFromFile("alternative.mbox")); - auto contentPart = parser.collectContentPart(); + auto contentPartList = parser.collectContentParts(); + QCOMPARE(contentPartList.size(), 1); + auto contentPart = contentPartList[0]; QVERIFY((bool)contentPart); - QCOMPARE(contentPart->availableContents(), ContentPart::PlainText | ContentPart::Html); - auto contentList = contentPart->content(ContentPart::PlainText); + QCOMPARE(contentPart->availableContents(), QVector() << "html" << "plaintext"); + auto contentList = contentPart->content("plaintext"); QCOMPARE(contentList.size(), 1); QCOMPARE(contentList[0]->content(), QStringLiteral("If you can see this text it means that your email client couldn't display our newsletter properly.\nPlease visit this link to view the newsletter on our website: http://www.gog.com/newsletter/\n").toLocal8Bit()); QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit()); QCOMPARE(contentList[0]->encryptions().size(), 0); QCOMPARE(contentList[0]->signatures().size(), 0); - contentList = contentPart->content(ContentPart::Html); + contentList = contentPart->content("html"); QCOMPARE(contentList.size(), 1); QCOMPARE(contentList[0]->content(), QStringLiteral("

HTML text

\n\n").toLocal8Bit()); QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit()); @@ -86,14 +90,16 @@ private slots: void testTextHtml() { Parser parser(readMailFromFile("html.mbox")); - auto contentPart = parser.collectContentPart(); + auto contentPartList = parser.collectContentParts(); + QCOMPARE(contentPartList.size(), 1); + auto contentPart = contentPartList[0]; QVERIFY((bool)contentPart); - QCOMPARE(contentPart->availableContents(), ContentPart::Html); + QCOMPARE(contentPart->availableContents(), "html"); - auto contentList = contentPart->content(ContentPart::PlainText); + auto contentList = contentPart->content("plaintext"); QCOMPARE(contentList.size(), 0); - contentList = contentPart->content(ContentPart::Html); + contentList = contentPart->content("html"); QCOMPARE(contentList.size(), 1); QCOMPARE(contentList[0]->content(), QStringLiteral("

HTML text

").toLocal8Bit()); QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit()); @@ -105,10 +111,12 @@ private slots: { Parser parser(readMailFromFile("smime-encrypted.mbox")); printTree(parser.d->mTree,QString()); - auto contentPart = parser.collectContentPart(); + auto contentPartList = parser.collectContentParts(); + QCOMPARE(contentPartList.size(), 1); + auto contentPart = contentPartList[0]; QVERIFY((bool)contentPart); - QCOMPARE(contentPart->availableContents(), ContentPart::PlainText); - auto contentList = contentPart->content(ContentPart::PlainText); + QCOMPARE(contentPart->availableContents(), "plaintext"); + auto contentList = contentPart->content("plaintext"); QCOMPARE(contentList.size(), 1); QCOMPARE(contentList[0]->content(), QStringLiteral("The quick brown fox jumped over the lazy dog.").toLocal8Bit()); QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit()); @@ -118,10 +126,12 @@ private slots: { Parser parser(readMailFromFile("openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox")); printTree(parser.d->mTree,QString()); - auto contentPart = parser.collectContentPart(); + auto contentPartList = parser.collectContentParts(); + QCOMPARE(contentPartList.size(), 1); + auto contentPart = contentPartList[0]; QVERIFY((bool)contentPart); - QCOMPARE(contentPart->availableContents(), ContentPart::PlainText); - auto contentList = contentPart->content(ContentPart::PlainText); + QCOMPARE(contentPart->availableContents(), "plaintext"); + auto contentList = contentPart->content("plaintext"); QCOMPARE(contentList.size(), 1); QCOMPARE(contentList[0]->content(), QStringLiteral("test text").toLocal8Bit()); QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit()); @@ -131,10 +141,12 @@ private slots: { Parser parser(readMailFromFile("openpgp-inline-charset-encrypted.mbox")); printTree(parser.d->mTree,QString()); - auto contentPart = parser.collectContentPart(); + auto contentPartList = parser.collectContentParts(); + QCOMPARE(contentPartList.size(), 1); + auto contentPart = contentPartList[0]; QVERIFY((bool)contentPart); - QCOMPARE(contentPart->availableContents(), ContentPart::PlainText); - auto contentList = contentPart->content(ContentPart::PlainText); + QCOMPARE(contentPart->availableContents(), "plaintext"); + auto contentList = contentPart->content("plaintext"); QCOMPARE(contentList.size(), 1); QCOMPARE(contentList[0]->content(), QStringLiteral("asdasd asd asd asdf sadf sdaf sadf äöü").toLocal8Bit()); QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit()); -- cgit v1.2.3