Merge lp:~sil2100/unity/autopilot_hud_2.0_fixes into lp:unity

[Łukasz Zemczak]

Now that we're using the new HUD, there have been some changes that typically cause test_hud tests to fail. Fix the tests to fit the new model.
The first one is that generally we do not have indicator entries visible in the HUD anymore. Only application menu entries are in it now.
The second one - the way the results are displayed is different. Now, instead of "Menu > Entry" we have "Entry (Menu)" etc.

- Problem:

HUD 2.0 has some changes, which cause some test_hud and test_search autopilot tests to fail.

- Fix:

Quoting the commit message:
Now that we're using the new HUD, there have been some changes that typically cause test_hud tests to fail. Fix the tests to fit the new model.
The first one is that generally we do not have indicator entries visible in the HUD anymore. Only application menu entries are in it now.
The second one - the way the results are displayed is different. Now, instead of "Menu > Entry" we have "Entry (Menu)" etc.

We're not fixing the test_search tests, since in my opinion that's a real regression (see LP: #1172228).

- Tests:

N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3314
http://jenkins.qa.ubuntu.com/job/unity-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/37
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/37/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/37/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3315
http://jenkins.qa.ubuntu.com/job/unity-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/38/rebuild

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Seems fine to me. Just why did you change the tests from trying 'a' to trying 'e'?

review: Approve

[Łukasz Zemczak (sil2100)]

I changed those because e is more likely to return results of the test application, as I added entries that are called 'Entry 1', 'Entry 2' <- there is no letter a in those ;) And I thought that 'Entry NUMBER' is better than 'asdf 1' and such ;)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3316
http://jenkins.qa.ubuntu.com/job/unity-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/39

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/39/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py	2013-03-20 22:10:59 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2013-04-24 15:27:27 +0000
@@ -66,6 +66,14 @@
         }
         self.launch_test_window(window_spec)
 
+    def start_menu_app(self):
+        window_spec = {
+            "Title": "Test menu application",
+            "Menu": ["Entry 1", "Entry 2", "Entry 3", "Entry 4", "Entry 5", "Quit"],
+        }
+        self.launch_test_window(window_spec)
+
+
 
 class HudBehaviorTests(HudTestsBase):
 
@@ -83,16 +91,20 @@
         self.assertThat(self.unity.hud.selected_button, Equals(0))
 
     def test_check_a_values(self):
+        self.start_menu_app()
         self.unity.hud.ensure_visible()
-        self.keyboard.type('a')
-        self.assertThat(self.unity.hud.search_string, Eventually(Equals('a')))
+        self.keyboard.type('e')
+        self.assertThat(self.unity.hud.search_string, Eventually(Equals('e')))
         self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))
         self.assertThat(self.unity.hud.selected_button, Eventually(Equals(1)))
 
     def test_up_down_arrows(self):
+        self.start_menu_app()
         self.unity.hud.ensure_visible()
-        self.keyboard.type('a')
-        self.assertThat(self.unity.hud.search_string, Eventually(Equals('a')))
+        self.keyboard.type('e')
+        self.assertThat(self.unity.hud.search_string, Eventually(Equals('e')))
+        self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))
+
         self.keyboard.press_and_release('Down')
         self.assertThat(self.unity.hud.selected_button, Eventually(Equals(2)))
         self.keyboard.press_and_release('Down')
@@ -120,6 +132,8 @@
         """Hud must not change selected button when results update over time."""
         # TODO - this test doesn't test anything. Onmy system the results never update.
         # ideally we'd send artificial results to the hud from the test.
+        self.skipTest("This test makes no sense in its current state, needs reworking.")
+
         self.unity.hud.ensure_visible()
         self.keyboard.type('is')
         self.assertThat(self.unity.hud.search_string, Eventually(Equals('is')))
@@ -198,8 +212,10 @@
 
         self.keyboard.type("undo")
         hud_query_check = lambda: self.unity.hud.selected_hud_button.label_no_formatting
+        # XXX: with the new HUD, command and description is separated by '\u2002' and
+        #  not a regular space ' '. Is that correct? (LP: #1172237)
         self.assertThat(hud_query_check,
-                        Eventually(Equals("Edit > Undo")))
+                        Eventually(Equals(u'Undo\u2002(Edit)')))
         self.keyboard.press_and_release('Return')
         self.assertThat(self.unity.hud.visible, Eventually(Equals(False)))
 
@@ -306,8 +322,11 @@
 
         self.unity.hud.ensure_visible()
 
-        self.keyboard.type("File > Quit")
-        self.assertThat(self.unity.hud.search_string, Eventually(Equals("File > Quit")))
+        self.keyboard.type("Quit")
+        self.assertThat(self.unity.hud.search_string, Eventually(Equals("Quit")))
+        hud_query_check = lambda: self.unity.hud.selected_hud_button.label_no_formatting
+        self.assertThat(hud_query_check,
+                        Eventually(Equals(u'Quit\u2002(File)')))
 
         self.keyboard.press_and_release("Enter")
 
@@ -368,10 +387,11 @@
         """This tests moves the mouse from the top of the screen to the bottom, this must
         change the selected button from 1 to 5.
         """
-
+        self.start_menu_app()
         self.unity.hud.ensure_visible()
 
-        self.keyboard.type("a")
+        self.keyboard.type("e")
+        self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))
         (x,y,w,h) = self.unity.hud.view.geometry
 
         # Specify a slower rate so that HUD can register the mouse movement properly
@@ -385,10 +405,11 @@
         """This tests moves the mouse from the top of the screen to the bottom,
         then it presses the keyboard up 5 times, this must change the selected button from 5 to 1.
         """
-
+        self.start_menu_app()
         self.unity.hud.ensure_visible()
 
-        self.keyboard.type("a")
+        self.keyboard.type("e")
+        self.assertThat(self.unity.hud.num_buttons, Eventually(Equals(5)))
         (x,y,w,h) = self.unity.hud.view.geometry
 
         self.mouse.move(w/2, 0)
@@ -462,13 +483,13 @@
 
     def test_mouse_does_not_steal_button_focus(self):
         """When typing in the hud the mouse must not steal button focus."""
-
+        self.start_menu_app()
         self.unity.hud.ensure_visible()
 
         (x,y,w,h) = self.unity.hud.view.geometry
         self.mouse.move(w/4, h/4)
 
-        self.keyboard.type("a")
+        self.keyboard.type("e")
         self.assertThat(self.unity.hud.view.selected_button, Eventually(Equals(1)))