diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-02-25 14:40:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-25 15:43:37 +0100 |
| commit | 7cf9b32258c0c1b11cc12693f6feef7dc9d13ef7 (patch) | |
| tree | ba7334c3f36c0a0de1320356836f1b3bfda14544 /tests/auto/controls/data/tst_menu.qml | |
| parent | ea4a6d3c095b62e1afb4ccf5125f1280f172e30e (diff) | |
| download | qtquickcontrols-7cf9b32258c0c1b11cc12693f6feef7dc9d13ef7.tar.gz | |
Menu: Fix 'selectedIndex' update on item trigger
This demanded some code refactoring, and the introduction
of the parent menu property. Updated auto-tests too.
Change-Id: I3d9070b0a1a76d6c174ccf13965d30413f23aadd
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'tests/auto/controls/data/tst_menu.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_menu.qml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml index 95cdc525..a391d9a7 100644 --- a/tests/auto/controls/data/tst_menu.qml +++ b/tests/auto/controls/data/tst_menu.qml @@ -111,7 +111,6 @@ TestCase { menuItem.trigger() compare(menuItemSpy.count, 1) - expectFail('', "MenuItem.trigger() won't always update selectedIndex") compare(menuSpy.count, 1) compare(menu.selectedIndex, 2) } @@ -137,7 +136,6 @@ TestCase { compare(menu.menuItems[i].checked, i === 2 || i === 3) compare(menuItemSpy.count, 2) - expectFail('', "MenuItem.trigger() won't always update selectedIndex") compare(menuSpy.count, 2) compare(menu.selectedIndex, 3) } @@ -167,7 +165,6 @@ TestCase { compare(menu.menuItems[i].checked, i === 3) compare(menuItemSpy.count, 2) - expectFail('', "MenuItem.trigger() won't always update selectedIndex") compare(menuSpy.count, 2) compare(menu.selectedIndex, 3) } @@ -178,6 +175,10 @@ TestCase { menu.selectedIndex = 3 compare(menu.selectedIndex, 3) + verify(!menu.menuItems[menu.selectedIndex].checked) + + menu.menuItems[2].trigger() + compare(menu.selectedIndex, 2) verify(menu.menuItems[menu.selectedIndex].checked) } } |