9 files changed, 309 insertions, 0 deletions
diff --git a/tests/benchmarks/qml/javascript/data/NestedIdObject.qml b/tests/benchmarks/qml/javascript/data/NestedIdObject.qml
new file mode 100644
index 0000000000..753d547ace
--- /dev/null
+++ b/tests/benchmarks/qml/javascript/data/NestedIdObject.qml
@@ -0,0 +1,9 @@
+import QtQuick 2.0
+
+QtObject {
+    function runtest() {
+        for (var ii = 0; ii < 5000000; ++ii) {
+            root
+        }
+    }
+}
diff --git a/tests/benchmarks/qml/javascript/data/intQObjectProperty.qml b/tests/benchmarks/qml/javascript/data/intQObjectProperty.qml
new file mode 100644
index 0000000000..c3e6ebc16a
--- /dev/null
+++ b/tests/benchmarks/qml/javascript/data/intQObjectProperty.qml
@@ -0,0 +1,13 @@
+import Qt.test 1.0
+
+TestObject {
+    id: root
+
+    function runtest() {
+        var r = root;
+
+        for (var ii = 0; ii < 5000000; ++ii) {
+            r.intValue
+        }
+    }
+}
diff --git a/tests/benchmarks/qml/javascript/data/localId.qml b/tests/benchmarks/qml/javascript/data/localId.qml
new file mode 100644
index 0000000000..d42b891092
--- /dev/null
+++ b/tests/benchmarks/qml/javascript/data/localId.qml
@@ -0,0 +1,13 @@
+// Benchmarks the cost of accessing an id in the same file as the script.
+
+import QtQuick 2.0
+
+QtObject {
+    id: root
+
+    function runtest() {
+        for (var ii = 0; ii < 5000000; ++ii) {
+            root
+        }
+    }
+}
diff --git a/tests/benchmarks/qml/javascript/data/nestedId.qml b/tests/benchmarks/qml/javascript/data/nestedId.qml
new file mode 100644
index 0000000000..538699d452
--- /dev/null
+++ b/tests/benchmarks/qml/javascript/data/nestedId.qml
@@ -0,0 +1,13 @@
+// Benchmarks the cost of accessing an id in a parent context of the script.
+
+import QtQuick 2.0
+
+QtObject {
+    id: root
+
+    property variant object: NestedIdObject {}
+    function runtest() {
+        object.runtest();
+    }
+}
+
diff --git a/tests/benchmarks/qml/javascript/data/stringQObjectProperty.qml b/tests/benchmarks/qml/javascript/data/stringQObjectProperty.qml
new file mode 100644
index 0000000000..ccd8a791b6
--- /dev/null
+++ b/tests/benchmarks/qml/javascript/data/stringQObjectProperty.qml
@@ -0,0 +1,14 @@
+import Qt.test 1.0
+
+TestObject {
+    id: root
+
+    function runtest() {
+        var r = root;
+
+        for (var ii = 0; ii < 5000000; ++ii) {
+            r.stringValue
+        }
+    }
+}
+
diff --git a/tests/benchmarks/qml/javascript/javascript.pro b/tests/benchmarks/qml/javascript/javascript.pro
new file mode 100644
index 0000000000..281bbd0069
--- /dev/null
+++ b/tests/benchmarks/qml/javascript/javascript.pro
@@ -0,0 +1,11 @@
+CONFIG += testcase
+TEMPLATE = app
+TARGET = tst_javascript
+QT += qml testlib
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_javascript.cpp testtypes.cpp
+HEADERS += testtypes.h
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/benchmarks/qml/javascript/testtypes.cpp b/tests/benchmarks/qml/javascript/testtypes.cpp
new file mode 100644
index 0000000000..43abef2d03
--- /dev/null
+++ b/tests/benchmarks/qml/javascript/testtypes.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "testtypes.h"
+#include <QtQml/qqml.h>
+
+void registerTypes()
+{
+    qmlRegisterType<TestObject>("Qt.test", 1,0, "TestObject");
+}
diff --git a/tests/benchmarks/qml/javascript/testtypes.h b/tests/benchmarks/qml/javascript/testtypes.h
new file mode 100644
index 0000000000..91be9078ed
--- /dev/null
+++ b/tests/benchmarks/qml/javascript/testtypes.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef TESTTYPES_H
+#define TESTTYPES_H
+
+#include <QtCore/qobject.h>
+
+class TestObject : public QObject 
+{
+    Q_OBJECT
+    Q_PROPERTY(int intValue READ intValue);
+    Q_PROPERTY(QString stringValue READ stringValue);
+
+public:
+    TestObject() : m_string("Hello world!") {}
+
+    int intValue() const { return 13; }
+    QString stringValue() const { return m_string; }
+
+private:
+    QString m_string;
+}; 
+
+void registerTypes();
+
+#endif // TESTTYPES_H
diff --git a/tests/benchmarks/qml/javascript/tst_javascript.cpp b/tests/benchmarks/qml/javascript/tst_javascript.cpp
new file mode 100644
index 0000000000..d506951b9f
--- /dev/null
+++ b/tests/benchmarks/qml/javascript/tst_javascript.cpp
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QDir>
+#include <QDebug>
+#include <qtest.h>
+#include <QQmlEngine>
+#include <QQmlComponent>
+
+#include "testtypes.h"
+
+class tst_javascript : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_javascript();
+    virtual ~tst_javascript();
+
+private slots:
+    void run_data();
+    void run();
+
+private:
+    QQmlEngine engine;
+};
+
+tst_javascript::tst_javascript()
+{
+    registerTypes();
+}
+
+tst_javascript::~tst_javascript()
+{
+}
+
+void tst_javascript::run_data()
+{
+    QTest::addColumn<QString>("file");
+
+    QDir dir(SRCDIR "/data");
+
+    QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
+
+    for (int ii = 0; ii < files.count(); ++ii) {
+        QString file = files.at(ii);
+        if (file.endsWith(".qml") && file.at(0).isLower()) {
+
+            QString testName = file.left(file.length() - 4 /* strlen(".qml") */);
+            QString fileName = QLatin1String(SRCDIR) + QLatin1String("/data/") + file;
+
+
+            QTest::newRow(qPrintable(testName)) << fileName;
+
+        }
+    }
+}
+
+void tst_javascript::run()
+{
+    QFETCH(QString, file);
+
+    QQmlComponent c(&engine, file);
+
+    if (c.isError()) {
+        qWarning() << c.errors();
+    }
+
+    QVERIFY(!c.isError());
+
+    QObject *o = c.create();
+    QVERIFY(o != 0);
+
+    QMetaMethod method = o->metaObject()->method(o->metaObject()->indexOfMethod("runtest()"));
+
+    QBENCHMARK {
+        method.invoke(o);
+    }
+
+    delete o;
+}
+
+QTEST_MAIN(tst_javascript)
+
+#include "tst_javascript.moc"