Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1359167-empty_multiline_textarea into lp:ubuntu-ui-toolkit/staging

[Leo Arias]

On autopilot helpers, take into account that text areas can have multiple lines when deleting the text.

[lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1359167-empty_multiline_textarea]

1202. By Leo Arias on 2014-08-20

Fixed typo.

1203. By Leo Arias on 2014-08-20

Fixed the import.

1204. By Leo Arias on 2014-08-20

Typo.

1205. By Leo Arias on 2014-08-20

Avoid another possible infinite loop.

1206. By Leo Arias on 2014-08-20

Reorder.

[Nicholas Skaggs (nskaggs)]

Confirming this does indeed properly account for textareas. All infinite loops should be account for now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1204
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/862/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3865
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2973
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/694
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/694/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/694
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5112
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11843
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3257
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3257/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1206
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/863/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3873
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2983
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/695
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/695
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/695/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/695
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5120
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11857
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2425
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3267
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3267/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1206
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/864/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3880
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2991
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/696
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/696/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5127
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11871
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2432
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3275
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3275/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1359167-empty_multiline_textarea]

1207. By Leo Arias on 2014-08-21

Merged with staging.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1207
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/873/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3915
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3012/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/705
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/705
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/705/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/705
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3768
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5162
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5162/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11912
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2452/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3297
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3297/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1207
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/882/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/714
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/714
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/714/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/714

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

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Yup, looks good, thanks!!

review: Approve

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py	2014-07-26 00:10:22 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py	2014-08-21 13:32:36 +0000
@@ -25,3 +25,9 @@
         if not self.is_empty():
             self._clear_with_keys()
             self.text.wait_for('')
+
+    def _go_to_end(self):
+        # We override this because the text areas can have more than one line.
+        # XXX Here we are cheating because the on-screen keyboard doesn't have
+        # CTRL nor END keys. --elopio - 2014-08-20
+        self.keyboard.press_and_release('Ctrl+End')

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2014-08-20 06:45:28 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2014-08-21 13:32:36 +0000
@@ -70,15 +70,16 @@
     def _clear_with_keys(self):
         if platform.model() == 'Desktop':
             self._select_all()
+            self.keyboard.press_and_release('BackSpace')
         else:
             # Touch tap currently doesn't have a press_duration parameter, so
-            # we can't show the popover. Reported as bug http://pad.lv/1268782
-            # --elopio - 2014-01-13
-            self.keyboard.press_and_release('End')
-        while not self.is_empty():
-            # We delete with backspace because the on-screen keyboard has that
-            # key.
-            self.keyboard.press_and_release('BackSpace')
+            # we can't select all the text.
+            # Reported as bug http://pad.lv/1268782 --elopio - 2014-01-13
+            self._go_to_end()
+            while self.cursorPosition != 0:
+                self._delete_one_character()
+        if not self.is_empty():
+            raise _common.ToolkitException('Failed to clear the text field.')
 
     def _select_all(self):
         if not self._is_all_text_selected():
@@ -92,3 +93,16 @@
 
     def _is_all_text_selected(self):
         return self.text == self.selectedText
+
+    def _go_to_end(self):
+        # XXX Here we are cheating because the on-screen keyboard doesn't have
+        # an END key. --elopio - 2014-08-20
+        self.keyboard.press_and_release('End')
+
+    def _delete_one_character(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.')

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py	2014-07-28 16:23:01 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py	2014-08-21 13:32:36 +0000
@@ -14,6 +14,14 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+from autopilot import platform
+from testtools.matchers import GreaterThan
+
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
 
@@ -45,7 +53,22 @@
         self.assertTrue(
             issubclass(ubuntuuitoolkit.TextArea, ubuntuuitoolkit.TextField))
 
-    def test_clear(self):
+    def test_clear_with_single_line(self):
         self.simple_text_area.write('test')
         self.simple_text_area.clear()
         self.assertEqual(self.simple_text_area.text, '')
+
+    def test_clear_with_multiple_lines_on_touch(self):
+        # This is a regrestion test for http://pad.lv/1359167
+        self.simple_text_area.write(
+            'Long text that will make it wrap into multiple lines.')
+        self.assertThat(self.simple_text_area.lineCount, GreaterThan(1))
+        self.simple_text_area.keyboard.press_and_release('Ctrl+Home')
+        if platform.model() == 'Desktop':
+            # Use a touch mock.
+            patcher = mock.patch('autopilot.platform.model')
+            mock_model = patcher.start()
+            self.addCleanup(patcher.stop)
+            mock_model.return_value = 'not desktop'
+        self.simple_text_area.clear()
+        self.assertEqual(self.simple_text_area.text, '')