Extract all QtQuick 1 elements into a separate library/plugin.

Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391
Reviewed-by: Martin Jones <martin.jones@nokia.com>

15 files changed, 357 insertions, 0 deletions

diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/connection-targetchange.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/connection-targetchange.qml
new file mode 100644
index 0000000000..dd92cb9c67
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/connection-targetchange.qml
@@ -0,0 +1,25 @@
+import QtQuick 1.0
+
+Item {
+    Component {
+        id: item1
+        Item {
+            objectName: "item1"
+        }
+    }
+    Component {
+        id: item2
+        Item {
+            objectName: "item2"
+        }
+    }
+    Loader {
+        id: loader
+        sourceComponent: item1
+    }
+    Connections {
+        objectName: "connections"
+        target: loader.item
+        onWidthChanged: loader.sourceComponent = item2
+    }
+}
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals-ignored.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals-ignored.qml
new file mode 100644
index 0000000000..459c34617b
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals-ignored.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.0
+
+Item {
+    id: screen
+
+    Connections { target: screen; onNotFooBar1: {} ignoreUnknownSignals: true }
+    Connections { objectName: "connections"; onNotFooBar2: {} ignoreUnknownSignals: true }
+}
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals-notarget.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals-notarget.qml
new file mode 100644
index 0000000000..8eddf43fe6
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals-notarget.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.0
+
+Item {
+    id: screen
+
+    Connections { objectName: "connections"; target: null; onNotFooBar: {} }
+}
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals-parent.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals-parent.qml
new file mode 100644
index 0000000000..953347a3b2
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals-parent.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.0
+
+Item {
+    id: screen
+
+    Connections { objectName: "connections"; onFooBar: {} }
+}
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals.qml
new file mode 100644
index 0000000000..3702bdbe73
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.0
+
+Item {
+    id: screen
+
+    Connections { objectName: "connections"; target: screen; onFooBar: {} }
+}
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/error-object.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/error-object.qml
new file mode 100644
index 0000000000..376a2182fe
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/error-object.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.0
+
+Item {
+    Connections {
+        onClicked: Item {}
+    }
+}
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/error-property.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/error-property.qml
new file mode 100644
index 0000000000..677af152ce
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/error-property.qml
@@ -0,0 +1,5 @@
+import QtQuick 1.0
+
+Item {
+    Connections { fakeProperty: {} }
+}
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/error-property2.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/error-property2.qml
new file mode 100644
index 0000000000..127e58e657
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/error-property2.qml
@@ -0,0 +1,5 @@
+import QtQuick 1.0
+
+Item {
+    Connections { onfakeProperty: {} }
+}
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/error-syntax.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/error-syntax.qml
new file mode 100644
index 0000000000..6a82528e1a
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/error-syntax.qml
@@ -0,0 +1,9 @@
+import QtQuick 1.0
+
+Item {
+    Connections {
+        onClicked {
+            onPressed: {}
+        }
+    }
+}
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/test-connection.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/test-connection.qml
new file mode 100644
index 0000000000..c5990830cd
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/test-connection.qml
@@ -0,0 +1,10 @@
+import QtQuick 1.0
+
+Item {
+    id: screen; width: 50
+
+    property bool tested: false
+    signal testMe
+
+    Connections { target: screen; onWidthChanged: screen.tested = true }
+}
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/test-connection2.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/test-connection2.qml
new file mode 100644
index 0000000000..f0dbaba5a6
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/test-connection2.qml
@@ -0,0 +1,3 @@
+import QtQuick 1.0
+
+Connections { id: connection; target: connection; onTargetChanged: 1 == 1 }
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/test-connection3.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/test-connection3.qml
new file mode 100644
index 0000000000..94c9c7ca7f
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/test-connection3.qml
@@ -0,0 +1,3 @@
+import QtQuick 1.0
+
+Connections {}
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/data/trimming.qml b/tests/auto/qtquick1/qdeclarativeconnection/data/trimming.qml
new file mode 100644
index 0000000000..00507d919c
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/data/trimming.qml
@@ -0,0 +1,10 @@
+import QtQuick 1.0
+
+Item {
+    id: screen; width: 50
+
+    property string tested
+    signal testMe(int param1, string param2)
+
+    Connections { target: screen; onTestMe: screen.tested = param2 + param1 }
+}
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro
new file mode 100644
index 0000000000..fb1ef04ee1
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro
@@ -0,0 +1,17 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui qtquick1
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeconnection.cpp
+
+symbian: {
+    importFiles.files = data
+    importFiles.path = .
+    DEPLOYMENT += importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
+
+CONFIG += parallel_test
+
+QT += core-private gui-private declarative-private script-private qtquick1-private
diff --git a/tests/auto/qtquick1/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/qtquick1/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
new file mode 100644
index 0000000000..96e2957fbe
--- /dev/null
+++ b/tests/auto/qtquick1/qdeclarativeconnection/tst_qdeclarativeconnection.cpp
@@ -0,0 +1,234 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** 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 <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtQuick1/private/qdeclarativeconnections_p.h>
+#include <QtQuick1/private/qdeclarativeitem_p.h>
+#include "../../../shared/util.h"
+#include <QtDeclarative/qdeclarativescriptstring.h>
+
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+#define SRCDIR "."
+#endif
+
+class tst_qdeclarativeconnection : public QObject
+
+{
+    Q_OBJECT
+public:
+    tst_qdeclarativeconnection();
+
+private slots:
+    void defaultValues();
+    void properties();
+    void connection();
+    void trimming();
+    void targetChanged();
+    void unknownSignals_data();
+    void unknownSignals();
+    void errors_data();
+    void errors();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qdeclarativeconnection::tst_qdeclarativeconnection()
+{
+}
+
+void tst_qdeclarativeconnection::defaultValues()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection3.qml"));
+    QDeclarative1Connections *item = qobject_cast<QDeclarative1Connections*>(c.create());
+
+    QVERIFY(item != 0);
+    QVERIFY(item->target() == 0);
+
+    delete item;
+}
+
+void tst_qdeclarativeconnection::properties()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection2.qml"));
+    QDeclarative1Connections *item = qobject_cast<QDeclarative1Connections*>(c.create());
+
+    QVERIFY(item != 0);
+
+    QVERIFY(item != 0);
+    QVERIFY(item->target() == item);
+
+    delete item;
+}
+
+void tst_qdeclarativeconnection::connection()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
+
+    QVERIFY(item != 0);
+
+    QCOMPARE(item->property("tested").toBool(), false);
+    QCOMPARE(item->width(), 50.);
+    emit item->setWidth(100.);
+    QCOMPARE(item->width(), 100.);
+    QCOMPARE(item->property("tested").toBool(), true);
+
+    delete item;
+}
+
+void tst_qdeclarativeconnection::trimming()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/trimming.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
+
+    QVERIFY(item != 0);
+
+    QCOMPARE(item->property("tested").toString(), QString(""));
+    int index = item->metaObject()->indexOfSignal("testMe(int,QString)");
+    QMetaMethod method = item->metaObject()->method(index);
+    method.invoke(item,
+                  Qt::DirectConnection,
+                  Q_ARG(int, 5),
+                  Q_ARG(QString, "worked"));
+    QCOMPARE(item->property("tested").toString(), QString("worked5"));
+
+    delete item;
+}
+
+// Confirm that target can be changed by one of our signal handlers
+void tst_qdeclarativeconnection::targetChanged()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/connection-targetchange.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
+    QVERIFY(item != 0);
+
+    QDeclarative1Connections *connections = item->findChild<QDeclarative1Connections*>("connections");
+    QVERIFY(connections);
+
+    QDeclarativeItem *item1 = item->findChild<QDeclarativeItem*>("item1");
+    QVERIFY(item1);
+
+    item1->setWidth(200);
+
+    QDeclarativeItem *item2 = item->findChild<QDeclarativeItem*>("item2");
+    QVERIFY(item2);
+    QVERIFY(connections->target() == item2);
+
+    // If we don't crash then we're OK
+
+    delete item;
+}
+
+void tst_qdeclarativeconnection::unknownSignals_data()
+{
+    QTest::addColumn<QString>("file");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("basic") << "connection-unknownsignals.qml" << ":6:5: QML Connections: Cannot assign to non-existent property \"onFooBar\"";
+    QTest::newRow("parent") << "connection-unknownsignals-parent.qml" << ":6:5: QML Connections: Cannot assign to non-existent property \"onFooBar\"";
+    QTest::newRow("ignored") << "connection-unknownsignals-ignored.qml" << ""; // should be NO error
+    QTest::newRow("notarget") << "connection-unknownsignals-notarget.qml" << ""; // should be NO error
+}
+
+void tst_qdeclarativeconnection::unknownSignals()
+{
+    QFETCH(QString, file);
+    QFETCH(QString, error);
+
+    QUrl url = QUrl::fromLocalFile(SRCDIR "/data/" + file);
+    if (!error.isEmpty()) {
+        QTest::ignoreMessage(QtWarningMsg, (url.toString() + error).toLatin1());
+    } else {
+        // QTest has no way to insist no message (i.e. fail)
+    }
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, url);
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create());
+    QVERIFY(item != 0);
+
+    // check that connection is created (they are all runtime errors)
+    QDeclarative1Connections *connections = item->findChild<QDeclarative1Connections*>("connections");
+    QVERIFY(connections);
+
+    if (file == "connection-unknownsignals-ignored.qml")
+        QVERIFY(connections->ignoreUnknownSignals());
+
+    delete item;
+}
+
+void tst_qdeclarativeconnection::errors_data()
+{
+    QTest::addColumn<QString>("file");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("no \"on\"") << "error-property.qml" << "Cannot assign to non-existent property \"fakeProperty\"";
+    QTest::newRow("3rd letter lowercase") << "error-property2.qml" << "Cannot assign to non-existent property \"onfakeProperty\"";
+    QTest::newRow("child object") << "error-object.qml" << "Connections: nested objects not allowed";
+    QTest::newRow("grouped object") << "error-syntax.qml" << "Connections: syntax error";
+}
+
+void tst_qdeclarativeconnection::errors()
+{
+    QFETCH(QString, file);
+    QFETCH(QString, error);
+
+    QUrl url = QUrl::fromLocalFile(SRCDIR "/data/" + file);
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, url);
+    QVERIFY(c.isError() == true);
+    QList<QDeclarativeError> errors = c.errors();
+    QVERIFY(errors.count() == 1);
+    QCOMPARE(errors.at(0).description(), error);
+}
+
+QTEST_MAIN(tst_qdeclarativeconnection)
+
+#include "tst_qdeclarativeconnection.moc"