Merge "Merge remote-tracking branch 'origin/dev' into stable" into refs/staging/stable

8 files changed, 259 insertions, 1 deletions

diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 584533c65b..b973d44012 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -53,7 +53,8 @@ PRIVATETESTS += \
     qqmlbundle \
     qrcqml \
     v4 \
-    qqmltimer
+    qqmltimer \
+    qqmlinstantiator
 
 qtHaveModule(widgets) {
     PUBLICTESTS += \
diff --git a/tests/auto/qml/qqmlinstantiator/data/createMultiple.qml b/tests/auto/qml/qqmlinstantiator/data/createMultiple.qml
new file mode 100644
index 0000000000..facfadfb50
--- /dev/null
+++ b/tests/auto/qml/qqmlinstantiator/data/createMultiple.qml
@@ -0,0 +1,9 @@
+import QtQml 2.1
+
+Instantiator {
+    model: 10
+    delegate: QtObject {
+        property bool success: true
+        property int idx: index
+    }
+}
diff --git a/tests/auto/qml/qqmlinstantiator/data/createNone.qml b/tests/auto/qml/qqmlinstantiator/data/createNone.qml
new file mode 100644
index 0000000000..275e27c4b6
--- /dev/null
+++ b/tests/auto/qml/qqmlinstantiator/data/createNone.qml
@@ -0,0 +1,12 @@
+import QtQml 2.1
+
+Instantiator {
+    model: 0
+    property bool success: true
+    QtObject {
+        property bool success: true
+        property int idx: index
+    }
+    onObjectChanged: success = false;//Don't create intermediate objects
+    onCountChanged: success = false;//Don't create intermediate objects
+}
diff --git a/tests/auto/qml/qqmlinstantiator/data/createSingle.qml b/tests/auto/qml/qqmlinstantiator/data/createSingle.qml
new file mode 100644
index 0000000000..b04e62eb48
--- /dev/null
+++ b/tests/auto/qml/qqmlinstantiator/data/createSingle.qml
@@ -0,0 +1,8 @@
+import QtQml 2.1
+
+Instantiator {
+    QtObject {
+        property bool success: true
+        property int idx: index
+    }
+}
diff --git a/tests/auto/qml/qqmlinstantiator/data/inactive.qml b/tests/auto/qml/qqmlinstantiator/data/inactive.qml
new file mode 100644
index 0000000000..8f5e21f990
--- /dev/null
+++ b/tests/auto/qml/qqmlinstantiator/data/inactive.qml
@@ -0,0 +1,9 @@
+import QtQml 2.1
+
+Instantiator {
+    active: false
+    QtObject {
+        property bool success: true
+        property int idx: index
+    }
+}
diff --git a/tests/auto/qml/qqmlinstantiator/data/stringModel.qml b/tests/auto/qml/qqmlinstantiator/data/stringModel.qml
new file mode 100644
index 0000000000..ede2705df7
--- /dev/null
+++ b/tests/auto/qml/qqmlinstantiator/data/stringModel.qml
@@ -0,0 +1,9 @@
+import QtQml 2.1
+
+Instantiator {
+    model: ["alpha", "beta", "gamma", "delta"]
+    delegate: QtObject {
+        property bool success: index == 1 ? datum.length == 4 : datum.length == 5
+        property string datum: modelData
+    }
+}
diff --git a/tests/auto/qml/qqmlinstantiator/qqmlinstantiator.pro b/tests/auto/qml/qqmlinstantiator/qqmlinstantiator.pro
new file mode 100644
index 0000000000..aa83da1509
--- /dev/null
+++ b/tests/auto/qml/qqmlinstantiator/qqmlinstantiator.pro
@@ -0,0 +1,12 @@
+CONFIG += testcase
+TARGET = tst_qqmlinstantiator
+macx:CONFIG -= app_bundle
+
+INCLUDEPATH += ../../shared/
+SOURCES += tst_qqmlinstantiator.cpp
+
+include (../../shared/util.pri)
+
+TESTDATA = data/*
+
+QT += core-private gui-private qml-private testlib
diff --git a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
new file mode 100644
index 0000000000..3e90eb2cbe
--- /dev/null
+++ b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
@@ -0,0 +1,198 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Research In Motion.
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia 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.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QSignalSpy>
+#include <QDebug>
+
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcomponent.h>
+#include <QtQml/private/qqmlinstantiator_p.h>
+#include "../../shared/util.h"
+
+class tst_qqmlinstantiator: public QQmlDataTest
+{
+    Q_OBJECT
+
+private slots:
+    void createNone();
+    void createSingle();
+    void createMultiple();
+    void stringModel();
+    void activeProperty();
+    void intModelChange();
+};
+
+void tst_qqmlinstantiator::createNone()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("createNone.qml"));
+    QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator*>(component.create());
+    QVERIFY(instantiator != 0);
+    QCOMPARE(instantiator->isActive(), true);
+    QCOMPARE(instantiator->count(), 0);
+    QCOMPARE(instantiator->property("success").toBool(), true);
+    QVERIFY(instantiator->delegate()->isReady());
+}
+
+void tst_qqmlinstantiator::createSingle()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("createSingle.qml"));
+    QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator*>(component.create());
+    QVERIFY(instantiator != 0);
+    QCOMPARE(instantiator->isActive(), true);
+    QCOMPARE(instantiator->count(), 1);
+    QVERIFY(instantiator->delegate()->isReady());
+
+    QObject *object = instantiator->object();
+    QVERIFY(object);
+    QCOMPARE(object->parent(), instantiator);
+    QCOMPARE(object->property("success").toBool(), true);
+    QCOMPARE(object->property("idx").toInt(), 0);
+}
+
+void tst_qqmlinstantiator::createMultiple()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("createMultiple.qml"));
+    QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator*>(component.create());
+    QVERIFY(instantiator != 0);
+    QCOMPARE(instantiator->isActive(), true);
+    QCOMPARE(instantiator->count(), 10);
+
+    for (int i=0; i<10; i++) {
+        QObject *object = instantiator->objectAt(i);
+        QVERIFY(object);
+        QCOMPARE(object->parent(), instantiator);
+        QCOMPARE(object->property("success").toBool(), true);
+        QCOMPARE(object->property("idx").toInt(), i);
+    }
+}
+
+void tst_qqmlinstantiator::stringModel()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("stringModel.qml"));
+    QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator*>(component.create());
+    QVERIFY(instantiator != 0);
+    QCOMPARE(instantiator->isActive(), true);
+    QCOMPARE(instantiator->count(), 4);
+
+    for (int i=0; i<4; i++) {
+        QObject *object = instantiator->objectAt(i);
+        QVERIFY(object);
+        QCOMPARE(object->parent(), instantiator);
+        QCOMPARE(object->property("success").toBool(), true);
+    }
+}
+
+void tst_qqmlinstantiator::activeProperty()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("inactive.qml"));
+    QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator*>(component.create());
+    QVERIFY(instantiator != 0);
+    QSignalSpy activeSpy(instantiator, SIGNAL(activeChanged()));
+    QSignalSpy countSpy(instantiator, SIGNAL(countChanged()));
+    QSignalSpy objectSpy(instantiator, SIGNAL(objectChanged()));
+    QSignalSpy modelSpy(instantiator, SIGNAL(modelChanged()));
+    QCOMPARE(instantiator->isActive(), false);
+    QCOMPARE(instantiator->count(), 0);
+    QVERIFY(instantiator->delegate()->isReady());
+
+    QCOMPARE(activeSpy.count(), 0);
+    QCOMPARE(countSpy.count(), 0);
+    QCOMPARE(objectSpy.count(), 0);
+    QCOMPARE(modelSpy.count(), 0);
+
+    instantiator->setActive(true);
+    QCOMPARE(instantiator->isActive(), true);
+    QCOMPARE(instantiator->count(), 1);
+
+    QCOMPARE(activeSpy.count(), 1);
+    QCOMPARE(countSpy.count(), 1);
+    QCOMPARE(objectSpy.count(), 1);
+    QCOMPARE(modelSpy.count(), 0);
+
+    QObject *object = instantiator->object();
+    QVERIFY(object);
+    QCOMPARE(object->parent(), instantiator);
+    QCOMPARE(object->property("success").toBool(), true);
+    QCOMPARE(object->property("idx").toInt(), 0);
+}
+
+void tst_qqmlinstantiator::intModelChange()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine, testFileUrl("createMultiple.qml"));
+    QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator*>(component.create());
+    QVERIFY(instantiator != 0);
+    QSignalSpy activeSpy(instantiator, SIGNAL(activeChanged()));
+    QSignalSpy countSpy(instantiator, SIGNAL(countChanged()));
+    QSignalSpy objectSpy(instantiator, SIGNAL(objectChanged()));
+    QSignalSpy modelSpy(instantiator, SIGNAL(modelChanged()));
+    QCOMPARE(instantiator->count(), 10);
+
+    QCOMPARE(activeSpy.count(), 0);
+    QCOMPARE(countSpy.count(), 0);
+    QCOMPARE(objectSpy.count(), 0);
+    QCOMPARE(modelSpy.count(), 0);
+
+    instantiator->setModel(QVariant(2));
+    QCOMPARE(instantiator->count(), 2);
+
+    QCOMPARE(activeSpy.count(), 0);
+    QCOMPARE(countSpy.count(), 1);
+    QCOMPARE(objectSpy.count(), 2);
+    QCOMPARE(modelSpy.count(), 1);
+
+    for (int i=0; i<2; i++) {
+        QObject *object = instantiator->objectAt(i);
+        QVERIFY(object);
+        QCOMPARE(object->parent(), instantiator);
+        QCOMPARE(object->property("success").toBool(), true);
+        QCOMPARE(object->property("idx").toInt(), i);
+    }
+}
+
+QTEST_MAIN(tst_qqmlinstantiator)
+
+#include "tst_qqmlinstantiator.moc"