Merge lp:~brandontschaefer/unity/ibus-ap-fixes into lp:unity

[Brandon Schaefer]

More fixes to the ibus autopilot by reducing the number of times the ime context gets reset.

=== Problem ===
The ibus ap test still fails sometimes when trying to deactivate ibus and the context reseting to many times.

=== Fix ===
Call deactivate instead of adding it to the clean up.

Now the context only resets when changing to a different engine.

[lp:~brandontschaefer/unity/ibus-ap-fixes]

2325. By Brandon Schaefer on 2012-04-20

* Removed param, as it is no longer needed

[Brandon Schaefer (brandontschaefer)]

Ran 32 tests in 202.414s
OK

:)

[lp:~brandontschaefer/unity/ibus-ap-fixes]

2326. By Brandon Schaefer on 2012-04-20

* setUpClass, not tearDownClass

Unmerged revisions

=== modified file 'tests/autopilot/autopilot/tests/test_ibus.py'
--- tests/autopilot/autopilot/tests/test_ibus.py	2012-04-19 23:33:18 +0000
+++ tests/autopilot/autopilot/tests/test_ibus.py	2012-04-20 08:02:18 +0000
@@ -23,19 +23,26 @@
 
     def setUp(self):
         super(IBusTests, self).setUp()
-        self._old_engines = None
 
     def tearDown(self):
-        if self._old_engines is not None:
-            set_active_engines(self._old_engines)
         super(IBusTests, self).tearDown()
 
-    def activate_input_engine_or_skip(self, engine_name):
+    @classmethod
+    def setUpClass(cls):
+        cls._old_engines = None
+
+    @classmethod
+    def tearDownClass(cls):
+        if cls._old_engines is not None:
+            set_active_engines(cls._old_engines)
+
+    @classmethod
+    def activate_input_engine_or_skip(cls, engine_name):
         available_engines = get_available_input_engines()
         if engine_name in available_engines:
-            self._old_engines = set_active_engines([engine_name])
+            cls._old_engines = set_active_engines([engine_name])
         else:
-            self.skipTest("This test requires the '%s' engine to be installed." % (engine_name))
+            raise AutopilotTestCase.skipException("This test requires the '%s' engine to be installed." % (engine_name))
 
     def activate_ibus(self, widget):
         """Activate IBus, and wait till it's actived on 'widget'"""
@@ -49,34 +56,36 @@
         self.keyboard.press_and_release('Ctrl+Space')
         self.assertThat(widget.im_active, Eventually(Equals(False)))
 
-    def do_dash_test_with_engine(self, engine_name):
-        self.activate_input_engine_or_skip(engine_name)
+    def do_dash_test_with_engine(self):
         self.dash.ensure_visible()
         self.addCleanup(self.dash.ensure_hidden)
         self.activate_ibus(self.dash.searchbar)
-        self.addCleanup(self.deactivate_ibus, self.dash.searchbar)
         self.keyboard.type(self.input)
         commit_key = getattr(self, 'commit_key', None)
         if commit_key:
             self.keyboard.press_and_release(commit_key)
+        self.deactivate_ibus(self.dash.searchbar)
         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)
+    def do_hud_test_with_engine(self):
         self.hud.ensure_visible()
         self.addCleanup(self.hud.ensure_hidden)
         self.activate_ibus(self.hud.searchbar)
-        self.addCleanup(self.deactivate_ibus, self.hud.searchbar)
         self.keyboard.type(self.input)
         commit_key = getattr(self, 'commit_key', None)
         if commit_key:
             self.keyboard.press_and_release(commit_key)
+        self.deactivate_ibus(self.hud.searchbar)
         self.assertThat(self.hud.search_string, Eventually(Equals(self.result)))
 
 
 class IBusTestsPinyin(IBusTests):
     """Tests for the Pinyin(Chinese) input engine."""
 
+    @classmethod
+    def setUpClass(cls):
+        cls.activate_input_engine_or_skip("pinyin")
+
     scenarios = [
         ('basic', {'input': 'abc1', 'result': u'\u963f\u5e03\u4ece'}),
         ('photo', {'input': 'zhaopian ', 'result': u'\u7167\u7247'}),
@@ -86,15 +95,19 @@
     ]
 
     def test_simple_input_dash(self):
-        self.do_dash_test_with_engine("pinyin")
+        self.do_dash_test_with_engine()
 
     def test_simple_input_hud(self):
-        self.do_hud_test_with_engine("pinyin")
+        self.do_hud_test_with_engine()
 
 
 class IBusTestsHangul(IBusTests):
     """Tests for the Hangul(Korean) input engine."""
 
+    @classmethod
+    def setUpClass(cls):
+        cls.activate_input_engine_or_skip("hangul")
+
     scenarios = [
         ('transmission', {'input': 'xmfostmaltus ', 'result': u'\ud2b8\ub79c\uc2a4\ubbf8\uc158 '}),
         ('social', {'input': 'httuf ', 'result': u'\uc18c\uc15c '}),
@@ -102,15 +115,19 @@
         ]
 
     def test_simple_input_dash(self):
-        self.do_dash_test_with_engine("hangul")
+        self.do_dash_test_with_engine()
 
     def test_simple_input_hud(self):
-        self.do_hud_test_with_engine("hangul")
+        self.do_hud_test_with_engine()
 
 
 class IBusTestsAnthy(IBusTests):
     """Tests for the Anthy(Japanese) input engine."""
 
+    @classmethod
+    def setUpClass(cls):
+        cls.activate_input_engine_or_skip("anthy")
+
     scenarios = multiply_scenarios(
         [
             ('system', {'input': 'shisutemu ', 'result': u'\u30b7\u30b9\u30c6\u30e0'}),
@@ -124,38 +141,40 @@
         )
 
     def test_simple_input_dash(self):
-        self.do_dash_test_with_engine("anthy")
+        self.do_dash_test_with_engine()
 
     def test_simple_input_hud(self):
-        self.do_hud_test_with_engine("anthy")
+        self.do_hud_test_with_engine()
 
 
 class IBusTestsPinyinIgnore(IBusTests):
     """Tests for ignoring key events while the Pinyin input engine is active."""
 
+    @classmethod
+    def setUpClass(cls):
+        cls.activate_input_engine_or_skip("pinyin")
+
     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)
         self.activate_ibus(self.dash.searchbar)
-        self.addCleanup(self.deactivate_ibus, self.dash.searchbar)
         self.keyboard.type("cipan")
         self.keyboard.press_and_release("Tab")
         self.keyboard.type("  ")
+        self.deactivate_ibus(self.dash.searchbar)
         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)
 
         self.keyboard.type("a")
         self.activate_ibus(self.hud.searchbar)
-        self.addCleanup(self.deactivate_ibus, self.hud.searchbar)
         self.keyboard.type("riqi")
         old_selected = self.hud.selected_button
         self.keyboard.press_and_release("Down")
         new_selected = self.hud.selected_button
+        self.deactivate_ibus(self.hud.searchbar)
 
         self.assertEqual(old_selected, new_selected)
 
@@ -163,29 +182,31 @@
 class IBusTestsAnthyIgnore(IBusTests):
     """Tests for ignoring key events while the Anthy input engine is active."""
 
+    @classmethod
+    def setUpClass(cls):
+        cls.activate_input_engine_or_skip("anthy")
+
     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)
         self.activate_ibus(self.dash.searchbar)
-        self.addCleanup(self.deactivate_ibus, self.dash.searchbar)
         self.keyboard.type("shisutemu ")
         self.keyboard.press_and_release("Tab")
         self.keyboard.press_and_release("Ctrl+j")
+        self.deactivate_ibus(self.dash.searchbar)
         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)
         self.keyboard.type("a")
         self.activate_ibus(self.hud.searchbar)
-        self.addCleanup(self.deactivate_ibus, self.hud.searchbar)
         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.searchbar)
 
         self.assertEqual(old_selected, new_selected)