aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeworkerscript
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/declarative/qdeclarativeworkerscript')
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/BaseWorker.qml24
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/Global.js1
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/externalObjectWorker.qml14
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/script.js4
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onCall.js6
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onLoad.js5
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/script_fixed_return.js4
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/script_include.js5
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/script_pragma.js6
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.js6
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.qml13
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml5
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onCall.qml6
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onLoad.qml7
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/worker_include.qml5
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/worker_pragma.qml6
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro15
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp300
18 files changed, 0 insertions, 432 deletions
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/BaseWorker.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/BaseWorker.qml
deleted file mode 100644
index 0ac56d9b66..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/BaseWorker.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-import QtQuick 2.0
-
-WorkerScript {
- id: worker
-
- property variant response
-
- signal done()
-
- function testSend(value) {
- worker.sendMessage(value)
- }
-
- function compareLiteralResponse(expected) {
- var e = eval('(' + expected + ')')
- return JSON.stringify(worker.response) == JSON.stringify(e)
- }
-
- onMessage: {
- worker.response = messageObject
- worker.done()
- }
-}
-
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/Global.js b/tests/auto/declarative/qdeclarativeworkerscript/data/Global.js
deleted file mode 100644
index 6bdb4a56b9..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/Global.js
+++ /dev/null
@@ -1 +0,0 @@
-var data = "World"
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/externalObjectWorker.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/externalObjectWorker.qml
deleted file mode 100644
index 1dae608b50..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/externalObjectWorker.qml
+++ /dev/null
@@ -1,14 +0,0 @@
-import QtQuick 2.0
-
-Item {
- id: root
-
- function testExternalObject() {
- worker.sendMessage(Qt.vector3d(1,2,3));
- }
-
- WorkerScript {
- id: worker
- source: "script.js"
- }
-}
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/script.js b/tests/auto/declarative/qdeclarativeworkerscript/data/script.js
deleted file mode 100644
index 90aae263a1..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/script.js
+++ /dev/null
@@ -1,4 +0,0 @@
-WorkerScript.onMessage = function(msg) {
- WorkerScript.sendMessage(msg)
-}
-
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onCall.js b/tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onCall.js
deleted file mode 100644
index f589b0ef40..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onCall.js
+++ /dev/null
@@ -1,6 +0,0 @@
-WorkerScript.onMessage = function(msg) {
- var a = 123
- var b = 345
- var f = getData()
-}
-
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onLoad.js b/tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onLoad.js
deleted file mode 100644
index 1d6eab2285..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onLoad.js
+++ /dev/null
@@ -1,5 +0,0 @@
-WorkerScript.onMessage = function(msg) {
- var a = 123
- aoij awef aljfaow eij
-}
-
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/script_fixed_return.js b/tests/auto/declarative/qdeclarativeworkerscript/data/script_fixed_return.js
deleted file mode 100644
index 14f6f178ae..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/script_fixed_return.js
+++ /dev/null
@@ -1,4 +0,0 @@
-WorkerScript.onMessage = function(msg) {
- WorkerScript.sendMessage('Hello_World')
-}
-
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/script_include.js b/tests/auto/declarative/qdeclarativeworkerscript/data/script_include.js
deleted file mode 100644
index 0385d91170..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/script_include.js
+++ /dev/null
@@ -1,5 +0,0 @@
-WorkerScript.onMessage = function(msg) {
- var res = Qt.include("Global.js");
- WorkerScript.sendMessage(msg + " " + data)
-}
-
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/script_pragma.js b/tests/auto/declarative/qdeclarativeworkerscript/data/script_pragma.js
deleted file mode 100644
index cb3b6d3398..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/script_pragma.js
+++ /dev/null
@@ -1,6 +0,0 @@
-.pragma library
-
-WorkerScript.onMessage = function(msg) {
- WorkerScript.sendMessage(msg)
-}
-
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.js b/tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.js
deleted file mode 100644
index 5c4c5ec906..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.js
+++ /dev/null
@@ -1,6 +0,0 @@
-WorkerScript.onMessage = function() {
-}
-for (var ii = 0; ii < 100; ++ii) {
- var a = "HELLO WORLD";
-}
-
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.qml
deleted file mode 100644
index 3e8465d6fe..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/stressDispose.qml
+++ /dev/null
@@ -1,13 +0,0 @@
-import QtQuick 2.0
-
-Item {
- WorkerScript {
- id: worker
- source: "stressDispose.js"
- }
-
- Component.onCompleted: {
- worker.sendMessage(10);
- }
-}
-
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml
deleted file mode 100644
index b5a92bf1f5..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-BaseWorker {
- source: "script.js"
-}
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onCall.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onCall.qml
deleted file mode 100644
index aa20783e76..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onCall.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-BaseWorker {
- source: "script_error_onCall.js"
-}
-
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onLoad.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onLoad.qml
deleted file mode 100644
index 8a33aeb44c..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onLoad.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0
-
-BaseWorker {
- source: "script_error_onLoad.js"
-}
-
-
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_include.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/worker_include.qml
deleted file mode 100644
index 100b8d4551..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_include.qml
+++ /dev/null
@@ -1,5 +0,0 @@
-import QtQuick 2.0
-
-BaseWorker {
- source: "script_include.js"
-}
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_pragma.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/worker_pragma.qml
deleted file mode 100644
index 7e313b3c42..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_pragma.qml
+++ /dev/null
@@ -1,6 +0,0 @@
-import QtQuick 2.0
-
-BaseWorker {
- source: "script_pragma.js"
-}
-
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro b/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro
deleted file mode 100644
index 9e5cc43f20..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-CONFIG += testcase
-TARGET = tst_qdeclarativeworkerscript
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qdeclarativeworkerscript.cpp
-
-include (../../shared/util.pri)
-
-testDataFiles.files = data
-testDataFiles.path = .
-DEPLOYMENT += testDataFiles
-
-CONFIG += parallel_test
-
-QT += core-private gui-private v8-private declarative-private testlib
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
deleted file mode 100644
index 92e5df127a..0000000000
--- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-/****************************************************************************
-**
-** 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 <qtest.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qtimer.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qfileinfo.h>
-#include <QtDeclarative/qjsengine.h>
-
-#include <QtDeclarative/qdeclarativecomponent.h>
-#include <QtDeclarative/qdeclarativeengine.h>
-
-#include <private/qdeclarativeworkerscript_p.h>
-#include <private/qdeclarativeengine_p.h>
-#include "../../shared/util.h"
-
-class tst_QDeclarativeWorkerScript : public QDeclarativeDataTest
-{
- Q_OBJECT
-public:
- tst_QDeclarativeWorkerScript() {}
-private slots:
- void source();
- void messaging();
- void messaging_data();
- void messaging_sendQObjectList();
- void messaging_sendJsObject();
- void messaging_sendExternalObject();
- void script_with_pragma();
- void script_included();
- void scriptError_onLoad();
- void scriptError_onCall();
- void stressDispose();
-
-private:
- void waitForEchoMessage(QDeclarativeWorkerScript *worker) {
- QEventLoop loop;
- QVERIFY(connect(worker, SIGNAL(done()), &loop, SLOT(quit())));
- QTimer timer;
- timer.setSingleShot(true);
- connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
- timer.start(10000);
- loop.exec();
- QVERIFY(timer.isActive());
- }
-
- QDeclarativeEngine m_engine;
-};
-
-void tst_QDeclarativeWorkerScript::source()
-{
- QDeclarativeComponent component(&m_engine, testFileUrl("worker.qml"));
- QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create());
- QVERIFY(worker != 0);
- const QMetaObject *mo = worker->metaObject();
-
- QVariant value(100);
- QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value)));
- waitForEchoMessage(worker);
- QCOMPARE(mo->property(mo->indexOfProperty("response")).read(worker).value<QVariant>(), value);
-
- QUrl source = testFileUrl("script_fixed_return.js");
- worker->setSource(source);
- QCOMPARE(worker->source(), source);
- QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value)));
- waitForEchoMessage(worker);
- QCOMPARE(mo->property(mo->indexOfProperty("response")).read(worker).value<QVariant>(), qVariantFromValue(QString("Hello_World")));
-
- qApp->processEvents();
- delete worker;
-}
-
-void tst_QDeclarativeWorkerScript::messaging()
-{
- QFETCH(QVariant, value);
-
- QDeclarativeComponent component(&m_engine, testFileUrl("worker.qml"));
- QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create());
- QVERIFY(worker != 0);
-
- QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value)));
- waitForEchoMessage(worker);
-
- const QMetaObject *mo = worker->metaObject();
- QCOMPARE(mo->property(mo->indexOfProperty("response")).read(worker).value<QVariant>(), value);
-
- qApp->processEvents();
- delete worker;
-}
-
-void tst_QDeclarativeWorkerScript::messaging_data()
-{
- QTest::addColumn<QVariant>("value");
-
- QTest::newRow("invalid") << QVariant();
- QTest::newRow("bool") << qVariantFromValue(true);
- QTest::newRow("int") << qVariantFromValue(1001);
- QTest::newRow("real") << qVariantFromValue(10334.375);
- QTest::newRow("string") << qVariantFromValue(QString("More cheeeese, Gromit!"));
- QTest::newRow("variant list") << qVariantFromValue((QVariantList() << "a" << "b" << "c"));
- QTest::newRow("date time") << qVariantFromValue(QDateTime::currentDateTime());
-#ifndef QT_NO_REGEXP
- // QtScript's QScriptValue -> QRegExp uses RegExp2 pattern syntax
- QTest::newRow("regexp") << qVariantFromValue(QRegExp("^\\d\\d?$", Qt::CaseInsensitive, QRegExp::RegExp2));
-#endif
-}
-
-void tst_QDeclarativeWorkerScript::messaging_sendQObjectList()
-{
- // Not allowed to send QObjects other than QDeclarativeWorkerListModelAgent
- // instances. If objects are sent in a list, they will be sent as 'undefined'
- // js values.
-
- QDeclarativeComponent component(&m_engine, testFileUrl("worker.qml"));
- QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create());
- QVERIFY(worker != 0);
-
- QVariantList objects;
- for (int i=0; i<3; i++)
- objects << qVariantFromValue(new QObject(this));
-
- QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, qVariantFromValue(objects))));
- waitForEchoMessage(worker);
-
- const QMetaObject *mo = worker->metaObject();
- QVariantList result = mo->property(mo->indexOfProperty("response")).read(worker).value<QVariantList>();
- QCOMPARE(result, (QVariantList() << QVariant() << QVariant() << QVariant()));
-
- qApp->processEvents();
- delete worker;
-}
-
-void tst_QDeclarativeWorkerScript::messaging_sendJsObject()
-{
- QDeclarativeComponent component(&m_engine, testFileUrl("worker.qml"));
- QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create());
- QVERIFY(worker != 0);
-
- // Properties are in alphabetical order to enable string-based comparison after
- // QVariant roundtrip, since the properties will be stored in a QVariantMap.
- QString jsObject = "{'haste': 1125, 'name': 'zyz', 'spell power': 3101}";
-
- QVariantMap map;
- map.insert("haste", 1125);
- map.insert("name", "zyz");
- map.insert("spell power", 3101);
-
- QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, qVariantFromValue(map))));
- waitForEchoMessage(worker);
-
- QVariant result = qVariantFromValue(false);
- QVERIFY(QMetaObject::invokeMethod(worker, "compareLiteralResponse", Qt::DirectConnection,
- Q_RETURN_ARG(QVariant, result), Q_ARG(QVariant, jsObject)));
- QVERIFY(result.toBool());
-
- qApp->processEvents();
- delete worker;
-}
-
-void tst_QDeclarativeWorkerScript::messaging_sendExternalObject()
-{
- QDeclarativeComponent component(&m_engine, testFileUrl("externalObjectWorker.qml"));
- QObject *obj = component.create();
- QVERIFY(obj);
- QMetaObject::invokeMethod(obj, "testExternalObject");
- QTest::qWait(100); // shouldn't crash.
- delete obj;
-}
-
-void tst_QDeclarativeWorkerScript::script_with_pragma()
-{
- QVariant value(100);
-
- QDeclarativeComponent component(&m_engine, testFileUrl("worker_pragma.qml"));
- QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create());
- QVERIFY(worker != 0);
-
- QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value)));
- waitForEchoMessage(worker);
-
- const QMetaObject *mo = worker->metaObject();
- QCOMPARE(mo->property(mo->indexOfProperty("response")).read(worker).value<QVariant>(), value);
-
- qApp->processEvents();
- delete worker;
-}
-
-void tst_QDeclarativeWorkerScript::script_included()
-{
- QDeclarativeComponent component(&m_engine, testFileUrl("worker_include.qml"));
- QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create());
- QVERIFY(worker != 0);
-
- QString value("Hello");
-
- QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value)));
- waitForEchoMessage(worker);
-
- const QMetaObject *mo = worker->metaObject();
- QCOMPARE(mo->property(mo->indexOfProperty("response")).read(worker).toString(), value + " World");
-
- qApp->processEvents();
- delete worker;
-}
-
-static QString qdeclarativeworkerscript_lastWarning;
-static void qdeclarativeworkerscript_warningsHandler(QtMsgType type, const char *msg)
-{
- if (type == QtWarningMsg)
- qdeclarativeworkerscript_lastWarning = QString::fromUtf8(msg);
-}
-
-void tst_QDeclarativeWorkerScript::scriptError_onLoad()
-{
- QDeclarativeComponent component(&m_engine, testFileUrl("worker_error_onLoad.qml"));
-
- QtMsgHandler previousMsgHandler = qInstallMsgHandler(qdeclarativeworkerscript_warningsHandler);
- QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create());
- QVERIFY(worker != 0);
-
- QTRY_COMPARE(qdeclarativeworkerscript_lastWarning,
- testFileUrl("script_error_onLoad.js").toString() + QLatin1String(":3: SyntaxError: Unexpected identifier"));
-
- qInstallMsgHandler(previousMsgHandler);
- qApp->processEvents();
- delete worker;
-}
-
-void tst_QDeclarativeWorkerScript::scriptError_onCall()
-{
- QDeclarativeComponent component(&m_engine, testFileUrl("worker_error_onCall.qml"));
- QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create());
- QVERIFY(worker != 0);
-
- QtMsgHandler previousMsgHandler = qInstallMsgHandler(qdeclarativeworkerscript_warningsHandler);
- QVariant value;
- QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value)));
-
- QTRY_COMPARE(qdeclarativeworkerscript_lastWarning,
- testFileUrl("script_error_onCall.js").toString() + QLatin1String(":4: ReferenceError: Can't find variable: getData"));
-
- qInstallMsgHandler(previousMsgHandler);
- qApp->processEvents();
- delete worker;
-}
-
-// Rapidly create and destroy worker scripts to test resources are being disposed
-// in the correct isolate
-void tst_QDeclarativeWorkerScript::stressDispose()
-{
- for (int ii = 0; ii < 100; ++ii) {
- QDeclarativeEngine engine;
- QDeclarativeComponent component(&engine, testFileUrl("stressDispose.qml"));
- QObject *o = component.create();
- QVERIFY(o);
- delete o;
- }
-}
-
-QTEST_MAIN(tst_QDeclarativeWorkerScript)
-
-#include "tst_qdeclarativeworkerscript.moc"