[pim/kdepim-addons] plugins/messageviewerheaderplugins/autotests: Run header tests with en_US locale
Volker Krause <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 3dae6a7c393e0376716c4e17da24b755bb154c15 by Volker Krause.
Committed on 15/08/2026 at 05:53.
Pushed by vkrause into branch 'master'.
Run header tests with en_US locale
The C locale date format changed recently, breaking all this.
M +2 -2 plugins/messageviewerheaderplugins/autotests/CMakeLists.txt
M +1 -1 plugins/messageviewerheaderplugins/autotests/data/allheaders.mbox.brief.html
M +1 -1 plugins/messageviewerheaderplugins/autotests/data/allheaders.mbox.fancy.html
M +1 -1 plugins/messageviewerheaderplugins/autotests/data/example/allheaders.mbox.html
M +1 -1 plugins/messageviewerheaderplugins/autotests/data/example/headertest.mbox.html
M +1 -1 plugins/messageviewerheaderplugins/autotests/data/example_fancy/allheaders.mbox.html
M +1 -1 plugins/messageviewerheaderplugins/autotests/data/example_fancy/headertest.mbox.html
M +1 -1 plugins/messageviewerheaderplugins/autotests/data/headertest.mbox.brief.html
M +1 -1 plugins/messageviewerheaderplugins/autotests/data/headertest.mbox.fancy.html
M +6 -4 plugins/messageviewerheaderplugins/autotests/fancyheaderstyleplugintest.cpp
M +6 -4 plugins/messageviewerheaderplugins/autotests/grantleeheaderstyleplugintest.cpp
https://invent.kde.org/pim/kdepim-addons/-/commit/3dae6a7c393e0376716c4e17da24b755bb154c15
diff --git a/plugins/messageviewerheaderplugins/autotests/CMakeLists.txt b/plugins/messageviewerheaderplugins/autotests/CMakeLists.txt
index 3605ea5f0..eb2e95187 100644
--- a/plugins/messageviewerheaderplugins/autotests/CMakeLists.txt
+++ b/plugins/messageviewerheaderplugins/autotests/CMakeLists.txt
@@ -23,7 +23,7 @@ macro(add_messageviewer_header_unittest _source _additional)
${_name}
PROPERTIES
ENVIRONMENT
- "LC_ALL=C;LANG=C;LANGUAGE=C;TZ=UTC"
+ "LC_ALL=en_US;LANG=en_US;LANGUAGE=en_US;TZ=UTC"
)
target_link_libraries(
${_name}
@@ -55,7 +55,7 @@ macro(add_messageviewer_header_class_unittest _source)
${_name}
PROPERTIES
ENVIRONMENT
- "LC_ALL=C;LANG=C;LANGUAGE=C;TZ=UTC"
+ "LC_ALL=en_US;LANG=en_US;LANGUAGE=en_US;TZ=UTC"
)
target_link_libraries(
${_name}
diff --git a/plugins/messageviewerheaderplugins/autotests/data/allheaders.mbox.brief.html b/plugins/messageviewerheaderplugins/autotests/data/allheaders.mbox.brief.html
index 259970c15..cea787111 100644
--- a/plugins/messageviewerheaderplugins/autotests/data/allheaders.mbox.brief.html
+++ b/plugins/messageviewerheaderplugins/autotests/data/allheaders.mbox.brief.html
@@ -5,6 +5,6 @@
<div class="header" dir="ltr"><div dir="ltr"><b style="font-size:130%">ssr/vpn超低价促销</b></div>(<a href="mailto:admin%20%3Cadmin%40ssrr.link%3E">admin <[email protected]></a>,
CC: <a href="mailto:foo%40exampleorg">foo@exampleorg</a>,
BCC: <a href="mailto:bcc%40example.org">[email protected]</a>,
-21 May 2018 16:52:43)</div>
+5/21/18 4:52 PM)</div>
</body>
</html>
diff --git a/plugins/messageviewerheaderplugins/autotests/data/allheaders.mbox.fancy.html b/plugins/messageviewerheaderplugins/autotests/data/allheaders.mbox.fancy.html
index 228501c21..9e8f7bc47 100644
--- a/plugins/messageviewerheaderplugins/autotests/data/allheaders.mbox.fancy.html
+++ b/plugins/messageviewerheaderplugins/autotests/data/allheaders.mbox.fancy.html
@@ -36,7 +36,7 @@
</tr>
<tr>
<th>Date: </th>
- <td dir="ltr">21 May 2018 16:52:43</td>
+ <td dir="ltr">5/21/18 4:52 PM</td>
</tr>
<tr>
<td colspan="2">
diff --git a/plugins/messageviewerheaderplugins/autotests/data/example/allheaders.mbox.html b/plugins/messageviewerheaderplugins/autotests/data/example/allheaders.mbox.html
index 9ff5a1538..364884998 100644
--- a/plugins/messageviewerheaderplugins/autotests/data/example/allheaders.mbox.html
+++ b/plugins/messageviewerheaderplugins/autotests/data/example/allheaders.mbox.html
@@ -23,7 +23,7 @@
</b>
<a href="mailto:bcc%40example.org">[email protected]</a>
</div>
- <div valign="top" width="30%"><b><font color="grey">Date:</font></b>21 May 2018 16:52:43</div>
+ <div valign="top" width="30%"><b><font color="grey">Date:</font></b>5/21/18 4:52 PM</div>
</div>
</body>
</html>
diff --git a/plugins/messageviewerheaderplugins/autotests/data/example/headertest.mbox.html b/plugins/messageviewerheaderplugins/autotests/data/example/headertest.mbox.html
index 5e814d376..a40e90246 100644
--- a/plugins/messageviewerheaderplugins/autotests/data/example/headertest.mbox.html
+++ b/plugins/messageviewerheaderplugins/autotests/data/example/headertest.mbox.html
@@ -8,7 +8,7 @@
[suppressed due to size limit]
[suppressed due to size limit]
[suppressed due to size limit]
- <div valign="top" width="30%"><b><font color="grey">Date:</font></b>21 May 2018 16:52:43</div>
+ <div valign="top" width="30%"><b><font color="grey">Date:</font></b>5/21/18 4:52 PM</div>
</div>
</body>
</html>
diff --git a/plugins/messageviewerheaderplugins/autotests/data/example_fancy/allheaders.mbox.html b/plugins/messageviewerheaderplugins/autotests/data/example_fancy/allheaders.mbox.html
index f63f4d46c..293d6628f 100644
--- a/plugins/messageviewerheaderplugins/autotests/data/example_fancy/allheaders.mbox.html
+++ b/plugins/messageviewerheaderplugins/autotests/data/example_fancy/allheaders.mbox.html
@@ -46,7 +46,7 @@ NBSP_ENTITY_PLACEHOLDERNBSP_ENTITY_PLACEHOLDER("Universität KDE")</td>
</tr>
<tr>
<th align="left" style="font-size: 10px;">Date: </th>
- <td dir="" style="font-size: 10px;">21 May 2018 16:52:43</td>
+ <td dir="" style="font-size: 10px;">5/21/18 4:52 PM</td>
</tr>
<tr>
<td colspan="2">
diff --git a/plugins/messageviewerheaderplugins/autotests/data/example_fancy/headertest.mbox.html b/plugins/messageviewerheaderplugins/autotests/data/example_fancy/headertest.mbox.html
index d486e09f3..3fd28c9fb 100644
--- a/plugins/messageviewerheaderplugins/autotests/data/example_fancy/headertest.mbox.html
+++ b/plugins/messageviewerheaderplugins/autotests/data/example_fancy/headertest.mbox.html
@@ -45,7 +45,7 @@
</tr>
<tr>
<th align="left" style="font-size: 10px;">Date: </th>
- <td dir="" style="font-size: 10px;">21 May 2018 16:52:43</td>
+ <td dir="" style="font-size: 10px;">5/21/18 4:52 PM</td>
</tr>
<tr>
<td colspan="2">
diff --git a/plugins/messageviewerheaderplugins/autotests/data/headertest.mbox.brief.html b/plugins/messageviewerheaderplugins/autotests/data/headertest.mbox.brief.html
index 718132aa3..3aecef3b8 100644
--- a/plugins/messageviewerheaderplugins/autotests/data/headertest.mbox.brief.html
+++ b/plugins/messageviewerheaderplugins/autotests/data/headertest.mbox.brief.html
@@ -5,6 +5,6 @@
[suppressed due to size limit]
[suppressed due to size limit]
[suppressed due to size limit]
-21 May 2018 16:52:43)</div>
+5/21/18 4:52 PM)</div>
</body>
</html>
diff --git a/plugins/messageviewerheaderplugins/autotests/data/headertest.mbox.fancy.html b/plugins/messageviewerheaderplugins/autotests/data/headertest.mbox.fancy.html
index c15b2b1b2..5989eecbc 100644
--- a/plugins/messageviewerheaderplugins/autotests/data/headertest.mbox.fancy.html
+++ b/plugins/messageviewerheaderplugins/autotests/data/headertest.mbox.fancy.html
@@ -32,7 +32,7 @@
</tr>
<tr>
<th>Date: </th>
- <td dir="ltr">21 May 2018 16:52:43</td>
+ <td dir="ltr">5/21/18 4:52 PM</td>
</tr>
<tr>
<td colspan="2">
diff --git a/plugins/messageviewerheaderplugins/autotests/fancyheaderstyleplugintest.cpp b/plugins/messageviewerheaderplugins/autotests/fancyheaderstyleplugintest.cpp
index a968f8735..3b837e911 100644
--- a/plugins/messageviewerheaderplugins/autotests/fancyheaderstyleplugintest.cpp
+++ b/plugins/messageviewerheaderplugins/autotests/fancyheaderstyleplugintest.cpp
@@ -16,16 +16,18 @@
#include <QActionGroup>
#include <QTest>
-#ifndef Q_OS_WIN
+using namespace Qt::Literals;
+
void initLocale()
{
- setenv("LC_ALL", "C", 1);
+#ifndef Q_OS_WIN
+ setenv("LC_ALL", "en_US", 1);
setenv("TZ", "UTC", 1);
- QLocale::setDefault(QLocale::c());
+#endif
+ QLocale::setDefault(QLocale("en_US"_L1));
}
Q_CONSTRUCTOR_FUNCTION(initLocale)
-#endif
FancyHeaderStylePluginTest::FancyHeaderStylePluginTest(QObject *parent)
: QObject(parent)
diff --git a/plugins/messageviewerheaderplugins/autotests/grantleeheaderstyleplugintest.cpp b/plugins/messageviewerheaderplugins/autotests/grantleeheaderstyleplugintest.cpp
index ea9a61234..e48fe8d63 100644
--- a/plugins/messageviewerheaderplugins/autotests/grantleeheaderstyleplugintest.cpp
+++ b/plugins/messageviewerheaderplugins/autotests/grantleeheaderstyleplugintest.cpp
@@ -20,16 +20,18 @@
#include <KActionCollection>
#include <KActionMenu>
-#ifndef Q_OS_WIN
+using namespace Qt::Literals;
+
void initLocale()
{
- setenv("LC_ALL", "C", 1);
+#ifndef Q_OS_WIN
+ setenv("LC_ALL", "en_US", 1);
setenv("TZ", "UTC", 1);
- QLocale::setDefault(QLocale::c());
+#endif
+ QLocale::setDefault(QLocale("en_US"_L1));
}
Q_CONSTRUCTOR_FUNCTION(initLocale)
-#endif
GrantleeHeaderStylePluginTest::GrantleeHeaderStylePluginTest(QObject *parent)
: QObject(parent)