Commit 3706e6ae authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Continue to look at bug 345360

parent b0021079
......@@ -37,5 +37,5 @@ ecm_add_test(showonlymimeparttest.cpp setupenv.cpp util.cpp testcsshelper.cpp
ecm_add_test(converthtmltoplaintexttest.cpp ../converthtmltoplaintext.cpp
TEST_NAME converthtmltoplaintexttest
NAME_PREFIX "messageviewer-messageparttheme-"
LINK_LIBRARIES Qt5::Test Grantlee5::TextDocument
LINK_LIBRARIES Qt5::Test Grantlee5::TextDocument KF5::PimTextEdit
)
......@@ -70,6 +70,9 @@ void ConvertHtmlToPlainTextTest::shouldConvertToPlainText_data()
QTest::newRow("htmlTextWithUnderLine")
<< QStringLiteral("<html><body><u>Hi!</u> This is a KDE test</body></html>")
<< QStringLiteral("_Hi!_ This is a KDE test\n");
QTest::newRow("bug345360")
<< QStringLiteral("<html><head><title>Changes to Zoho Privacy Policy and Terms of Service</title></head><body><center><table width=\"600\" style=\"margin-top:20px;\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\"><tr><td style=\"text-align:left;\"><div id=\"_zc_default\" style=\"font-family: Arial,Helvetica,sans-serif; font-size: 12px;padding-top:0px;padding-bottom:0px\"><span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> Dear User, </span> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> We have updated our Privacy Policy and Terms of Service. Please take a few minutes to read and understand them. To help you understand, we have summarized the changes and provided a comparison of the current and the previous versions. </span> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> These changes will take effect on April 19, 2015.&nbsp; If you continue to use Zoho after April 19, 2015, you will be governed by the new Privacy Policy and Terms of Service. </span> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> &nbsp;&nbsp;&nbsp;&nbsp; </span> <a href=\"http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b3d\" target=\"_blank\"> Revised Privacy Policy </a> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> &nbsp;&nbsp;&nbsp;&nbsp; </span> <a href=\"http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b3f\" target=\"_blank\"> Summary of Changes to Privacy Policy </a> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> &nbsp;&nbsp;&nbsp;&nbsp; </span> <a href=\"http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b41\" target=\"_blank\"> Comparison </a> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> &nbsp;&nbsp;&nbsp;&nbsp; </span> <a href=\"http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b47\" target=\"_blank\"> Revised Terms of Service </a> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> &nbsp;&nbsp;&nbsp;&nbsp; </span> <a href=\"http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b45\" target=\"_blank\"> Summary of Changes to Terms of Service </a> <br style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> &nbsp;&nbsp;&nbsp;&nbsp; </span> <a href=\"http://zc1.maillist-manage.com/click.zc?od=11287eca375dad&repDgs=189bb4a86db70a&linkDgs=189bb4a7ed6b43\" target=\"_blank\"> Comparison </a> <br> <br> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> <br>Thanks!<br><br></span><div><span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\">The Zoho Team&nbsp; </span> <div> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> Zoho Corporation</span> </div> <div> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> 4141 Hacienda Drive Pleasanton,&nbsp; </span> </div> <div> <span style=\"font-family: verdana , arial , helvetica , sans-serif;font-size: 13.333333px;background-color: rgb(255,255,255);\"> CA 94588,</span><span style=\"font-size: 13.333333px; font-family: verdana, arial, helvetica, sans-serif; background-color: rgb(255, 255, 255);\">USA </span><span style=\"font-size: 10pt;\"> </span><span data-href=\"http://zc1.maillist-manage.com/ua/optout?od=11287eca375dad&rd=189bb4a86db70a&sd=189bb4a7ed6b37&n=11699e4c206dee1\" data-target data-text-len=\"4\" data-type=\"1\" style=\"font-size: 10pt; color: rgb(255, 255, 255);\"> .</span></div></div></div><img src=\"http://zc1.maillist-manage.com/open/od11287eca375dad_rd189bb4a86db70a.gif\" height=\"1\" width=\"50\"/></td></tr></table></center></body></html>")
<< QStringLiteral("foo");
}
void ConvertHtmlToPlainTextTest::shouldConvertToPlainText()
......@@ -84,4 +87,4 @@ void ConvertHtmlToPlainTextTest::shouldConvertToPlainText()
QCOMPARE(result, convertedText);
}
QTEST_APPLESS_MAIN(ConvertHtmlToPlainTextTest)
QTEST_MAIN(ConvertHtmlToPlainTextTest)
......@@ -20,8 +20,10 @@
#include "converthtmltoplaintext.h"
#include <grantlee/plaintextmarkupbuilder.h>
#include <KPIMTextEdit/PlainTextMarkupBuilder>
#include <QTextDocument>
#include <QDebug>
using namespace MimeTreeParser;
ConvertHtmlToPlainText::ConvertHtmlToPlainText()
{
......@@ -41,7 +43,7 @@ QString ConvertHtmlToPlainText::generatePlainText()
if (mHtmlString.isEmpty()) {
return QString();
}
Grantlee::PlainTextMarkupBuilder *pb = new Grantlee::PlainTextMarkupBuilder();
KPIMTextEdit::PlainTextMarkupBuilder *pb = new KPIMTextEdit::PlainTextMarkupBuilder();
Grantlee::MarkupDirector *pmd = new Grantlee::MarkupDirector(pb);
QTextDocument *doc = new QTextDocument;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment