1 files changed, 25 insertions, 32 deletions

diff --git a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp
index 49febdbf5e..d2f4b3b6ac 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
@@ -203,9 +202,7 @@ private slots:
     void throwErrorFromProcessEvents();
     void disableProcessEventsInterval();
 #endif
-#if 0 // ###FIXME: No QScriptValueIterator API
     void stacktrace();
-#endif
     void numberParsing_data();
     void numberParsing();
     void automaticSemicolonInsertion();
@@ -1560,11 +1557,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 +1594,6 @@ void tst_QJSEngine::globalObjectProperties_enumerate()
         << "unescape"
         << "SyntaxError"
         << "undefined"
-        // non-standard
-        << "gc"
-        << "version"
-        << "print"
         // JavaScriptCore
         << "JSON"
         // V8
@@ -1609,7 +1601,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 +1619,6 @@ void tst_QJSEngine::globalObjectProperties_enumerate()
     }
     QVERIFY(remainingNames.isEmpty());
 }
-#endif
 
 void tst_QJSEngine::createGlobalObjectProperty()
 {
@@ -3330,7 +3321,7 @@ void tst_QJSEngine::disableProcessEventsInterval()
 }
 #endif
 
-#if 0 // ###FIXME: No QScriptValueIterator API
+
 void tst_QJSEngine::stacktrace()
 {
     QString script = QString::fromLatin1(
@@ -3358,34 +3349,36 @@ void tst_QJSEngine::stacktrace()
               << "foo(0)@testfile:3"
               << "<global>()@testfile:12";
 
-    QScriptEngine eng;
-    QScriptValue result = eng.evaluate(script, fileName);
+    QJSEngine eng;
+    QJSValue result = eng.evaluate(script, fileName);
     QVERIFY(eng.hasUncaughtException());
     QVERIFY(result.isError());
 
-    QEXPECT_FAIL("", "QTBUG-6139: uncaughtExceptionBacktrace() doesn't give the full backtrace", Abort);
+    // QEXPECT_FAIL("", "QTBUG-6139: uncaughtExceptionBacktrace() doesn't give the full backtrace", Abort);
     // ###FIXME: no uncahgutExceptionBacktrace: QCOMPARE(eng.uncaughtExceptionBacktrace(), backtrace);
     QVERIFY(eng.hasUncaughtException());
     QVERIFY(result.strictlyEquals(eng.uncaughtException()));
 
-    QCOMPARE(result.property("fileName").toString(), fileName);
-    QCOMPARE(result.property("lineNumber").toInt32(), 9);
+    // FIXME? it is not standard.
+    //QCOMPARE(result.property("fileName").toString(), fileName);
+    //QCOMPARE(result.property("lineNumber").toInt32(), 9);
 
-    QScriptValue stack = result.property("stack");
-    QVERIFY(stack.isArray());
+    QJSValue stack = result.property("stack");
 
-    QCOMPARE(stack.property("length").toInt32(), 7);
+    // FIXME? it is not standard.
+    // QVERIFY(stack.isArray());
+    //QCOMPARE(stack.property("length").toInt32(), 7);
 
-    QScriptValueIterator it(stack);
+    QJSValueIterator it(stack);
     int counter = 5;
     while (it.hasNext()) {
         it.next();
-        QScriptValue obj = it.value();
-        QScriptValue frame = obj.property("frame");
+        QJSValue obj = it.value();
+        QJSValue frame = obj.property("frame");
 
         QCOMPARE(obj.property("fileName").toString(), fileName);
         if (counter >= 0) {
-            QScriptValue callee = frame.property("arguments").property("callee");
+            QJSValue callee = frame.property("arguments").property("callee");
             QVERIFY(callee.strictlyEquals(eng.globalObject().property("foo")));
             QCOMPARE(obj.property("functionName").toString(), QString("foo"));
             int line = obj.property("lineNumber").toInt32();
@@ -3401,10 +3394,11 @@ void tst_QJSEngine::stacktrace()
         --counter;
     }
 
-    {
-        QScriptValue bt = result.property("backtrace").call(result);
-        QCOMPARE(qscriptvalue_cast<QStringList>(bt), backtrace);
-    }
+//    FIXME? it is not standard.
+//    {
+//        QJSValue bt = result.property("backtrace").call(result);
+//        QCOMPARE(qjsvalue_cast<QStringList>(bt), backtrace);
+//    }
 
     // throw something that isn't an Error object
     eng.clearExceptions();
@@ -3423,7 +3417,7 @@ void tst_QJSEngine::stacktrace()
         "}\n"
         "foo(0);");
 
-    QScriptValue result2 = eng.evaluate(script2, fileName);
+    QJSValue result2 = eng.evaluate(script2, fileName);
     QVERIFY(eng.hasUncaughtException());
     QVERIFY(!result2.isError());
     QVERIFY(result2.isString());
@@ -3435,7 +3429,6 @@ void tst_QJSEngine::stacktrace()
     QVERIFY(!eng.hasUncaughtException());
     // ###FIXME: No uncaughtExceptionBacktrace:  QVERIFY(eng.uncaughtExceptionBacktrace().isEmpty());
 }
-#endif
 
 void tst_QJSEngine::numberParsing_data()
 {