diff options
| author | Jedrzej Nowacki <jedrzej.nowacki@nokia.com> | 2011-08-01 12:48:34 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-02 15:25:18 +0200 |
| commit | dfdf7d054f83409c04d963e8aa8d2bb4d47a84c0 (patch) | |
| tree | 3c88a24c5a2da1da2f50a4de30559a857179ca5c /tests/auto/declarative/qjsengine/tst_qjsengine.cpp | |
| parent | 813135081a8e22b673d2673fc38884b595ec0d33 (diff) | |
Enable globalObjectProperties_enumerate test.
The test can be enabled because QJSValueIterator is back.
Change-Id: I81220ea17470663dab799eb818168480d2df1a54
Reviewed-on: http://codereview.qt.nokia.com/2439
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qjsengine/tst_qjsengine.cpp')
| -rw-r--r-- | tests/auto/declarative/qjsengine/tst_qjsengine.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp index 49febdbf5e..17fe8c2950 100644 --- a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp @@ -43,6 +43,7 @@ #include <QtTest/QtTest> #include <qjsengine.h> +#include <qjsvalueiterator.h> #include <qgraphicsitem.h> #include <qstandarditemmodel.h> #include <QtCore/qnumeric.h> @@ -138,9 +139,7 @@ private slots: #endif void globalObjectProperties(); void globalObjectEquals(); -#if 0 // ###FIXME: No QScriptValueIterator API void globalObjectProperties_enumerate(); -#endif void createGlobalObjectProperty(); void globalObjectGetterSetterProperty(); #if 0 // ###FIXME: No support for setting the global object @@ -1560,11 +1559,10 @@ void tst_QJSEngine::globalObjectEquals() QVERIFY(o.equals(eng.globalObject())); } -#if 0 // ###FIXME: No QScriptValueIterator API void tst_QJSEngine::globalObjectProperties_enumerate() { - QScriptEngine eng; - QScriptValue global = eng.globalObject(); + QJSEngine eng; + QJSValue global = eng.globalObject(); QSet<QString> expectedNames; expectedNames @@ -1598,10 +1596,6 @@ void tst_QJSEngine::globalObjectProperties_enumerate() << "unescape" << "SyntaxError" << "undefined" - // non-standard - << "gc" - << "version" - << "print" // JavaScriptCore << "JSON" // V8 @@ -1609,7 +1603,7 @@ void tst_QJSEngine::globalObjectProperties_enumerate() ; QSet<QString> actualNames; { - QScriptValueIterator it(global); + QJSValueIterator it(global); while (it.hasNext()) { it.next(); actualNames.insert(it.name()); @@ -1627,7 +1621,6 @@ void tst_QJSEngine::globalObjectProperties_enumerate() } QVERIFY(remainingNames.isEmpty()); } -#endif void tst_QJSEngine::createGlobalObjectProperty() { |