Changeset 56320 in webkit for trunk/JavaScriptCore/qt/tests

Timestamp:

Mar 21, 2010, 3:30:22 PM (15 years ago)

Author:

[email protected]

Message:

2010-03-21 Jedrzej Nowacki <​[email protected]>

Reviewed by Simon Hausmann.

New class; QScriptProgram.

The class should be used to evaluate the same script multiple times
more efficiently.

[Qt] QtScript should have QScriptProgram class
​https://bugs.webkit.org/show_bug.cgi?id=36008

• qt/api/QtScript.pro:
• qt/api/qscriptengine.cpp: (QScriptEngine::evaluate):
• qt/api/qscriptengine.h:
• qt/api/qscriptengine_p.cpp: (QScriptEnginePrivate::evaluate):
• qt/api/qscriptengine_p.h: (QScriptEnginePrivate::evaluate):
• qt/api/qscriptprogram.cpp: Added. (QScriptProgram::QScriptProgram): (QScriptProgram::~QScriptProgram): (QScriptProgram::operator=): (QScriptProgram::isNull): (QScriptProgram::sourceCode): (QScriptProgram::fileName): (QScriptProgram::firstLineNumber): (QScriptProgram::operator==): (QScriptProgram::operator!=):
• qt/api/qscriptprogram.h: Added.
• qt/api/qscriptprogram_p.h: Added. (QScriptProgramPrivate::get): (QScriptProgramPrivate::QScriptProgramPrivate): (QScriptProgramPrivate::~QScriptProgramPrivate): (QScriptProgramPrivate::isNull): (QScriptProgramPrivate::sourceCode): (QScriptProgramPrivate::fileName): (QScriptProgramPrivate::firstLineNumber): (QScriptProgramPrivate::operator==): (QScriptProgramPrivate::operator!=): (QScriptProgramPrivate::program): (QScriptProgramPrivate::file): (QScriptProgramPrivate::line):
• qt/tests/qscriptengine/tst_qscriptengine.cpp: (tst_QScriptEngine::evaluateProgram):

File:

• trunk/JavaScriptCore/qt/tests/qscriptengine/tst_qscriptengine.cpp (modified) (3 diffs)

trunk/JavaScriptCore/qt/tests/qscriptengine/tst_qscriptengine.cpp

@@ -19 +19 @@
 
 #include "qscriptengine.h"
+#include "qscriptprogram.h"
 #include "qscriptvalue.h"
 #include <QtTest/qtest.h>
@@ -38 +39 @@
     void nullValue();
     void undefinedValue();
+    void evaluateProgram();
 };
 
@@ -74 +76 @@
 }
 
+void tst_QScriptEngine::evaluateProgram()
+{
+    QScriptEngine eng;
+    {
+        QString code("1 + 2");
+        QString fileName("hello.js");
+        int lineNumber = 123;
+        QScriptProgram program(code, fileName, lineNumber);
+        QVERIFY(!program.isNull());
+        QCOMPARE(program.sourceCode(), code);
+        QCOMPARE(program.fileName(), fileName);
+        QCOMPARE(program.firstLineNumber(), lineNumber);
+
+        QScriptValue expected = eng.evaluate(code);
+        for (int x = 0; x < 10; ++x) {
+            QScriptValue ret = eng.evaluate(program);
+            QVERIFY(ret.equals(expected));
+        }
+
+        // operator=
+        QScriptProgram sameProgram = program;
+        QVERIFY(sameProgram == program);
+        QVERIFY(eng.evaluate(sameProgram).equals(expected));
+
+        // copy constructor
+        QScriptProgram sameProgram2(program);
+        QVERIFY(sameProgram2 == program);
+        QVERIFY(eng.evaluate(sameProgram2).equals(expected));
+
+        QScriptProgram differentProgram("2 + 3");
+        QVERIFY(differentProgram != program);
+        QVERIFY(!eng.evaluate(differentProgram).equals(expected));
+    }
+
+    // Program that accesses variable in the scope
+    {
+        QScriptProgram program("a");
+        QVERIFY(!program.isNull());
+        {
+            QScriptValue ret = eng.evaluate(program);
+            QVERIFY(ret.isError());
+            QCOMPARE(ret.toString(), QString::fromLatin1("ReferenceError: Can't find variable: a"));
+        }
+        {
+            QScriptValue ret = eng.evaluate(program);
+            QVERIFY(ret.isError());
+        }
+        eng.evaluate("a = 456");
+        {
+            QScriptValue ret = eng.evaluate(program);
+            QVERIFY(!ret.isError());
+            QCOMPARE(ret.toNumber(), 456.0);
+        }
+    }
+
+    // Program that creates closure
+    {
+        QScriptProgram program("(function() { var count = 0; return function() { return count++; }; })");
+        QVERIFY(!program.isNull());
+        QScriptValue createCounter = eng.evaluate(program);
+        QVERIFY(createCounter.isFunction());
+        QScriptValue counter = createCounter.call();
+        QVERIFY(counter.isFunction());
+        {
+            QScriptValue ret = counter.call();
+            QVERIFY(ret.isNumber());
+        }
+        QScriptValue counter2 = createCounter.call();
+        QVERIFY(counter2.isFunction());
+        QVERIFY(!counter2.equals(counter));
+        {
+            QScriptValue ret = counter2.call();
+            QVERIFY(ret.isNumber());
+        }
+    }
+
+    // Same program run in different engines
+    {
+        QString code("1 + 2");
+        QScriptProgram program(code);
+        QVERIFY(!program.isNull());
+        double expected = eng.evaluate(program).toNumber();
+        for (int x = 0; x < 2; ++x) {
+            QScriptEngine eng2;
+            for (int y = 0; y < 2; ++y) {
+                double ret = eng2.evaluate(program).toNumber();
+                QCOMPARE(ret, expected);
+            }
+        }
+    }
+
+    // No program
+    {
+        QScriptProgram program;
+        QVERIFY(program.isNull());
+        QScriptValue ret = eng.evaluate(program);
+        QVERIFY(!ret.isValid());
+    }
+}
+
 QTEST_MAIN(tst_QScriptEngine)
 #include "tst_qscriptengine.moc"