1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modernise and refine details in tst_QTimeZone

Browse Source 
Use constexpr and const where we can.
Use Qt-defined string literals in a few more places.
Include GenericTime in a displayName() test, and make overt that we
are simply discarding the returns, with no further testing.

Pick-to: 6.8
Change-Id: Id120fdfe66267b01ff019fe13ac80f37390c106f
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 4702868677b4d09edc65b869ffd11756a20e6671)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Edward Welbourne 2025-04-11 17:50:50 +02:00 committed by Qt Cherry-pick Bot
parent 233f2340bd
commit bc039f3253
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp
View File

@ -1016,7 +1016,7 @@ void tst_QTimeZone::availableTimeZoneIds()
void tst_QTimeZone::stressTest()
{
const auto UTC = QTimeZone::UTC;
constexpr auto UTC = QTimeZone::UTC;
const QList<QByteArray> idList = QTimeZone::availableTimeZoneIds();
for (const QByteArray &id : idList) {
QTimeZone testZone = QTimeZone(id);
@ -1027,8 +1027,9 @@ void tst_QTimeZone::stressTest()
testZone.territory();
testZone.comment();
testZone.displayName(testDate);
testZone.displayName(QTimeZone::DaylightTime);
testZone.displayName(QTimeZone::StandardTime);
(void)testZone.displayName(QTimeZone::GenericTime);
(void)testZone.displayName(QTimeZone::StandardTime);
(void)testZone.displayName(QTimeZone::DaylightTime);
testZone.abbreviation(testDate);
testZone.offsetFromUtc(testDate);
testZone.standardTimeOffset(testDate);
@ -1775,22 +1776,20 @@ void tst_QTimeZone::localeSpecificDisplayName_data()
// Pick a non-system locale; German or French
if (QLocale::system().language() != QLocale::German) {
locale = QLocale(QLocale::German);
names << QString("Mitteleurop\u00e4ische Normalzeit")
<< QString("Mitteleurop\u00e4ische Sommerzeit");
names << u"Mitteleurop\u00e4ische Normalzeit"_s
<< u"Mitteleurop\u00e4ische Sommerzeit"_s;
} else {
locale = QLocale(QLocale::French);
names << QString("heure normale d\u2019Europe centrale")
<< QString("heure d\u2019\u00E9t\u00E9 d\u2019Europe centrale");
names << u"heure normale d\u2019Europe centrale"_s
<< u"heure d\u2019\u00E9t\u00E9 d\u2019Europe centrale"_s;
}
qsizetype index = 0;
QTest::newRow("Berlin, standard time")
<< QByteArray("Europe/Berlin") << locale << QTimeZone::StandardTime
<< names.at(index++);
<< "Europe/Berlin"_ba << locale << QTimeZone::StandardTime << names.at(index++);
QTest::newRow("Berlin, summer time")
<< QByteArray("Europe/Berlin") << locale << QTimeZone::DaylightTime
<< names.at(index++);
<< "Europe/Berlin"_ba << locale << QTimeZone::DaylightTime << names.at(index++);
}
void tst_QTimeZone::localeSpecificDisplayName()
@ -1802,7 +1801,7 @@ void tst_QTimeZone::localeSpecificDisplayName()
QFETCH(QTimeZone::TimeType, timeType);
QFETCH(QString, expectedName);
QTimeZone zone(zoneName);
const QTimeZone zone(zoneName);
QVERIFY(zone.isValid());
const QString localeName = zone.displayName(timeType, QTimeZone::LongName, locale);