diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-11-16 18:03:56 +1100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-17 02:52:09 +0100 |
commit | 82dac4c5c1ad7a3704558dca4d70068fe0383c17 (patch) | |
tree | 1de70edcf64ec447e6a6c0c1394cc08d7f7ebea8 /tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp | |
parent | a69a7c6f7cd83c559593161c86fec70fd125198e (diff) |
Stabilize test
Test failed in DST when JS and QDateTime DST methods conflict. The time
in ms since epoch is still correct though, so test data is now within
ranges where they do not conflict (only happens with historical data).
Task-number: QTBUG-22408
Change-Id: I884e28b4681cc10fb25e777d2eabe20d8ac0bce4
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp')
-rw-r--r-- | tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index 83bed2bf5b..d2feb85200 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -503,11 +503,13 @@ void tst_qdeclarativeqt::dateTimeConversion() QDate date(2008,12,24); QTime time(14,15,38,200); QDateTime dateTime(date, time); + //Note that when converting Date to QDateTime they can argue over historical DST data when converting to local time. + //Tests should use UTC or recent dates. QDateTime dateTime2(QDate(2852,12,31), QTime(23,59,59,500)); - QDateTime dateTime3(QDate(1970,1,1), QTime(0,0,0,0)); - QDateTime dateTime4(QDate(1586,2,2), QTime(0,0,0,0)); - QDateTime dateTime5(QDate(955,1,1), QTime(0,0,0,0)); - QDateTime dateTime6(QDate(113,2,24), QTime(14,15,38,200)); + QDateTime dateTime3(QDate(2000,1,1), QTime(0,0,0,0)); + QDateTime dateTime4(QDate(2001,2,2), QTime(0,0,0,0)); + QDateTime dateTime5(QDate(1999,1,1), QTime(2,3,4,0)); + QDateTime dateTime6(QDate(2008,2,24), QTime(14,15,38,200)); QDeclarativeEngine eng; QDeclarativeComponent component(&eng, TEST_FILE("dateTimeConversion.qml")); |