str: Yesterday 16:52:43 +

str: 21 May 2018 16:52:43 short: 21 May 2018 16:52:43 -long: Yesterday 16:52:43 -fancylong: Yesterday 16:52:43 -fancyshort: Yesterday 16:52:43 +long: Mon May 21 16:52:43 2018 +fancylong: 21 May 2018 16:52:43 +fancyshort: 21 May 2018 16:52:43 localelong: Mon May 21 16:52:43 2018 invalid:

diff --git a/messageviewer/src/header/autotests/data/datetest.tmpl.html b/messageviewer/src/header/autotests/data/fancydate.html copy from messageviewer/src/header/autotests/data/datetest.tmpl.html copy to messageviewer/src/header/autotests/data/fancydate.html --- a/messageviewer/src/header/autotests/data/datetest.tmpl.html +++ b/messageviewer/src/header/autotests/data/fancydate.html @@ -3,13 +3,9 @@

str: Yesterday 16:52:43 -short: 21 May 2018 16:52:43 -long: Yesterday 16:52:43 -fancylong: Yesterday 16:52:43 -fancyshort: Yesterday 16:52:43 -localelong: Mon May 21 16:52:43 2018 -invalid:

str: Yesterday 12:34:56 +fancyshort: Yesterday 12:34:56 +fancylong: Yesterday 12:34:56

diff --git a/messageviewer/src/header/autotests/data/fancydate.tmpl b/messageviewer/src/header/autotests/data/fancydate.tmpl new file mode 100644 --- /dev/null +++ b/messageviewer/src/header/autotests/data/fancydate.tmpl @@ -0,0 +1,3 @@ +str: {{ header.date.str|safe }} +fancyshort: {{ header.date.fancyshort|safe }} +fancylong: {{ header.date.fancylong|safe }} diff --git a/messageviewer/src/header/autotests/grantleeheaderformattertest.h b/messageviewer/src/header/autotests/grantleeheaderformattertest.h --- a/messageviewer/src/header/autotests/grantleeheaderformattertest.h +++ b/messageviewer/src/header/autotests/grantleeheaderformattertest.h @@ -29,6 +29,7 @@ private Q_SLOTS: void testInvalid(); void testPrint(); + void testFancyDate(); void testBlock_data(); void testBlock(); }; diff --git a/messageviewer/src/header/autotests/grantleeheaderformattertest.cpp b/messageviewer/src/header/autotests/grantleeheaderformattertest.cpp --- a/messageviewer/src/header/autotests/grantleeheaderformattertest.cpp +++ b/messageviewer/src/header/autotests/grantleeheaderformattertest.cpp @@ -132,6 +132,31 @@ } } +void GrantleeHeaderFormatterTest::testFancyDate() +{ + QString tmplName = QStringLiteral("fancydate.tmpl"); + + auto style = GrantleeHeaderStyle(); + auto formatter = GrantleeHeaderFormatter(); + KMime::Message::Ptr msg(new KMime::Message); + + { + auto datetime(QDateTime::currentDateTime()); + datetime.setTime(QTime(12,34,56)); + datetime = datetime.addDays(-1); + + const QByteArray data = "From: from@example.com\nDate: " + datetime.toString(Qt::RFC2822Date).toLocal8Bit() + "\nTo: to@example.com\n\ncontent"; + msg->setContent(KMime::CRLFtoLF(data)); + msg->parse(); + } + + const QString &absolutePath = QStringLiteral(HEADER_DATA_DIR) + QLatin1Char('/') + tmplName; + + const QString &data = formatter.toHtml(QStringList(), QStringLiteral(HEADER_DATA_DIR), tmplName, &style, msg.data(), false); + testHeaderFile(QStringLiteral("

")+data, absolutePath, QStringLiteral("fancydate")); + +} + void GrantleeHeaderFormatterTest::testBlock_data() { QTest::addColumn("tmplName");