Merge lp:~michael-sheldon/ubuntu-keyboard/improve-autopilot-tests into lp:ubuntu-keyboard

[Michael Sheldon]

Extend existing autopilot tests to more thoroughly test each layout, add new tests for extended keys and ".com" key and fix crash when using keyboard after autopilot tests have been run.

Extend existing autopilot tests to more thoroughly test each layout, add new tests for extended keys and ".com" key and fix crash when using keyboard after autopilot tests have been run.

[lp:~michael-sheldon/ubuntu-keyboard/improve-autopilot-tests]

266. By Michael Sheldon on 2015-01-07

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:266
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/527/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/28

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/527/rebuild

review: Approve (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/improve-autopilot-tests]

267. By Michael Sheldon on 2015-01-08

Merge from trunk

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:267
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/530/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/31

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/530/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'tests/autopilot/ubuntu_keyboard/emulators/keyboard.py'
--- tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2014-12-08 15:09:24 +0000
+++ tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-01-08 10:31:23 +0000
@@ -160,7 +160,7 @@
         except AssertionError:
             return False
 
-    def press_key(self, key, capslock_switch=False):
+    def press_key(self, key, capslock_switch=False, long_press=False):
         """Tap on the key with the internal pointer
 
         :params key: String containing the text of the key to tap.
@@ -191,7 +191,10 @@
         self._show_keypad(req_keypad)
         self._change_keypad_to_state(req_key_state)
 
-        self._tap_key(key_pos)
+        if long_press:
+            self._long_press_key(key_pos)
+        else:
+            self._tap_key(key_pos)
 
     def type(self, string, delay=0.1):
         """Type the string *string* with a delay of *delay* between each key
@@ -311,6 +314,14 @@
             pointer = Pointer(Touch.create())
         pointer.click_object(key_rect)
 
+    def _long_press_key(self, key_rect, pointer=None):
+        if pointer is None:
+            pointer = Pointer(Touch.create())
+        pointer.move(key_rect.x + key_rect.w / 2.0, key_rect.y + key_rect.h / 2.0)
+        pointer.press()
+        sleep(1)
+        pointer.release()
+
     def _keyboard_details_changed(self):
         return self._orientation_changed()
 

=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2014-12-11 15:24:55 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-01-08 10:31:23 +0000
@@ -72,6 +72,7 @@
         if os.path.exists(presagedir + ".bak") and os.path.exists(presagedir):
             shutil.rmtree(presagedir)
             os.rename(presagedir + ".bak", presagedir)
+        subprocess.check_call(['restart', 'maliit-server'])
 
     def setUp(self):
         if model() == "Desktop":
@@ -387,7 +388,8 @@
             dict(
                 label="Url",
                 hints=['Qt.ImhUrlCharactersOnly'],
-                expected_activeview="url"
+                expected_activeview="url",
+                text="google.com"
             )
         ),
         (
@@ -395,7 +397,8 @@
             dict(
                 label="Email",
                 hints=['Qt.ImhEmailCharactersOnly'],
-                expected_activeview="email"
+                expected_activeview="email",
+                text="[e-mail]"
             )
         ),
         (
@@ -403,7 +406,8 @@
             dict(
                 label="Number",
                 hints=['Qt.ImhFormattedNumbersOnly'],
-                expected_activeview="number"
+                expected_activeview="number",
+                text="3.14159"
             )
         ),
         (
@@ -411,7 +415,8 @@
             dict(
                 label="Telephone",
                 hints=['Qt.ImhDigitsOnly'],
-                expected_activeview="number"
+                expected_activeview="number",
+                text="01189998819991197253"
             )
         ),
     ]
@@ -432,6 +437,17 @@
             Eventually(Equals(self.expected_activeview))
         )
 
+        if self.text[-4:] == ".com":
+            keyboard.type(self.text[:-4])
+            keyboard.press_key(".com")
+        else:
+            keyboard.type(self.text)
+        
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(self.text))
+        )
+
 
 class UbuntuKeyboardAdvancedFeatures(UbuntuKeyboardTests):
 
@@ -470,6 +486,24 @@
             Eventually(Equals(expected))
         )
 
+    def test_long_press(self):
+        """Long pressing a key should enter the default extended character.
+
+        """
+
+        text_area = self.launch_test_input_area()
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.press_key('t', long_press=True)
+
+        expected = "5"
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+
 
 class UbuntuKeyboardPinyin(UbuntuKeyboardTests):