Skip to content

Commit 01eb929

Browse files
committed
Skip redundant QLocale() argument to QTimeZone::displayName()
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>
1 parent 5a911f7 commit 01eb929

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -505,10 +505,8 @@ void tst_QTimeZone::dataStreamTest()
505505
QCOMPARE(tz2.comment(), u"Qt Testing"_s);
506506
QCOMPARE(tz2.territory(), QLocale::Norway);
507507
QCOMPARE(tz2.abbreviation(QDateTime::currentDateTime()), u"QST"_s);
508-
QCOMPARE(tz2.displayName(QTimeZone::StandardTime, QTimeZone::LongName, QLocale()),
509-
u"Qt Standard Time"_s);
510-
QCOMPARE(tz2.displayName(QTimeZone::DaylightTime, QTimeZone::LongName, QLocale()),
511-
u"Qt Standard Time"_s);
508+
QCOMPARE(tz2.displayName(QTimeZone::StandardTime, QTimeZone::LongName), u"Qt Standard Time"_s);
509+
QCOMPARE(tz2.displayName(QTimeZone::DaylightTime, QTimeZone::LongName), u"Qt Standard Time"_s);
512510
QCOMPARE(tz2.offsetFromUtc(QDateTime::currentDateTime()), 23456);
513511

514512
// And then with a standard IANA timezone (QTBUG-60595):
@@ -1391,8 +1389,7 @@ void tst_QTimeZone::utcTest()
13911389
QCOMPARE(tz.comment(), u"Qt Testing"_s);
13921390
QCOMPARE(tz.territory(), QLocale::Norway);
13931391
QCOMPARE(tz.abbreviation(now), u"QST"_s);
1394-
QCOMPARE(tz.displayName(QTimeZone::StandardTime, QTimeZone::LongName, QLocale()),
1395-
u"Qt Standard Time"_s);
1392+
QCOMPARE(tz.displayName(QTimeZone::StandardTime, QTimeZone::LongName), u"Qt Standard Time"_s);
13961393
QCOMPARE(tz.offsetFromUtc(now), 23456);
13971394
QCOMPARE(tz.standardTimeOffset(now), 23456);
13981395
QCOMPARE(tz.daylightTimeOffset(now), 0);

0 commit comments

Comments
 (0)