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

1 files changed, 66 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index 46c73cfc..f62c62c2 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -1176,4 +1176,70 @@ TestCase {
                 + " to have an y pos of " + expectedPos.y + " but it was " + actualPos.y)
         }
     }
+
+    Component {
+        id: setCurrentIndexOnImperativeModelChangeComponent
+
+        Tumbler {
+            onModelChanged: currentIndex = model - 2
+        }
+    }
+
+    function test_setCurrentIndexOnImperativeModelChange() {
+        var tumbler = createTemporaryObject(setCurrentIndexOnImperativeModelChangeComponent, testCase);
+        verify(tumbler);
+
+        tumbler.model = 4
+        compare(tumbler.count, 4);
+        tumblerView = findView(tumbler);
+        tryCompare(tumblerView, "count", 4);
+
+        // 4 - 2 = 2
+        compare(tumbler.currentIndex, 2);
+
+        ++tumbler.model;
+        compare(tumbler.count, 5);
+        compare(tumbler.wrap, true);
+        tumblerView = findView(tumbler);
+        tryCompare(tumblerView, "count", 5);
+        // 5 - 2 = 3
+        compare(tumbler.currentIndex, 3);
+    }
+
+    Component {
+        id: setCurrentIndexOnDeclarativeModelChangeComponent
+
+        Item {
+            property alias tumbler: tumbler
+
+            property int setting: 4
+
+            Tumbler {
+                id: tumbler
+                model: setting
+                onModelChanged: currentIndex = model - 2
+            }
+        }
+    }
+
+    function test_setCurrentIndexOnDeclarativeModelChange() {
+        var root = createTemporaryObject(setCurrentIndexOnDeclarativeModelChangeComponent, testCase);
+        verify(root);
+
+        var tumbler = root.tumbler;
+        compare(tumbler.count, 4);
+        compare(tumbler.wrap, false);
+        tumblerView = findView(tumbler);
+        tryCompare(tumblerView, "count", 4);
+        // 4 - 2 = 2
+        compare(tumbler.currentIndex, 2);
+
+        ++root.setting;
+        compare(tumbler.count, 5);
+        compare(tumbler.wrap, true);
+        tumblerView = findView(tumbler);
+        tryCompare(tumblerView, "count", 5);
+        // 5 - 2 = 3
+        compare(tumbler.currentIndex, 3);
+    }
 }