ObjectModel: add API for dynamic changes

Following the ListModel API:
- object get(index)
- append(object)
- insert(int index, object)
- move(int from, int to, int n)
- remove(int index, int n)

[ChangeLog][QtQml][ObjectModel] Added get(), append(), insert(), move()
and remove() methods.

Change-Id: I592e55b7c4c933a1100191bf5a9405944b347172
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>

2 files changed, 144 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlobjectmodel/qqmlobjectmodel.pro b/tests/auto/qml/qqmlobjectmodel/qqmlobjectmodel.pro
new file mode 100644
index 0000000000..f8232f8854
--- /dev/null
+++ b/tests/auto/qml/qqmlobjectmodel/qqmlobjectmodel.pro
@@ -0,0 +1,10 @@
+CONFIG += testcase
+TARGET = tst_qqmlobjectmodel
+osx:CONFIG -= app_bundle
+
+SOURCES += tst_qqmlobjectmodel.cpp
+
+CONFIG += parallel_test
+
+QT += qml testlib
+QT += core-private qml-private
diff --git a/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp b/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp
new file mode 100644
index 0000000000..001739e38d
--- /dev/null
+++ b/tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp
@@ -0,0 +1,134 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** 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 The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/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 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtQml/private/qqmlobjectmodel_p.h>
+#include <QtTest/qsignalspy.h>
+#include <QtTest/qtest.h>
+
+class tst_QQmlObjectModel : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void changes();
+};
+
+static bool compareItems(QQmlObjectModel *model, const QObjectList &items)
+{
+    for (int i = 0; i < items.count(); ++i) {
+        if (model->get(i) != items.at(i))
+            return false;
+    }
+    return true;
+}
+
+void tst_QQmlObjectModel::changes()
+{
+    QQmlObjectModel model;
+
+    QSignalSpy countSpy(&model, SIGNAL(countChanged()));
+    QSignalSpy childrenSpy(&model, SIGNAL(childrenChanged()));
+
+    int count = 0;
+    int countSignals = 0;
+    int childrenSignals = 0;
+
+    QObjectList items;
+    QObject item0, item1, item2, item3;
+
+    // append(item0) -> [item0]
+    model.append(&item0); items.append(&item0);
+    QCOMPARE(model.count(), ++count);
+    QVERIFY(compareItems(&model, items));
+    QCOMPARE(countSpy.count(), ++countSignals);
+    QCOMPARE(childrenSpy.count(), ++childrenSignals);
+
+    // insert(0, item1) -> [item1, item0]
+    model.insert(0, &item1); items.insert(0, &item1);
+    QCOMPARE(model.count(), ++count);
+    QVERIFY(compareItems(&model, items));
+    QCOMPARE(countSpy.count(), ++countSignals);
+    QCOMPARE(childrenSpy.count(), ++childrenSignals);
+
+    // append(item2) -> [item1, item0, item2]
+    model.append(&item2); items.append(&item2);
+    QCOMPARE(model.count(), ++count);
+    QVERIFY(compareItems(&model, items));
+    QCOMPARE(countSpy.count(), ++countSignals);
+    QCOMPARE(childrenSpy.count(), ++childrenSignals);
+
+    // insert(2, item3) -> [item1, item0, item3, item2]
+    model.insert(2, &item3); items.insert(2, &item3);
+    QCOMPARE(model.count(), ++count);
+    QVERIFY(compareItems(&model, items));
+    QCOMPARE(countSpy.count(), ++countSignals);
+    QCOMPARE(childrenSpy.count(), ++childrenSignals);
+
+    // move(0, 1) -> [item0, item1, item3, item2]
+    model.move(0, 1); items.move(0, 1);
+    QCOMPARE(model.count(), count);
+    QVERIFY(compareItems(&model, items));
+    QCOMPARE(countSpy.count(), countSignals);
+    QCOMPARE(childrenSpy.count(), ++childrenSignals);
+
+    // move(3, 2) -> [item0, item1, item2, item3]
+    model.move(3, 2); items.move(3, 2);
+    QCOMPARE(model.count(), count);
+    QVERIFY(compareItems(&model, items));
+    QCOMPARE(countSpy.count(), countSignals);
+    QCOMPARE(childrenSpy.count(), ++childrenSignals);
+
+    // remove(0) -> [item1, item2, item3]
+    model.remove(0); items.removeAt(0);
+    QCOMPARE(model.count(), --count);
+    QVERIFY(compareItems(&model, items));
+    QCOMPARE(countSpy.count(), ++countSignals);
+    QCOMPARE(childrenSpy.count(), ++childrenSignals);
+
+    // remove(2) -> [item1, item2]
+    model.remove(2); items.removeAt(2);
+    QCOMPARE(model.count(), --count);
+    QVERIFY(compareItems(&model, items));
+    QCOMPARE(countSpy.count(), ++countSignals);
+    QCOMPARE(childrenSpy.count(), ++childrenSignals);
+
+    // clear() -> []
+    model.clear(); items.clear();
+    QCOMPARE(model.count(), 0);
+    QVERIFY(compareItems(&model, items));
+    QCOMPARE(countSpy.count(), ++countSignals);
+    QCOMPARE(childrenSpy.count(), ++childrenSignals);
+}
+
+QTEST_MAIN(tst_QQmlObjectModel)
+
+#include "tst_qqmlobjectmodel.moc"