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

Remove milliseconds before comparing JS + Qt date strings. 

It seems that tst_qjsengine also needs:
https://codereview.qt-project.org/#change,65811

Change-Id: I5f5586f004dec047c3a1edebbc98d7ecde195bfd
Reviewed-by: John Layt <jlayt@kde.org>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
This commit is contained in:
Mitch Curtis 2013-09-18 15:25:08 +02:00 committed by The Qt Project
parent 5cfa5f749a
commit 59efbaac68
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/qml/qjsengine/tst_qjsengine.cpp
View File

@ -2619,6 +2619,7 @@ void tst_QJSEngine::dateConversionJSQt()
QDateTime qtDate = jsDate.toDateTime(); QDateTime qtDate = jsDate.toDateTime();
QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate); QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate);
QString jsUTCDateStr = jsDate.property("toISOString").callWithInstance(jsDate).toString(); QString jsUTCDateStr = jsDate.property("toISOString").callWithInstance(jsDate).toString();
jsUTCDateStr.remove(jsUTCDateStr.length() - 5, 4); // get rid of milliseconds (".000")
if (qtUTCDateStr != jsUTCDateStr) if (qtUTCDateStr != jsUTCDateStr)
QFAIL(qPrintable(jsDate.toString())); QFAIL(qPrintable(jsDate.toString()));
secs += 2*60*60; secs += 2*60*60;
@ -2633,6 +2634,7 @@ void tst_QJSEngine::dateConversionQtJS()
QJSValue jsDate = eng.toScriptValue(qtDate); QJSValue jsDate = eng.toScriptValue(qtDate);
QString jsUTCDateStr = jsDate.property("toISOString").callWithInstance(jsDate).toString(); QString jsUTCDateStr = jsDate.property("toISOString").callWithInstance(jsDate).toString();
QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate); QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate);
jsUTCDateStr.remove(jsUTCDateStr.length() - 5, 4); // get rid of milliseconds (".000")
if (jsUTCDateStr != qtUTCDateStr) if (jsUTCDateStr != qtUTCDateStr)
QFAIL(qPrintable(qtDate.toString())); QFAIL(qPrintable(qtDate.toString()));
qtDate = qtDate.addSecs(2*60*60); qtDate = qtDate.addSecs(2*60*60);