From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Mon, 31 Oct 2011 06:36:42 +0000 (+1000)
Subject: Improve QMenu autotest
X-Git-Tag: qt-v5.0.0-alpha1~2951
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9a9d2e8ba29a0d36e78489aec30479fadf8d3fba;p=profile%2Fivi%2Fqtbase.git

Improve QMenu autotest

The test for keyboard navigation was only checking correct highlighting
when a menu item was not activated by the latest key-click.  It should
also check that no item is highlighted after an item is activated.

Change-Id: I443e154be5cdc2def4f12d3f0abab2cc1bc6e4a8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---

diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index ef50a52..61bbd54 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -360,9 +360,12 @@ void tst_QMenu::keyboardNavigation()
         QCOMPARE(menus[expected_menu]->activeAction(), (QAction *)0);
     } else {
         QCOMPARE(menus[expected_menu]->activeAction(), builtins[expected_action]);
-        if (expected_highlighted)
-            QCOMPARE(menus[expected_menu]->activeAction(), highlighted);
     }
+
+    if (expected_highlighted)
+        QCOMPARE(menus[expected_menu]->activeAction(), highlighted);
+    else
+        QCOMPARE(highlighted, (QAction *)0);
 }
 
 #ifdef Q_WS_MAC