diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2013-09-18 14:44:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-24 10:23:20 +0200 |
| commit | c8d567371a86c696e73e86c76b75640e287345e5 (patch) | |
| tree | 4de5ed44554ed90c1539110fea2f4fd7e04232ee /tests | |
| parent | 7a8cab928dd405973e102ad2e6703cdbbb6bd505 (diff) | |
| download | qtscript-c8d567371a86c696e73e86c76b75640e287345e5.tar.gz | |
Revert "Don't remove milliseconds now that toString() includes them."
This reverts commit 37ec5822522baaa5b6e316103477d6da7e6d6a9c,
as 15da0a5af20fe6771bcb94ef8d46edbd5c8fb64c was also reverted with:
https://codereview.qt-project.org/#change,65560
Change-Id: I73bd91e3ac97384db27107051faead7a8cad3d91
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qscriptengine/tst_qscriptengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp index ffe6a2a..c75f652 100644 --- a/tests/auto/qscriptengine/tst_qscriptengine.cpp +++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp @@ -5843,6 +5843,7 @@ void tst_QScriptEngine::dateConversionJSQt() QDateTime qtDate = jsDate.toDateTime(); QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate); QString jsUTCDateStr = jsDate.property("toISOString").call(jsDate).toString(); + jsUTCDateStr.remove(jsUTCDateStr.length() - 5, 4); // get rid of milliseconds (".000") if (qtUTCDateStr != jsUTCDateStr) QFAIL(qPrintable(jsDate.toString())); secs += 2*60*60; @@ -5856,6 +5857,7 @@ void tst_QScriptEngine::dateConversionQtJS() for (int i = 0; i < 8000; ++i) { QScriptValue jsDate = eng.newDate(qtDate); QString jsUTCDateStr = jsDate.property("toISOString").call(jsDate).toString(); + jsUTCDateStr.remove(jsUTCDateStr.length() - 5, 4); // get rid of milliseconds (".000") QString qtUTCDateStr = qtDate.toUTC().toString(Qt::ISODate); if (jsUTCDateStr != qtUTCDateStr) QFAIL(qPrintable(qtDate.toString())); |