Merge lp:~thomir/unity/ibus-anthy-autopilot into lp:unity

[Thomi Richards]

Added extra tests for the ibus Anthy engine: we now test both Ctrl+J and Enter as a commit key.

Took bschaefer's branch and changed it to use multiply_scenarios to generate scenarios for the Anthy ibus tests.

UNBLOCK

[Brandon Schaefer (brandontschaefer)]

+1 Looks good!

review: Approve

=== modified file 'tests/autopilot/autopilot/tests/__init__.py'
--- tests/autopilot/autopilot/tests/__init__.py	2012-03-21 12:31:11 +0000
+++ tests/autopilot/autopilot/tests/__init__.py	2012-03-22 22:38:19 +0000
@@ -37,6 +37,31 @@
 logger = logging.getLogger(__name__)
 
 
+try:
+    from testscenarios.scenarios import multiple_scenarios
+except ImportError:
+    from itertools import product
+    def multiply_scenarios(*scenarios):
+        """Multiply two or more iterables of scenarios.
+
+        It is safe to pass scenario generators or iterators.
+
+        :returns: A list of compound scenarios: the cross-product of all
+            scenarios, with the names concatenated and the parameters
+            merged together.
+        """
+        result = []
+        scenario_lists = map(list, scenarios)
+        for combination in product(*scenario_lists):
+            names, parameters = zip(*combination)
+            scenario_name = ','.join(names)
+            scenario_parameters = {}
+            for parameter in parameters:
+                scenario_parameters.update(parameter)
+            result.append((scenario_name, scenario_parameters))
+        return result
+
+
 class LoggedTestCase(TestWithScenarios, TestCase):
     """Initialize the logging for the test case."""
 

=== modified file 'tests/autopilot/autopilot/tests/test_ibus.py'
--- tests/autopilot/autopilot/tests/test_ibus.py	2012-02-26 20:40:15 +0000
+++ tests/autopilot/autopilot/tests/test_ibus.py	2012-03-22 22:38:19 +0000
@@ -14,7 +14,7 @@
     )
 from autopilot.emulators.unity.dash import Dash
 from autopilot.emulators.X11 import Keyboard
-from autopilot.tests import AutopilotTestCase
+from autopilot.tests import AutopilotTestCase, multiply_scenarios
 
 from time import sleep
 
@@ -99,11 +99,17 @@
 class IBusTestsAnthy(IBusTests):
     """Tests for the Anthy(Japanese) input engine."""
 
-    scenarios = [
-        ('system', {'input': 'shisutemu ', 'result': u'\u30b7\u30b9\u30c6\u30e0'}),
-        ('game', {'input': 'ge-mu ', 'result': u'\u30b2\u30fc\u30e0'}),
-        ('user', {'input': 'yu-za- ', 'result': u'\u30e6\u30fc\u30b6\u30fc'}),
+    scenarios = multiply_scenarios(
+        [
+            ('system', {'input': 'shisutemu ', 'result': u'\u30b7\u30b9\u30c6\u30e0'}),
+            ('game', {'input': 'ge-mu ', 'result': u'\u30b2\u30fc\u30e0'}),
+            ('user', {'input': 'yu-za- ', 'result': u'\u30e6\u30fc\u30b6\u30fc'}),
+        ],
+        [
+            ('commit_j', {'commit_key': 'Ctrl+j'}),
+            ('commit_enter', {'commit_key': 'Enter'}),
         ]
+        )
 
     def test_simple_input(self):
         self.activate_input_engine_or_skip("anthy")
@@ -112,7 +118,7 @@
         self.activate_ibus()
         sleep(0.5)
         self.kb.type(self.input)
-        self.kb.press_and_release("Ctrl+j")
+        self.kb.press_and_release(self.commit_key)
         dash_search_string = self.dash.get_searchbar().search_string
         self.deactivate_ibus()
         self.dash.ensure_hidden()