9 files changed, 666 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmltablemodel/data/TestModel.qml b/tests/auto/qml/qqmltablemodel/data/TestModel.qml
new file mode 100644
index 0000000000..00e1fa65a7
--- /dev/null
+++ b/tests/auto/qml/qqmltablemodel/data/TestModel.qml
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt.labs.qmlmodels 1.0
+
+import "TestUtils.js" as TestUtils
+
+TableModel {
+    id: testModel
+    objectName: "testModel"
+
+    TableModelColumn { display: "name" }
+    TableModelColumn { display: "age" }
+
+    rows: [
+        {
+            name: "John",
+            age: 22
+        },
+        {
+            name: "Oliver",
+            age: 33
+        }
+    ]
+}
diff --git a/tests/auto/qml/qqmltablemodel/data/TestUtils.js b/tests/auto/qml/qqmltablemodel/data/TestUtils.js
new file mode 100644
index 0000000000..0b92a377bb
--- /dev/null
+++ b/tests/auto/qml/qqmltablemodel/data/TestUtils.js
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+function testModelRoleDataProvider(index, role, cellData) {
+    switch (role) {
+    case "display":
+        switch (index.column) {
+        case 0:
+            return cellData.name
+        case 1:
+            return cellData.age
+        }
+        break
+    case "name":
+        return cellData.name
+    case "age":
+        return cellData.age
+    }
+    return cellData
+}
diff --git a/tests/auto/qml/qqmltablemodel/data/common.qml b/tests/auto/qml/qqmltablemodel/data/common.qml
new file mode 100644
index 0000000000..2f8b0c072b
--- /dev/null
+++ b/tests/auto/qml/qqmltablemodel/data/common.qml
@@ -0,0 +1,149 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.13
+import Qt.labs.qmlmodels 1.0
+
+Item {
+    id: root
+    width: 200
+    height: 200
+
+    property alias testModel: testModel
+    property alias tableView: tableView
+
+    function appendRow(personName, personAge) {
+        testModel.appendRow({
+            name: personName,
+            age: personAge
+        })
+    }
+
+    function appendRowExtraData() {
+        testModel.appendRow({
+            name: "Foo",
+            age: 99,
+            nonExistentRole: 123
+        })
+    }
+
+    function appendRowInvalid1() {
+        testModel.appendRow(123)
+    }
+
+    function appendRowInvalid2() {
+        testModel.appendRow({
+            name: "Foo",
+            age: []
+        })
+    }
+
+    function appendRowInvalid3() {
+        testModel.appendRow([
+            { name: "Bar" },
+            { age: "111" }
+        ])
+    }
+
+    function insertRow(personName, personAge, rowIndex) {
+        testModel.insertRow(rowIndex, {
+            name: personName,
+            age: personAge
+        })
+    }
+
+    function insertRowExtraData() {
+        testModel.insertRow(0, {
+            name: "Foo",
+            age: 99,
+            nonExistentRole: 123
+        })
+    }
+
+    function insertRowInvalid1() {
+        testModel.insertRow(0, 123)
+    }
+
+    function insertRowInvalid2() {
+        testModel.insertRow(0, {
+            name: "Foo",
+            age: []
+        })
+    }
+
+    function insertRowInvalid3() {
+        testModel.insertRow(0, [
+            { name: "Bar" },
+            { age: "111" }
+        ])
+    }
+
+    function setRow(rowIndex, personName, personAge) {
+        testModel.setRow(rowIndex, {
+            name: personName,
+            age: personAge
+        })
+    }
+
+    function setRowExtraData() {
+        testModel.setRow(0, {
+            name: "Foo",
+            age: 99,
+            nonExistentRole: 123
+        })
+    }
+
+    function setRowInvalid1() {
+        testModel.setRow(0, 123)
+    }
+
+    function setRowInvalid2() {
+        testModel.setRow(0, {
+            name: "Foo",
+            age: []
+        })
+    }
+
+    function setRowInvalid3() {
+        testModel.setRow(0, [
+            { name: "Bar" },
+            { age: "111" }
+        ])
+    }
+
+    TableView {
+        id: tableView
+        anchors.fill: parent
+        model: TestModel {
+            id: testModel
+        }
+        delegate: Text {
+            text: model.display
+        }
+    }
+}
diff --git a/tests/auto/qml/qqmltablemodel/data/complex.qml b/tests/auto/qml/qqmltablemodel/data/complex.qml
new file mode 100644
index 0000000000..dbf53bac7e
--- /dev/null
+++ b/tests/auto/qml/qqmltablemodel/data/complex.qml
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.13
+import Qt.labs.qmlmodels 1.0
+
+TableView {
+    width: 100
+    height: 100
+    delegate: Item {
+        implicitWidth: 50
+        implicitHeight: 50
+
+        Text {
+            text: model.display
+            anchors.centerIn: parent
+        }
+    }
+    model: TableModel {
+        id: testModel
+        objectName: "testModel"
+
+        TableModelColumn {
+            display: function(modelIndex) { return testModel.rows[modelIndex.row][0].name }
+            setDisplay: function(modelIndex, cellData) { testModel.rows[modelIndex.row][0].name = cellData }
+        }
+        TableModelColumn {
+            display: function(modelIndex) { return testModel.rows[modelIndex.row][1].age }
+            setDisplay: function(modelIndex, cellData) { testModel.rows[modelIndex.row][1].age = cellData }
+        }
+
+        rows: [
+            [
+                { name: "John" },
+                { age: 22 }
+            ],
+            [
+                { name: "Oliver" },
+                { age: 33 }
+            ]
+        ]
+    }
+}
diff --git a/tests/auto/qml/qqmltablemodel/data/dataAndSetData.qml b/tests/auto/qml/qqmltablemodel/data/dataAndSetData.qml
new file mode 100644
index 0000000000..d3f726bfa1
--- /dev/null
+++ b/tests/auto/qml/qqmltablemodel/data/dataAndSetData.qml
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.12
+import Qt.labs.qmlmodels 1.0
+
+TableView {
+    width: 200; height: 200
+    model: TestModel {
+        id: testModel
+
+        // This is silly: in real life, store the birthdate instead of the age,
+        // and let the delegate calculate the age, so it won't need updating
+        function happyBirthday(dude) {
+            var row = -1;
+            for (var r = 0; row < 0 && r < testModel.rowCount; ++r)
+                if (testModel.data(testModel.index(r, 0), "display") === dude)
+                    row = r;
+            var index = testModel.index(row, 1)
+            testModel.setData(index, "display", testModel.data(index, "display") + 1)
+        }
+    }
+    delegate: Text {
+        id: textItem
+        text: model.display
+        TapHandler {
+            onTapped: testModel.happyBirthday(testModel.data(testModel.index(row, 0), "display"))
+        }
+    }
+}
diff --git a/tests/auto/qml/qqmltablemodel/data/empty.qml b/tests/auto/qml/qqmltablemodel/data/empty.qml
new file mode 100644
index 0000000000..f5afbd1d27
--- /dev/null
+++ b/tests/auto/qml/qqmltablemodel/data/empty.qml
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.12
+import Qt.labs.qmlmodels 1.0
+
+Item {
+    id: root
+    width: 200
+    height: 200
+
+    property alias testModel: testModel
+    property alias tableView: tableView
+
+    function setRows() {
+        testModel.rows = [
+            {
+                name: "John",
+                age: 22
+            },
+            {
+                name: "Oliver",
+                age: 33
+            }
+        ]
+    }
+
+    function appendJohn() {
+        testModel.appendRow({
+            name: "John",
+            age: 22
+        })
+    }
+
+    function appendOliver() {
+        testModel.appendRow({
+            name: "Oliver",
+            age: 33
+        })
+    }
+
+    TableModel {
+        id: testModel
+        objectName: "testModel"
+
+        TableModelColumn { display: "name" }
+        TableModelColumn { display: "age" }
+    }
+    TableView {
+        id: tableView
+        anchors.fill: parent
+        model: testModel
+        delegate: Text {
+            text: model.display
+        }
+    }
+}
diff --git a/tests/auto/qml/qqmltablemodel/data/omitTableModelColumnIndex.qml b/tests/auto/qml/qqmltablemodel/data/omitTableModelColumnIndex.qml
new file mode 100644
index 0000000000..86bcb08fa2
--- /dev/null
+++ b/tests/auto/qml/qqmltablemodel/data/omitTableModelColumnIndex.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt.labs.qmlmodels 1.0
+
+TableModel {
+    objectName: "testModel"
+
+    TableModelColumn { display: "name" }
+    TableModelColumn { display: "age" }
+
+    rows: [
+        {
+            name: "John",
+            age: 22
+        },
+        {
+            name: "Oliver",
+            age: 33
+        }
+    ]
+}
diff --git a/tests/auto/qml/qqmltablemodel/data/setDataThroughDelegate.qml b/tests/auto/qml/qqmltablemodel/data/setDataThroughDelegate.qml
new file mode 100644
index 0000000000..ebfe4ed930
--- /dev/null
+++ b/tests/auto/qml/qqmltablemodel/data/setDataThroughDelegate.qml
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.12
+import Qt.labs.qmlmodels 1.0
+
+Item {
+    id: root
+    width: 200
+    height: 200
+
+    property alias testModel: testModel
+
+    signal shouldModify()
+    signal shouldModifyInvalidRole()
+    signal shouldModifyInvalidType()
+
+    function modify() {
+        shouldModify()
+    }
+
+    function modifyInvalidRole() {
+        shouldModifyInvalidRole()
+    }
+
+    function modifyInvalidType() {
+        shouldModifyInvalidType()
+    }
+
+    TableView {
+        anchors.fill: parent
+        model: TestModel {
+            id: testModel
+        }
+
+        delegate: Text {
+            id: textItem
+            text: model.display
+
+            Connections {
+                target: root
+                enabled: column === 1
+                onShouldModify: model.display = 18
+            }
+
+            Connections {
+                target: root
+                enabled: column === 0
+                // Invalid: should be "display".
+                onShouldModifyInvalidRole: model.age = 100
+            }
+
+            Connections {
+                target: root
+                enabled: column === 1
+                // Invalid: should be string.
+                onShouldModifyInvalidType: model.display = "Whoops"
+            }
+        }
+    }
+}
diff --git a/tests/auto/qml/qqmltablemodel/data/setRowsMultipleTimes.qml b/tests/auto/qml/qqmltablemodel/data/setRowsMultipleTimes.qml
new file mode 100644
index 0000000000..01ec40270c
--- /dev/null
+++ b/tests/auto/qml/qqmltablemodel/data/setRowsMultipleTimes.qml
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.12
+import Qt.labs.qmlmodels 1.0
+
+Item {
+    id: root
+    width: 200
+    height: 200
+
+    property alias testModel: testModel
+    property alias tableView: tableView
+
+    function setRowsValid() {
+        testModel.rows = [
+            {
+                name: "Max",
+                age: 20
+            },
+            {
+                name: "Imum",
+                age: 41
+            },
+            {
+                name: "Power",
+                age: 89
+            }
+        ]
+    }
+
+    function setRowsInvalid() {
+        testModel.rows = [
+            {
+                nope: "Nope",
+                age: 20
+            },
+            {
+                nope: "Nah",
+                age: 41
+            },
+            {
+                nope: "No",
+                age: 89
+            }
+        ]
+    }
+
+    TableView {
+        id: tableView
+        anchors.fill: parent
+        model: TestModel {
+            id: testModel
+        }
+        delegate: Text {
+            text: model.display
+        }
+    }
+}