1
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py'
2
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py	2014-07-26 00:10:22 +0000
3
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textarea.py	2014-08-21 13:32:36 +0000
4
@@ -25,3 +25,9 @@
5
25
        if not self.is_empty():
25
        if not self.is_empty():
6
26
            self._clear_with_keys()
26
            self._clear_with_keys()
7
27
            self.text.wait_for('')
27
            self.text.wait_for('')
8
28
9
29
    def _go_to_end(self):
10
30
        # We override this because the text areas can have more than one line.
11
31
        # XXX Here we are cheating because the on-screen keyboard doesn't have
12
32
        # CTRL nor END keys. --elopio - 2014-08-20
13
33
        self.keyboard.press_and_release('Ctrl+End')
14
28
34
15
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py'
16
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2014-08-20 06:45:28 +0000
17
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2014-08-21 13:32:36 +0000
18
@@ -70,15 +70,16 @@
19
70
    def _clear_with_keys(self):
70
    def _clear_with_keys(self):
20
71
        if platform.model() == 'Desktop':
71
        if platform.model() == 'Desktop':
21
72
            self._select_all()
72
            self._select_all()
22
73
            self.keyboard.press_and_release('BackSpace')
23
73
        else:
74
        else:
24
74
            # Touch tap currently doesn't have a press_duration parameter, so
75
            # Touch tap currently doesn't have a press_duration parameter, so
32
75
            # we can't show the popover. Reported as bug http://pad.lv/1268782
76
            # we can't select all the text.
33
76
            # --elopio - 2014-01-13
77
            # Reported as bug http://pad.lv/1268782 --elopio - 2014-01-13
34
77
            self.keyboard.press_and_release('End')
78
            self._go_to_end()
35
78
        while not self.is_empty():
79
            while self.cursorPosition != 0:
36
79
            # We delete with backspace because the on-screen keyboard has that
80
                self._delete_one_character()
37
80
            # key.
81
        if not self.is_empty():
38
81
            self.keyboard.press_and_release('BackSpace')
82
            raise _common.ToolkitException('Failed to clear the text field.')
39
82
83
40
83
    def _select_all(self):
84
    def _select_all(self):
41
84
        if not self._is_all_text_selected():
85
        if not self._is_all_text_selected():
42
@@ -92,3 +93,16 @@
43
92
93
44
93
    def _is_all_text_selected(self):
94
    def _is_all_text_selected(self):
45
94
        return self.text == self.selectedText
95
        return self.text == self.selectedText
46
96
47
97
    def _go_to_end(self):
48
98
        # XXX Here we are cheating because the on-screen keyboard doesn't have
49
99
        # an END key. --elopio - 2014-08-20
50
100
        self.keyboard.press_and_release('End')
51
101
52
102
    def _delete_one_character(self):
53
103
        original_text = self.text
54
104
        # We delete with backspace because the on-screen keyboard has
55
105
        # that key.
56
106
        self.keyboard.press_and_release('BackSpace')
57
107
        if len(self.text) != len(original_text) - 1:
58
108
            raise _common.ToolkitException('Failed to delete one character.')
59
95
109
60
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py'
61
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py	2014-07-28 16:23:01 +0000
62
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py	2014-08-21 13:32:36 +0000
63
@@ -14,6 +14,14 @@
64
14
# You should have received a copy of the GNU Lesser General Public License
14
# You should have received a copy of the GNU Lesser General Public License
65
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
66
16
16
67
17
try:
68
18
    from unittest import mock
69
19
except ImportError:
70
20
    import mock
71
21
72
22
from autopilot import platform
73
23
from testtools.matchers import GreaterThan
74
24
75
17
import ubuntuuitoolkit
25
import ubuntuuitoolkit
76
18
from ubuntuuitoolkit import tests
26
from ubuntuuitoolkit import tests
77
19
27
78
@@ -45,7 +53,22 @@
79
45
        self.assertTrue(
53
        self.assertTrue(
80
46
            issubclass(ubuntuuitoolkit.TextArea, ubuntuuitoolkit.TextField))
54
            issubclass(ubuntuuitoolkit.TextArea, ubuntuuitoolkit.TextField))
81
47
55
83
48
    def test_clear(self):
56
    def test_clear_with_single_line(self):
84
49
        self.simple_text_area.write('test')
57
        self.simple_text_area.write('test')
85
50
        self.simple_text_area.clear()
58
        self.simple_text_area.clear()
86
51
        self.assertEqual(self.simple_text_area.text, '')
59
        self.assertEqual(self.simple_text_area.text, '')
87
60
88
61
    def test_clear_with_multiple_lines_on_touch(self):
89
62
        # This is a regrestion test for http://pad.lv/1359167
90
63
        self.simple_text_area.write(
91
64
            'Long text that will make it wrap into multiple lines.')
92
65
        self.assertThat(self.simple_text_area.lineCount, GreaterThan(1))
93
66
        self.simple_text_area.keyboard.press_and_release('Ctrl+Home')
94
67
        if platform.model() == 'Desktop':
95
68
            # Use a touch mock.
96
69
            patcher = mock.patch('autopilot.platform.model')
97
70
            mock_model = patcher.start()
98
71
            self.addCleanup(patcher.stop)
99
72
            mock_model.return_value = 'not desktop'
100
73
        self.simple_text_area.clear()
101
74
        self.assertEqual(self.simple_text_area.text, '')
Reviewer	Review Type	Date Requested	Status
Zsombor Egri		2014-08-20	Approve on 2014-08-22
PS Jenkins bot	continuous-integration		Approve on 2014-08-22
Nicholas Skaggs (community)			Approve on 2014-08-20
Canonical Platform QA Team		2014-08-20	Pending
Review via email: mp+231626@code.launchpad.net