AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Android to exceptions in tst_QDateTime::toString_textDate_extra()

Browse Source 
Android doesn't use the proper zone-abbreviation, so just check it
starts with the right date-time.  Revised the way the #if-ery for that
is handled, to avoid repetition of the (now more complex) condition in
the two tests affected.

Task-number: QTBUG-68833
Change-Id: Iceb5469f46c69ba5cdbaf7ca050ad70f2bb74f44
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2018-06-14 12:36:41 +02:00 committed by Mårten Nordheim
parent e08ba34f26
commit b248a35a09
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
View File

@ -924,12 +924,16 @@ void tst_QDateTime::toString_textDate_extra()
else else
QCOMPARE(dt.toString(), QLatin1String("Thu Jan 1 00:00:00 1970")); QCOMPARE(dt.toString(), QLatin1String("Thu Jan 1 00:00:00 1970"));
#if QT_CONFIG(timezone) #if QT_CONFIG(timezone)
# if defined Q_OS_UNIX && !defined Q_OS_DARWIN && !defined Q_OS_ANDROID
# define CORRECT_ZONE_ABBREV
# endif // QTBUG-57320, QTBUG-57298, QTBUG-68833
QTimeZone PST("America/Vancouver"); QTimeZone PST("America/Vancouver");
if (PST.isValid()) { if (PST.isValid()) {
dt = QDateTime::fromMSecsSinceEpoch(0, PST); dt = QDateTime::fromMSecsSinceEpoch(0, PST);
# if defined Q_OS_UNIX && !defined Q_OS_DARWIN # ifdef CORRECT_ZONE_ABBREV
QCOMPARE(dt.toString(), QLatin1String("Wed Dec 31 16:00:00 1969 PST")); QCOMPARE(dt.toString(), QLatin1String("Wed Dec 31 16:00:00 1969 PST"));
# else // QTBUG-57320, QTBUG-57298 # else
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();
@ -940,9 +944,9 @@ void tst_QDateTime::toString_textDate_extra()
QTimeZone CET("Europe/Berlin"); QTimeZone CET("Europe/Berlin");
if (CET.isValid()) { if (CET.isValid()) {
dt = QDateTime::fromMSecsSinceEpoch(0, CET); dt = QDateTime::fromMSecsSinceEpoch(0, CET);
# if defined Q_OS_UNIX && !defined Q_OS_DARWIN # ifdef CORRECT_ZONE_ABBREV
QCOMPARE(dt.toString(), QLatin1String("Thu Jan 1 01:00:00 1970 CET")); QCOMPARE(dt.toString(), QLatin1String("Thu Jan 1 01:00:00 1970 CET"));
# else // QTBUG-57320, QTBUG-57298 # else
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();