Merge lp:~thomir/unity/ibus-test-to-wait_for-feature into lp:unity

[Thomi Richards]

IBus tests now use Eventually autopilot feature, and other refactorings.

IBus tests now use the wait_for attribute feature, and are generally much cleaner (and shorter).

[Brandon Schaefer (brandontschaefer)]

Looks good! Awesome clean up!

review: Approve

[Brandon Schaefer (brandontschaefer)]

New changes look good, and all ap test pass!

review: Approve

[Unity Merger (unity-merger)]

The prerequisite lp:~thomir/unity/hud-tests-to-wait_for-feature has not yet been merged into lp:unity.

[lp:~thomir/unity/ibus-test-to-wait_for-feature]

2249. By Thomi Richards on 2012-04-18

Merged trunk, resolved conflicts.

Unmerged revisions

2249. By Thomi Richards on 2012-04-18

Merged trunk, resolved conflicts.

2248. By Thomi Richards on 2012-04-18

Merged hud-tests-to-wait_for-feature into ibus-test-to-wait_for-feature.

2247. By Thomi Richards on 2012-04-18

Merged hud-tests-to-wait_for-feature into ibus-test-to-wait_for-feature.

=== modified file 'tests/autopilot/autopilot/emulators/unity/dash.py'
--- tests/autopilot/autopilot/emulators/unity/dash.py	2012-04-17 22:30:28 +0000
+++ tests/autopilot/autopilot/emulators/unity/dash.py	2012-04-17 22:30:28 +0000
@@ -94,6 +94,7 @@
         """
         self._keyboard.press_and_release("Ctrl+a")
         self._keyboard.press_and_release("Delete")
+        self.search_string.wait_for("")
 
     def reveal_application_lens(self, clear_search=True):
         """Reveal the application lense."""

=== modified file 'tests/autopilot/autopilot/tests/test_ibus.py'
--- tests/autopilot/autopilot/tests/test_ibus.py	2012-04-05 15:14:16 +0000
+++ tests/autopilot/autopilot/tests/test_ibus.py	2012-04-17 22:30:28 +0000
@@ -8,12 +8,14 @@
 
 """Tests to ensure unity is compatible with ibus input method."""
 
+from testtools.matchers import Equals, NotEquals
 from time import sleep
 
 from autopilot.emulators.ibus import (
     set_active_engines,
     get_available_input_engines,
     )
+from autopilot.matchers import Eventually
 from autopilot.tests import AutopilotTestCase, multiply_scenarios
 
 
@@ -44,6 +46,34 @@
         # it would be nice to be able to tell if it's currently active or not.
         self.keyboard.press_and_release('Ctrl+Space')
 
+    def do_dash_test_with_engine(self, engine_name):
+        self.activate_input_engine_or_skip(engine_name)
+        self.dash.ensure_visible()
+        self.addCleanup(self.dash.ensure_hidden)
+        sleep(0.5)
+        self.activate_ibus()
+        self.addCleanup(self.deactivate_ibus)
+        sleep(0.5)
+        self.keyboard.type(self.input)
+        commit_key = getattr(self, 'commit_key', None)
+        if commit_key:
+            self.keyboard.press_and_release(commit_key)
+        self.assertThat(self.dash.search_string, Eventually(Equals(self.result)))
+
+    def do_hud_test_with_engine(self, engine_name):
+        self.activate_input_engine_or_skip(engine_name)
+        self.hud.ensure_visible()
+        self.addCleanup(self.hud.ensure_hidden)
+        sleep(0.5)
+        self.activate_ibus()
+        self.addCleanup(self.deactivate_ibus)
+        sleep(0.5)
+        self.keyboard.type(self.input)
+        commit_key = getattr(self, 'commit_key', None)
+        if commit_key:
+            self.keyboard.press_and_release(commit_key)
+        self.assertThat(self.hud.search_string, Eventually(Equals(self.result)))
+
 
 class IBusTestsPinyin(IBusTests):
     """Tests for the Pinyin(Chinese) input engine."""
@@ -57,30 +87,10 @@
     ]
 
     def test_simple_input_dash(self):
-        self.activate_input_engine_or_skip("pinyin")
-        self.dash.ensure_visible()
-        sleep(0.5)
-        self.activate_ibus()
-        sleep(0.5)
-        self.keyboard.type(self.input)
-        dash_search_string = self.dash.search_string
-        self.deactivate_ibus()
-        self.dash.ensure_hidden()
-
-        self.assertEqual(self.result, dash_search_string)
+        self.do_dash_test_with_engine("pinyin")
 
     def test_simple_input_hud(self):
-        self.activate_input_engine_or_skip("pinyin")
-        self.hud.ensure_visible()
-        sleep(0.5)
-        self.activate_ibus()
-        sleep(0.5)
-        self.keyboard.type(self.input)
-        hud_search_string = self.hud.search_string
-        self.deactivate_ibus()
-        self.hud.ensure_hidden()
-
-        self.assertEqual(self.result, hud_search_string)
+        self.do_hud_test_with_engine("pinyin")
 
 
 class IBusTestsHangul(IBusTests):
@@ -93,30 +103,10 @@
         ]
 
     def test_simple_input_dash(self):
-        self.activate_input_engine_or_skip("hangul")
-        self.dash.ensure_visible()
-        sleep(0.5)
-        self.activate_ibus()
-        sleep(0.5)
-        self.keyboard.type(self.input)
-        dash_search_string = self.dash.search_string
-        self.deactivate_ibus()
-        self.dash.ensure_hidden()
-
-        self.assertEqual(self.result, dash_search_string)
+        self.do_dash_test_with_engine("hangul")
 
     def test_simple_input_hud(self):
-        self.activate_input_engine_or_skip("hangul")
-        self.hud.ensure_visible()
-        sleep(0.5)
-        self.activate_ibus()
-        sleep(0.5)
-        self.keyboard.type(self.input)
-        hud_search_string = self.hud.search_string
-        self.deactivate_ibus()
-        self.hud.ensure_hidden()
-
-        self.assertEqual(self.result, hud_search_string)
+        self.do_hud_test_with_engine("hangul")
 
 
 class IBusTestsAnthy(IBusTests):
@@ -135,32 +125,10 @@
         )
 
     def test_simple_input_dash(self):
-        self.activate_input_engine_or_skip("anthy")
-        self.dash.ensure_visible()
-        sleep(0.5)
-        self.activate_ibus()
-        sleep(0.5)
-        self.keyboard.type(self.input)
-        self.keyboard.press_and_release(self.commit_key)
-        dash_search_string = self.dash.search_string
-        self.deactivate_ibus()
-        self.dash.ensure_hidden()
-
-        self.assertEqual(self.result, dash_search_string)
+        self.do_dash_test_with_engine("anthy")
 
     def test_simple_input_hud(self):
-        self.activate_input_engine_or_skip("anthy")
-        self.hud.ensure_visible()
-        sleep(0.5)
-        self.activate_ibus()
-        sleep(0.5)
-        self.keyboard.type(self.input)
-        self.keyboard.press_and_release(self.commit_key)
-        hud_search_string = self.hud.search_string
-        self.deactivate_ibus()
-        self.hud.ensure_hidden()
-
-        self.assertEqual(self.result, hud_search_string)
+        self.do_hud_test_with_engine("anthy")
 
 
 class IBusTestsPinyinIgnore(IBusTests):
@@ -169,21 +137,20 @@
     def test_ignore_key_events_on_dash(self):
         self.activate_input_engine_or_skip("pinyin")
         self.dash.ensure_visible()
+        self.addCleanup(self.dash.ensure_hidden)
         sleep(0.5)
         self.activate_ibus()
+        self.addCleanup(self.deactivate_ibus)
         sleep(0.5)
         self.keyboard.type("cipan")
         self.keyboard.press_and_release("Tab")
         self.keyboard.type("  ")
-        dash_search_string = self.dash.get_searchbar().search_string
-        self.deactivate_ibus()
-        self.dash.ensure_hidden()
-
-        self.assertNotEqual("  ", dash_search_string)
+        self.assertThat(self.dash.search_string, Eventually(NotEquals("  ")))
 
     def test_ignore_key_events_on_hud(self):
         self.activate_input_engine_or_skip("pinyin")
         self.hud.ensure_visible()
+        self.addCleanup(self.hud.ensure_hidden)
         sleep(0.5)
         self.keyboard.type("a")
         self.activate_ibus()
@@ -192,9 +159,7 @@
         old_selected = self.hud.selected_button
         self.keyboard.press_and_release("Down")
         new_selected = self.hud.selected_button
-        self.deactivate_ibus()
-        self.hud.ensure_hidden()
-        
+
         self.assertEqual(old_selected, new_selected)
 
 
@@ -204,30 +169,30 @@
     def test_ignore_key_events_on_dash(self):
         self.activate_input_engine_or_skip("anthy")
         self.dash.ensure_visible()
+        self.addCleanup(self.dash.ensure_hidden)
         sleep(0.5)
         self.activate_ibus()
+        self.addCleanup(self.deactivate_ibus)
         sleep(0.5)
         self.keyboard.type("shisutemu ")
         self.keyboard.press_and_release("Tab")
         self.keyboard.press_and_release("Ctrl+j")
-        dash_search_string = self.dash.get_searchbar().search_string
-        self.deactivate_ibus()
-        self.dash.ensure_hidden()
+        dash_search_string = self.dash.search_string
 
         self.assertNotEqual("", dash_search_string)
 
     def test_ignore_key_events_on_hud(self):
         self.activate_input_engine_or_skip("anthy")
         self.hud.ensure_visible()
+        self.addCleanup(self.hud.ensure_hidden)
         sleep(0.5)
         self.keyboard.type("a")
         self.activate_ibus()
+        self.addCleanup(self.deactivate_ibus)
         sleep(0.5)
         self.keyboard.type("hiduke")
         old_selected = self.hud.selected_button
         self.keyboard.press_and_release("Down")
         new_selected = self.hud.selected_button
-        self.deactivate_ibus()
-        self.hud.ensure_hidden()
 
         self.assertEqual(old_selected, new_selected)