Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix-1483668-osk-remove-simulated-keyboard into lp:ubuntu-ui-toolkit/staging

[Richard Huddie]

Remove all usage of the autopilot simulated keyboard when the OSK is being used.

Remove all usage of the autopilot simulated keyboard when the OSK is being used, to stop unity8 from hiding the OSK.

This updates both textfield and textarea helpers to use some new helper methods added to the ubuntu_keyboard Keyboard class which allow some cursor movements to be sent through maliit-server, rather than having to create a temporary instance of the autopilot simulated keyboard.

This change also includes the 'select all' method which can be used with the OSK, and re-enables 2 tests on touch which were previously desktop only.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1599
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2124/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/852
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/854
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/854/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/851

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2124/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix-1483668-osk-remove-simulated-keyboard]

1600. By Richard Huddie on 2015-08-13

Use _select_all to delete text using keys.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1600
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2126/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/854
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/856
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/856/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/853

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2126/rebuild

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix-1483668-osk-remove-simulated-keyboard]

1601. By Richard Huddie on 2015-08-13

Update text area to remove use of simulated keyboard when using osk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1601
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2127/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/855
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/857
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/857/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/854

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2127/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

Very nice. I love that we can unskip those tests now!

review: Approve

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py	2015-06-17 15:06:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py	2015-08-13 09:14:49 +0000
@@ -27,30 +27,26 @@
             self._clear_with_keys()
             self.text.wait_for('')
 
-    def _go_to_end(self, select_text=False):
+    def _go_to_end(self):
         # We override this because the text areas can have more than one line.
-        key = 'Ctrl+End'
-        if select_text:
-            key = 'Shift+' + key
         if self._is_keyboard_osk():
-            # XXX Here we are cheating because the on-screen keyboard doesn't
-            # have an END key.
-            from autopilot.input import Keyboard
-            keyboard = Keyboard.create()
+            from ubuntu_keyboard.emulators.keyboard import Keyboard
+            osk = Keyboard()
+            while self.cursorPosition != len(self.text):
+                # Move to the end of the line below
+                osk.send_down_key()
+                osk.send_end_key()
         else:
-            keyboard = self.keyboard
-        keyboard.press_and_release(key)
+            self.keyboard.press_and_release('Ctrl+End')
 
-    def _go_to_start(self, select_text=False):
+    def _go_to_start(self):
         # We override this because the text areas can have more than one line.
-        key = 'Ctrl+Home'
-        if select_text:
-            key = 'Shift+' + key
         if self._is_keyboard_osk():
-            # XXX Here we are cheating because the on-screen keyboard doesn't
-            # have a HOME key.
-            from autopilot.input import Keyboard
-            keyboard = Keyboard.create()
+            from ubuntu_keyboard.emulators.keyboard import Keyboard
+            osk = Keyboard()
+            while self.cursorPosition != 0:
+                # Move to the start of the line above
+                osk.send_up_key()
+                osk.send_home_key()
         else:
-            keyboard = self.keyboard
-        keyboard.press_and_release(key)
+            self.keyboard.press_and_release('Ctrl+Home')

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2015-06-17 15:06:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2015-08-13 09:14:49 +0000
@@ -18,7 +18,7 @@
 
 from autopilot import logging as autopilot_logging
 
-from ubuntuuitoolkit._custom_proxy_objects import _common
+from ubuntuuitoolkit._custom_proxy_objects import _common, _mainview
 
 logger = logging.getLogger(__name__)
 
@@ -73,24 +73,30 @@
 
     @autopilot_logging.log_action(logger.debug)
     def _clear_with_keys(self):
-        if self._is_keyboard_osk():
-            # Touch tap currently doesn't have a press_duration parameter, so
-            # we can't select all the text.
-            # Reported as bug http://pad.lv/1268782 --elopio - 2014-01-13
-            self._go_to_end()
-            while self.text != '':
-                self._delete_one_character_using_osk()
-        else:
-            self._select_all()
-            self.keyboard.press_and_release('BackSpace')
+        self._select_all()
+        self.keyboard.press_and_release('\b')
         if not self.is_empty():
             raise _common.ToolkitException('Failed to clear the text field.')
 
     @autopilot_logging.log_action(logger.debug)
     def _select_all(self):
         if not self._is_all_text_selected():
-            self._go_to_start()
-            self._go_to_end(select_text=True)
+            if self._is_keyboard_osk():
+                cursor = self.select_single('TextCursor', visible=True)
+                self.pointing_device.click_object(
+                    cursor, time_between_events=0.5)
+                self.pointing_device.click_object(
+                    cursor, time_between_events=0.5)
+                root = self.get_root_instance()
+                main_view = root.select_single(_mainview.MainView)
+                popover = main_view.get_text_input_context_menu(
+                    'text_input_contextmenu')
+                popover.click_option_by_text('Select All')
+            else:
+                self._go_to_start()
+                self.keyboard.press('Shift')
+                self._go_to_end()
+                self.keyboard.release('Shift')
 
     def _is_all_text_selected(self):
         return self.text == self.selectedText
@@ -100,39 +106,20 @@
         return _common.is_maliit_process_running()
 
     @autopilot_logging.log_action(logger.debug)
-    def _go_to_end(self, select_text=False):
-        key = 'End'
-        if select_text:
-            key = 'Shift+' + key
-        if self._is_keyboard_osk():
-            # XXX Here we are cheating because the on-screen keyboard doesn't
-            # have an END key. --elopio - 2014-08-20
-            from autopilot.input import Keyboard
-            keyboard = Keyboard.create()
-        else:
-            keyboard = self.keyboard
-        keyboard.press_and_release(key)
-
-    @autopilot_logging.log_action(logger.debug)
-    def _go_to_start(self, select_text=False):
-        key = 'Home'
-        if select_text:
-            key = 'Shift+' + key
-        if self._is_keyboard_osk():
-            from autopilot.input import Keyboard
-            keyboard = Keyboard.create()
-        else:
-            keyboard = self.keyboard
-        keyboard.press_and_release(key)
-
-    @autopilot_logging.log_action(logger.debug)
-    def _delete_one_character_using_osk(self):
-        original_text = self.text
-        # We delete with backspace because the on-screen keyboard has
-        # that key.
-        self.keyboard.press_and_release('backspace')
-        if len(self.text) != len(original_text) - 1:
-            raise _common.ToolkitException('Failed to delete one character.')
+    def _go_to_end(self):
+        if self._is_keyboard_osk():
+            from ubuntu_keyboard.emulators.keyboard import Keyboard
+            Keyboard().send_end_key()
+        else:
+            self.keyboard.press_and_release('End')
+
+    @autopilot_logging.log_action(logger.debug)
+    def _go_to_start(self):
+        if self._is_keyboard_osk():
+            from ubuntu_keyboard.emulators.keyboard import Keyboard
+            Keyboard().send_home_key()
+        else:
+            self.keyboard.press_and_release('Home')
 
     @autopilot_logging.log_action(logger.debug)
     def _ensure_focused(self):

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py	2015-06-18 18:56:55 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py	2015-08-13 09:14:49 +0000
@@ -16,8 +16,6 @@
 
 from unittest import mock
 
-from autopilot import platform
-
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
 
@@ -98,8 +96,6 @@
         self.assertFalse(self.simple_text_field.is_empty())
 
     def test_select_all_selects_all_text(self):
-        if platform.model() != 'Desktop':
-            self.skipTest('Select all is not yet implemented on the phone.')
         self.simple_text_field.write('Text to select.')
         self.simple_text_field._select_all()
 
@@ -107,8 +103,6 @@
 
     def test_select_all_when_already_selected_must_do_nothing(self):
         """Test for select all the text when it's already selected."""
-        if platform.model() != 'Desktop':
-            self.skipTest('Select all is not yet implemented on the phone.')
         self.simple_text_field.write('Text to select.')
         self.simple_text_field._select_all()
         with mock.patch.object(