From 01eb9297d0d3ec4de8a64c29a923f65db2f6f058 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 9 Apr 2025 17:24:30 +0200 Subject: [PATCH] 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 --- tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp index c87ad9bc038..ec1a59c711c 100644 --- a/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp +++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone.cpp @@ -505,10 +505,8 @@ void tst_QTimeZone::dataStreamTest() QCOMPARE(tz2.comment(), u"Qt Testing"_s); QCOMPARE(tz2.territory(), QLocale::Norway); QCOMPARE(tz2.abbreviation(QDateTime::currentDateTime()), u"QST"_s); - QCOMPARE(tz2.displayName(QTimeZone::StandardTime, QTimeZone::LongName, QLocale()), - u"Qt Standard Time"_s); - QCOMPARE(tz2.displayName(QTimeZone::DaylightTime, QTimeZone::LongName, QLocale()), - u"Qt Standard Time"_s); + QCOMPARE(tz2.displayName(QTimeZone::StandardTime, QTimeZone::LongName), u"Qt Standard Time"_s); + QCOMPARE(tz2.displayName(QTimeZone::DaylightTime, QTimeZone::LongName), u"Qt Standard Time"_s); QCOMPARE(tz2.offsetFromUtc(QDateTime::currentDateTime()), 23456); // 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.territory(), QLocale::Norway); QCOMPARE(tz.abbreviation(now), u"QST"_s); - QCOMPARE(tz.displayName(QTimeZone::StandardTime, QTimeZone::LongName, QLocale()), - u"Qt Standard Time"_s); + QCOMPARE(tz.displayName(QTimeZone::StandardTime, QTimeZone::LongName), u"Qt Standard Time"_s); QCOMPARE(tz.offsetFromUtc(now), 23456); QCOMPARE(tz.standardTimeOffset(now), 23456); QCOMPARE(tz.daylightTimeOffset(now), 0);