From dfdf7d054f83409c04d963e8aa8d2bb4d47a84c0 Mon Sep 17 00:00:00 2001
From: Jedrzej Nowacki <jedrzej.nowacki@nokia.com>
Date: Mon, 1 Aug 2011 12:48:34 +0200
Subject: 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>
---
 tests/auto/declarative/qjsengine/tst_qjsengine.cpp | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'tests/auto/declarative/qjsengine/tst_qjsengine.cpp')

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()
 {
-- 
cgit v1.2.3