2 files changed, 24 insertions, 13 deletions
diff --git a/framework/domain/mimetreeparser/tests/data/html.mbox b/framework/domain/mimetreeparser/tests/data/html.mbox
index eebd4283..d476a8d4 100644
--- a/framework/domain/mimetreeparser/tests/data/html.mbox
+++ b/framework/domain/mimetreeparser/tests/data/html.mbox
@@ -9,16 +9,6 @@ X-KMail-Drafts: 7
 X-KMail-Templates: 9
 User-Agent: KMail/4.6 beta5 (Linux/2.6.34.7-0.7-desktop; KDE/4.6.41; x86_64; git-0269848; 2011-04-19)
 MIME-Version: 1.0
-Content-Type: multipart/alternative; boundary="nextPart8606278.tpV19BTJKu"
-Content-Transfer-Encoding: 7Bit
--nextPart8606278.tpV19BTJKu
-Content-Transfer-Encoding: 7Bit
-Content-Type: text/plain; charset="windows-1252"
-Some HTML text
--nextPart8606278.tpV19BTJKu
 Content-Transfer-Encoding: 7Bit
 Content-Type: text/html; charset="windows-1252"
@@ -27,5 +17,3 @@ Content-Type: text/html; charset="windows-1252"
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Some <span style=" font-weight:600;">HTML</span> text</p></body></html>
--nextPart8606278.tpV19BTJKu--
diff --git a/framework/domain/mimetreeparser/tests/interfacetest.cpp b/framework/domain/mimetreeparser/tests/interfacetest.cpp
index 1e8c5302..fd828960 100644
--- a/framework/domain/mimetreeparser/tests/interfacetest.cpp
+++ b/framework/domain/mimetreeparser/tests/interfacetest.cpp
@@ -39,7 +39,30 @@ private slots:
    {
        Parser parser(readMailFromFile("plaintext.mbox"));
        auto contentPart = parser.collectContentPart();
-        //QVERIFY((bool)contentPart);
+        QVERIFY((bool)contentPart);
+        QCOMPARE(contentPart->availableContents(), ContentPart::PlainText);
+        auto contentList = contentPart->content(ContentPart::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\n- GOG.com Team\n\n").toLocal8Bit());
+        QCOMPARE(contentList[0]->charset(), QStringLiteral("utf-8").toLocal8Bit());
+        QCOMPARE(contentList[0]->encryptions().size(), 0);
+        QCOMPARE(contentList[0]->signatures().size(), 0);
+    }
+    void testTextAlternative()
+    {
+        Parser parser(readMailFromFile("alternative.mbox"));
+        auto contentPart = parser.collectContentPart();
+        QVERIFY((bool)contentPart);
+        QCOMPARE(contentPart->availableContents(), ContentPart::PlainText | ContentPart::Html);
+    }
+     void testTextHtml()
+    {
+        Parser parser(readMailFromFile("html.mbox"));
+        auto contentPart = parser.collectContentPart();
+        QVERIFY((bool)contentPart);
+        QCOMPARE(contentPart->availableContents(), ContentPart::Html);
    }
 };