qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix qqmllocale test 

Test was only passing the time to the format function, thinking it was
the only part under test, but the date is also relevant due to DST being
part of the formatted output.

Task-number: QTBUG-34406
Change-Id: I1f542b58907281632ee3c96b9b5b38426936953e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Alan Alpert 2013-10-29 16:36:31 -07:00 committed by The Qt Project
parent 1fc951da6a
commit 2f26ea3637
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/qml/qqmllocale/tst_qqmllocale.cpp
View File

@ -889,10 +889,6 @@ void tst_qqmllocale::dateToLocaleTimeStringFormatted_data()
void tst_qqmllocale::dateToLocaleTimeStringFormatted()
{
#if defined(Q_OS_WIN)
// QTBUG-34406
QSKIP("These tests are not DST-proof under Windows");
#endif
QFETCH(QString, locale);
QFETCH(QString, format);
@ -914,7 +910,7 @@ void tst_qqmllocale::dateToLocaleTimeStringFormatted()
Q_ARG(QVariant, QVariant(format)));
QLocale l(locale);
QCOMPARE(val.toString(), l.toString(dt.time(), format));
QCOMPARE(val.toString(), l.toString(dt, format));
}
void tst_qqmllocale::dateFromLocaleString_data()