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

Replace a constant with a predicate function using it

Browse Source 
Rather than naming a "GMT" string so as to repeatedly test whether a
date-time's string representation ends in it, use a simple lambda to
do the test, so that the string is only used in one place anyway.
Makes the test code more readable.

Change-Id: I5afad9ad5d58702bea7f24e5e5688ea4d738ae0d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Edward Welbourne 2019-03-19 11:45:20 +01:00
parent b2bd2708b6
commit da7f4a4c76
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
View File

@ -956,11 +956,13 @@ void tst_QDateTime::toString_textDate()
void tst_QDateTime::toString_textDate_extra() void tst_QDateTime::toString_textDate_extra()
{ {
QLatin1String GMT("GMT"); auto endsWithGmt = [](const QDateTime &dt) {
return dt.toString().endsWith(QLatin1String("GMT"));
};
QDateTime dt = QDateTime::fromMSecsSinceEpoch(0, Qt::LocalTime); QDateTime dt = QDateTime::fromMSecsSinceEpoch(0, Qt::LocalTime);
QVERIFY(!dt.toString().endsWith(GMT)); QVERIFY(!endsWithGmt(dt));
dt = QDateTime::fromMSecsSinceEpoch(0, Qt::UTC).toLocalTime(); dt = QDateTime::fromMSecsSinceEpoch(0, Qt::UTC).toLocalTime();
QVERIFY(!dt.toString().endsWith(GMT)); QVERIFY(!endsWithGmt(dt));
#if QT_CONFIG(timezone) #if QT_CONFIG(timezone)
# if defined Q_OS_UNIX && !defined Q_OS_DARWIN && !defined Q_OS_ANDROID # if defined Q_OS_UNIX && !defined Q_OS_DARWIN && !defined Q_OS_ANDROID
@ -980,7 +982,7 @@ void tst_QDateTime::toString_textDate_extra()
QVERIFY(dt.toString().startsWith(QLatin1String("Wed Dec 31 16:00:00 1969 "))); QVERIFY(dt.toString().startsWith(QLatin1String("Wed Dec 31 16:00:00 1969 ")));
# endif # endif
dt = dt.toLocalTime(); dt = dt.toLocalTime();
QVERIFY(!dt.toString().endsWith(GMT)); QVERIFY(!endsWithGmt(dt));
} else { } else {
qDebug("Missed zone test: no America/Vancouver zone available"); qDebug("Missed zone test: no America/Vancouver zone available");
} }
@ -993,7 +995,7 @@ void tst_QDateTime::toString_textDate_extra()
QVERIFY(dt.toString().startsWith(QLatin1String("Thu Jan 1 01:00:00 1970 "))); QVERIFY(dt.toString().startsWith(QLatin1String("Thu Jan 1 01:00:00 1970 ")));
# endif # endif
dt = dt.toLocalTime(); dt = dt.toLocalTime();
QVERIFY(!dt.toString().endsWith(GMT)); QVERIFY(!endsWithGmt(dt));
} else { } else {
qDebug("Missed zone test: no Europe/Berlin zone available"); qDebug("Missed zone test: no Europe/Berlin zone available");
} }
@ -1004,7 +1006,7 @@ void tst_QDateTime::toString_textDate_extra()
QCOMPARE(dt.toString(), QLatin1String("Thu Jan 1 00:00:00 1970")); QCOMPARE(dt.toString(), QLatin1String("Thu Jan 1 00:00:00 1970"));
#endif #endif
dt = QDateTime::fromMSecsSinceEpoch(0, Qt::UTC); dt = QDateTime::fromMSecsSinceEpoch(0, Qt::UTC);
QVERIFY(dt.toString().endsWith(GMT)); QVERIFY(endsWithGmt(dt));
} }
#endif // datestring #endif // datestring