diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2013-09-18 15:57:41 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 16:24:15 +0200 |
| commit | 5cfa5f749a061863ee7017f3443cce15ccc08e65 (patch) | |
| tree | 372bf4cab6c0fda20d62d51adb8f9c111b6a2e75 /tests/auto/qml/qjsengine | |
| parent | 3ea14e269bec15db8a95dc4b610a5f063a67e1a2 (diff) | |
Revert "Temporarily disable tst_QJSEngine tests [...]"
This reverts commit 17ae095602bf36ece892598e69f794ef982c603b.
The test can be re-enabled now.
Change-Id: I0134365edbfd4aed05665bf16b8e15221fe62d67
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'tests/auto/qml/qjsengine')
| -rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index ecd1439177..4ae187c829 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -2609,38 +2609,34 @@ void tst_QJSEngine::dateRoundtripQtJSQt() void tst_QJSEngine::dateConversionJSQt() { - // Disable temporarily so that https://codereview.qt-project.org/#change,65560 can merge. -//#ifdef Q_OS_WIN -// QSKIP("This test fails on Windows due to a bug in QDateTime."); -//#endif -// uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t(); -// QJSEngine eng; -// for (int i = 0; i < 8000; ++i) { -// QJSValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0)").arg(secs * 1000.0)); -// QDateTime qtDate = jsDate.toDateTime(); -// QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate); -// QString jsUTCDateStr = jsDate.property("toISOString").callWithInstance(jsDate).toString(); -// jsUTCDateStr.remove(jsUTCDateStr.length() - 5, 4); // get rid of milliseconds (".000") -// if (qtUTCDateStr != jsUTCDateStr) -// QFAIL(qPrintable(jsDate.toString())); -// secs += 2*60*60; -// } +#ifdef Q_OS_WIN + QSKIP("This test fails on Windows due to a bug in QDateTime."); +#endif + uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t(); + QJSEngine eng; + for (int i = 0; i < 8000; ++i) { + QJSValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0)").arg(secs * 1000.0)); + QDateTime qtDate = jsDate.toDateTime(); + QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate); + QString jsUTCDateStr = jsDate.property("toISOString").callWithInstance(jsDate).toString(); + if (qtUTCDateStr != jsUTCDateStr) + QFAIL(qPrintable(jsDate.toString())); + secs += 2*60*60; + } } void tst_QJSEngine::dateConversionQtJS() { -// Disable temporarily so that https://codereview.qt-project.org/#change,65560 can merge. -// QDateTime qtDate = QDateTime(QDate(2009, 1, 1)); -// QJSEngine eng; -// for (int i = 0; i < 8000; ++i) { -// QJSValue jsDate = eng.toScriptValue(qtDate); -// QString jsUTCDateStr = jsDate.property("toISOString").callWithInstance(jsDate).toString(); -// QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate); -// jsUTCDateStr.remove(jsUTCDateStr.length() - 5, 4); // get rid of milliseconds (".000") -// if (jsUTCDateStr != qtUTCDateStr) -// QFAIL(qPrintable(qtDate.toString())); -// qtDate = qtDate.addSecs(2*60*60); -// } + QDateTime qtDate = QDateTime(QDate(2009, 1, 1)); + QJSEngine eng; + for (int i = 0; i < 8000; ++i) { + QJSValue jsDate = eng.toScriptValue(qtDate); + QString jsUTCDateStr = jsDate.property("toISOString").callWithInstance(jsDate).toString(); + QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate); + if (jsUTCDateStr != qtUTCDateStr) + QFAIL(qPrintable(qtDate.toString())); + qtDate = qtDate.addSecs(2*60*60); + } } void tst_QJSEngine::functionPrototypeExtensions() |