Merge lp:~thomir/unity/improve-ibus-testing into lp:unity

[Thomi Richards]

IBus autopilot tests now wait for input method context to be created before typing characters.

This branch changes the ibus tests so they wait until the ibus input method context is created in the target widget. This eliminates the need for sleep() statements in the ibus tests, and should help some ibus tests that fail intermittently to pass.

This branch requires lp:~brandontschaefer/nux/ibus-active-reset to be merged into lp:nux before these tests will pass. At the time of writing, the branch has been approved, so this shouldnt be a problem.

[Brandon Schaefer (brandontschaefer)]

There seems to still be a little timing issues, but I think that can be fixed by only destroying the context when we are switching engines. Instead of doing it each test. Other then that this improves it a lot so +1.

review: Approve

=== modified file 'plugins/unityshell/src/SearchBar.cpp'
--- plugins/unityshell/src/SearchBar.cpp	2012-04-16 18:52:39 +0000
+++ plugins/unityshell/src/SearchBar.cpp	2012-04-19 23:36:20 +0000
@@ -520,7 +520,7 @@
 {
   int RADIUS = 5;
   nux::Geometry geo(GetGeometry());
-  geo.width = layered_layout_->GetAbsoluteX() + 
+  geo.width = layered_layout_->GetAbsoluteX() +
               layered_layout_->GetAbsoluteWidth() -
               GetAbsoluteX() +
               SEARCH_ENTRY_RIGHT_BORDER;
@@ -665,7 +665,8 @@
   .add("filter-label-x", show_filters_->GetAbsoluteX())
   .add("filter-label-y", show_filters_->GetAbsoluteY())
   .add("filter-label-width", show_filters_->GetAbsoluteWidth())
-  .add("filter-label-height", show_filters_->GetAbsoluteHeight());
+  .add("filter-label-height", show_filters_->GetAbsoluteHeight())
+  .add("im_active", pango_entry_->im_active());
 }
 
 } // namespace unity

=== modified file 'tests/autopilot/autopilot/tests/test_ibus.py'
--- tests/autopilot/autopilot/tests/test_ibus.py	2012-04-17 22:27:03 +0000
+++ tests/autopilot/autopilot/tests/test_ibus.py	2012-04-19 23:36:20 +0000
@@ -9,7 +9,6 @@
 """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,
@@ -38,22 +37,24 @@
         else:
             self.skipTest("This test requires the '%s' engine to be installed." % (engine_name))
 
-    def activate_ibus(self):
-        # it would be nice to be able to tell if it's currently active or not.
+    def activate_ibus(self, widget):
+        """Activate IBus, and wait till it's actived on 'widget'"""
+        self.assertThat(widget.im_active, Equals(False))
         self.keyboard.press_and_release('Ctrl+Space')
+        self.assertThat(widget.im_active, Eventually(Equals(True)))
 
-    def deactivate_ibus(self):
-        # it would be nice to be able to tell if it's currently active or not.
+    def deactivate_ibus(self, widget):
+        """Deactivate ibus, and wait till it's inactive on 'widget'"""
+        self.assertThat(widget.im_active, Equals(True))
         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)
         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.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:
@@ -64,10 +65,8 @@
         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.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:
@@ -138,10 +137,8 @@
         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.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("  ")
@@ -151,10 +148,10 @@
         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()
-        sleep(0.5)
+        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")
@@ -170,10 +167,8 @@
         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.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")
@@ -185,11 +180,9 @@
         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.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")