From bf9397c535971ec38668200ab465ebf20fa55ccf Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Mon, 11 May 2020 15:45:31 +0200
Subject: ComboBox: fix currentValue not being updated on model changes

Make sure we call updateCurrentValue() where necessary.

Fixes: QTBUG-83554
Change-Id: Iad593c2fc094a26429de1eda91bbdb152ffee2c2
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
(cherry picked from commit 3adeceaa1cfe5fae55ca6bd75226c52363a7e7d3)
Reviewed-by: Qt Cherry-pick Bot
---
 tests/auto/controls/data/tst_combobox.qml | 49 +++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

(limited to 'tests/auto/controls/data/tst_combobox.qml')

diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index 2d5069b3..e9156fee 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -296,12 +296,30 @@ TestCase {
         ListElement { name: "Banana"; color: "yellow" }
     }
 
+    Component {
+        id: fruitModelComponent
+        ListModel {
+            ListElement { name: "Apple"; color: "red" }
+            ListElement { name: "Orange"; color: "orange" }
+            ListElement { name: "Banana"; color: "yellow" }
+        }
+    }
+
     property var fruitarray: [
         { name: "Apple", color: "red" },
         { name: "Orange", color: "orange" },
         { name: "Banana", color: "yellow" }
     ]
 
+    Component {
+        id: birdModelComponent
+        ListModel {
+            ListElement { name: "Galah"; color: "pink" }
+            ListElement { name: "Kookaburra"; color: "brown" }
+            ListElement { name: "Magpie"; color: "black" }
+        }
+    }
+
     function test_textRole_data() {
         return [
             { tag: "ListModel", model: fruitmodel },
@@ -447,6 +465,37 @@ TestCase {
         compare(control.indexOfValue(data.tag), data.expectedIndex)
     }
 
+    function test_currentValueAfterModelChanged() {
+        let fruitModel = createTemporaryObject(fruitModelComponent, testCase)
+        verify(fruitModel)
+
+        let control = createTemporaryObject(comboBox, testCase,
+            { model: fruitModel, textRole: "name", valueRole: "color", currentIndex: 1 })
+        verify(control)
+        compare(control.currentText, "Orange")
+        compare(control.currentValue, "orange")
+
+        // Remove "Apple"; the current item should now be "Banana", so currentValue should be "yellow".
+        fruitModel.remove(0)
+        compare(control.currentText, "Banana")
+        compare(control.currentValue, "yellow")
+    }
+
+    function test_currentValueAfterNewModelSet() {
+        let control = createTemporaryObject(comboBox, testCase,
+            { model: fruitmodel, textRole: "name", valueRole: "color", currentIndex: 0 })
+        verify(control)
+        compare(control.currentText, "Apple")
+        compare(control.currentValue, "red")
+
+        // Swap the model out entirely. Since the currentIndex was 0 and
+        // is reset to 0 when a new model is set, it remains 0.
+        let birdModel = createTemporaryObject(birdModelComponent, testCase)
+        verify(birdModel)
+        control.model = birdModel
+        compare(control.currentText, "Galah")
+        compare(control.currentValue, "pink")
+    }
 
     function test_arrowKeys() {
         var control = createTemporaryObject(comboBox, testCase,
-- 
cgit v1.2.3