Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/add_helpers_for_TextArea into lp:ubuntu-ui-toolkit

[Omer Akram]

Add helper methods for TextArea

Add helper methods for TextArea

Note: there is a separate 'clear' method because the one that exists in TextField class checks the property hasClearButton which TextArea does not have.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1060
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2116/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2533
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2041
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2679
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3776
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3776/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10472
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2294
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2294/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2116/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1062
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2118/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2592
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2076
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/64/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2728
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3835
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3835/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1735
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2329
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2329/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2118/rebuild

review: Approve (continuous-integration)

Unmerged revisions

=== modified file 'tests/autopilot/ubuntuuitoolkit/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/__init__.py	2014-07-07 14:43:52 +0000
+++ tests/autopilot/ubuntuuitoolkit/__init__.py	2014-07-28 16:23:21 +0000
@@ -38,6 +38,7 @@
     'TabBar',
     'Tabs',
     'tests',
+    'TextArea',
     'TextField',
     'Toolbar',
     'ToolkitException',
@@ -71,6 +72,7 @@
     QQuickListView,
     TabBar,
     Tabs,
+    TextArea,
     TextField,
     Toolbar,
     ToolkitException,

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2014-06-30 10:49:51 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2014-07-28 16:23:21 +0000
@@ -33,6 +33,7 @@
     'QQuickListView',
     'TabBar',
     'Tabs',
+    'TextArea',
     'TextField',
     'Toolbar',
     'ToolkitException',
@@ -65,6 +66,7 @@
 )
 from ubuntuuitoolkit._custom_proxy_objects._tabbar import TabBar
 from ubuntuuitoolkit._custom_proxy_objects._tabs import Tabs
+from ubuntuuitoolkit._custom_proxy_objects._textarea import TextArea
 from ubuntuuitoolkit._custom_proxy_objects._textfield import TextField
 from ubuntuuitoolkit._custom_proxy_objects._toolbar import Toolbar
 from ubuntuuitoolkit._custom_proxy_objects._ubuntulistview import (

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py	2014-07-28 16:23:21 +0000
@@ -0,0 +1,27 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# 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/>.
+
+from ubuntuuitoolkit._custom_proxy_objects import _textfield
+
+
+class TextArea(_textfield.TextField):
+    """TextArea autopilot emulator."""
+
+    def clear(self):
+        """Clear the text area."""
+        if not self.is_empty():
+            self._clear_with_keys()
+            self.text.wait_for('')

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py	2014-07-28 16:23:21 +0000
@@ -0,0 +1,51 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# 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/>.
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import tests
+
+
+class TextAreaTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Item {
+        TextArea {
+            objectName: "simple_text_area"
+        }
+    }
+}
+""")
+
+    def setUp(self):
+        super(TextAreaTestCase, self).setUp()
+        self.simple_text_area = self.main_view.select_single(
+            ubuntuuitoolkit.TextArea, objectName='simple_text_area')
+
+    def test_text_area_inherits_text_field(self):
+        self.assertTrue(
+            issubclass(ubuntuuitoolkit.TextArea, ubuntuuitoolkit.TextField))
+
+    def test_clear(self):
+        self.simple_text_area.write('test')
+        self.simple_text_area.clear()
+        self.assertEqual(self.simple_text_area.text, '')