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

Skip redundant QLocale() argument to QTimeZone::displayName()

Browse Source 
It's the default, and wasn't telling us anything illuminating about
the tests, so leave it out and save some line-splits.

Change-Id: I1bcc51db9b71489a3edcf25f4b2c7a90c86399bb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2025-04-09 17:24:30 +02:00
parent 5a911f72c6
commit 01eb9297d0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -505,10 +505,8 @@ void tst_QTimeZone::dataStreamTest()
QCOMPARE(tz2.comment(), u"Qt Testing"_s); QCOMPARE(tz2.comment(), u"Qt Testing"_s);
QCOMPARE(tz2.territory(), QLocale::Norway); QCOMPARE(tz2.territory(), QLocale::Norway);
QCOMPARE(tz2.abbreviation(QDateTime::currentDateTime()), u"QST"_s); QCOMPARE(tz2.abbreviation(QDateTime::currentDateTime()), u"QST"_s);
QCOMPARE(tz2.displayName(QTimeZone::StandardTime, QTimeZone::LongName, QLocale()), QCOMPARE(tz2.displayName(QTimeZone::StandardTime, QTimeZone::LongName), u"Qt Standard Time"_s);
u"Qt Standard Time"_s); QCOMPARE(tz2.displayName(QTimeZone::DaylightTime, QTimeZone::LongName), u"Qt Standard Time"_s);
QCOMPARE(tz2.displayName(QTimeZone::DaylightTime, QTimeZone::LongName, QLocale()),
u"Qt Standard Time"_s);
QCOMPARE(tz2.offsetFromUtc(QDateTime::currentDateTime()), 23456); QCOMPARE(tz2.offsetFromUtc(QDateTime::currentDateTime()), 23456);
// And then with a standard IANA timezone (QTBUG-60595): // And then with a standard IANA timezone (QTBUG-60595):
@ -1391,8 +1389,7 @@ void tst_QTimeZone::utcTest()
QCOMPARE(tz.comment(), u"Qt Testing"_s); QCOMPARE(tz.comment(), u"Qt Testing"_s);
QCOMPARE(tz.territory(), QLocale::Norway); QCOMPARE(tz.territory(), QLocale::Norway);
QCOMPARE(tz.abbreviation(now), u"QST"_s); QCOMPARE(tz.abbreviation(now), u"QST"_s);
QCOMPARE(tz.displayName(QTimeZone::StandardTime, QTimeZone::LongName, QLocale()), QCOMPARE(tz.displayName(QTimeZone::StandardTime, QTimeZone::LongName), u"Qt Standard Time"_s);
u"Qt Standard Time"_s);
QCOMPARE(tz.offsetFromUtc(now), 23456); QCOMPARE(tz.offsetFromUtc(now), 23456);
QCOMPARE(tz.standardTimeOffset(now), 23456); QCOMPARE(tz.standardTimeOffset(now), 23456);
QCOMPARE(tz.daylightTimeOffset(now), 0); QCOMPARE(tz.daylightTimeOffset(now), 0);