1
=== modified file 'modules/Ubuntu/Components/TextField.qml'
2
--- modules/Ubuntu/Components/TextField.qml	2014-01-10 15:33:02 +0000
3
+++ modules/Ubuntu/Components/TextField.qml	2014-01-15 06:43:05 +0000
4
@@ -948,6 +948,7 @@
5
948
948
6
949
    AbstractButton {
949
    AbstractButton {
7
950
        id: clearButton
950
        id: clearButton
8
951
        objectName: "clear_button"
9
951
        property url iconSource: control.__styleInstance.iconSource
952
        property url iconSource: control.__styleInstance.iconSource
10
952
        anchors {
953
        anchors {
11
953
            top: parent.top
954
            top: parent.top
12
954
955
13
=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
14
--- modules/Ubuntu/Components/TextInputPopover.qml	2013-08-07 12:50:35 +0000
15
+++ modules/Ubuntu/Components/TextInputPopover.qml	2014-01-15 06:43:05 +0000
16
@@ -19,6 +19,7 @@
17
19
import "Popups" 0.1
19
import "Popups" 0.1
18
20
20
19
21
ActionSelectionPopover {
21
ActionSelectionPopover {
20
22
    objectName: "text_input_popover"
21
22
    actions: ActionList {
23
    actions: ActionList {
22
23
        Action {
24
        Action {
23
24
            text: i18n.tr("Select All")
25
            text: i18n.tr("Select All")
24
25
26
25
=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
26
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-01-09 19:24:01 +0000
27
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-01-15 06:43:05 +0000
28
@@ -26,6 +26,7 @@
29
26
)
26
)
30
27
from autopilot.introspection import dbus
27
from autopilot.introspection import dbus
31
28
28
32
29
33
29
_NO_TABS_ERROR = 'The MainView has no Tabs.'
30
_NO_TABS_ERROR = 'The MainView has no Tabs.'
34
30
31
35
31
logger = logging.getLogger(__name__)
32
logger = logging.getLogger(__name__)
36
@@ -49,6 +50,12 @@
37
49
    return input.Pointer(device=input_device_class.create())
50
    return input.Pointer(device=input_device_class.create())
38
50
51
39
51
52
40
53
def get_keyboard():
41
54
    """Return the keyboard device."""
42
55
    # TODO return the OSK if we are on the phone. --elopio - 2014-01-13
43
56
    return input.Keyboard.create()
44
57
45
58
46
52
def check_autopilot_version():
59
def check_autopilot_version():
47
53
    """Check that the Autopilot installed version matches the one required.
60
    """Check that the Autopilot installed version matches the one required.
48
54
61
49
@@ -69,8 +76,6 @@
50
69
        check_autopilot_version()
76
        check_autopilot_version()
51
70
        super(UbuntuUIToolkitEmulatorBase, self).__init__(*args)
77
        super(UbuntuUIToolkitEmulatorBase, self).__init__(*args)
52
71
        self.pointing_device = get_pointing_device()
78
        self.pointing_device = get_pointing_device()
53
72
        # TODO it would be nice to have access to the screen keyboard if we are
54
73
        # on the touch UI -- elopio - 2013-09-04
55
74
79
56
75
80
57
76
class MainView(UbuntuUIToolkitEmulatorBase):
81
class MainView(UbuntuUIToolkitEmulatorBase):
58
@@ -396,7 +401,11 @@
59
396
                'Button with text "{0}" not found.'.format(text))
401
                'Button with text "{0}" not found.'.format(text))
60
397
        self.pointing_device.click_object(button)
402
        self.pointing_device.click_object(button)
61
398
        if self.autoClose:
403
        if self.autoClose:
63
399
            self.visible.wait_for(False)
404
            try:
64
405
                self.visible.wait_for(False)
65
406
            except dbus.StateNotFoundError:
66
407
                # The popover was removed from the tree.
67
408
                pass
68
400
409
69
401
    def _get_button(self, text):
410
    def _get_button(self, text):
70
402
        buttons = self.select_many('Empty')
411
        buttons = self.select_many('Empty')
71
@@ -446,6 +455,71 @@
72
446
        self.checked.wait_for(not original_state, timeout)
455
        self.checked.wait_for(not original_state, timeout)
73
447
456
74
448
457
75
458
class TextField(UbuntuUIToolkitEmulatorBase):
76
459
    """TextField Autopilot emulator."""
77
460
78
461
    def __init__(self, *args):
79
462
        super(TextField, self).__init__(*args)
80
463
        self.keyboard = get_keyboard()
81
464
82
465
    def write(self, text, clear=True):
83
466
        """Write into the text field.
84
467
85
468
        :parameter text: The text to write.
86
469
        :parameter clear: If True, the text field will be cleared before
87
470
            writing the text. If False, the text will be appended at the end
88
471
            of the text field. Default is True.
89
472
90
473
        """
91
474
        with self.keyboard.focused_type(self):
92
475
            if clear:
93
476
                self.clear()
94
477
            else:
95
478
                if not self.is_empty():
96
479
                    self.keyboard.press_and_release('End')
97
480
            self.keyboard.type(text)
98
481
99
482
    def clear(self):
100
483
        """Clear the text field."""
101
484
        if not self.is_empty():
102
485
            if self.hasClearButton:
103
486
                self._click_clear_button()
104
487
            else:
105
488
                self._clear_with_keys()
106
489
            self.text.wait_for('')
107
490
108
491
    def is_empty(self):
109
492
        """Return True if the text field is empty. False otherwise."""
110
493
        return self.text == ''
111
494
112
495
    def _click_clear_button(self):
113
496
        clear_button = self.select_single(
114
497
            'AbstractButton', objectName='clear_button')
115
498
        if not clear_button.visible:
116
499
            self.pointing_device.click_object(self)
117
500
        self.pointing_device.click_object(clear_button)
118
501
119
502
    def _clear_with_keys(self):
120
503
        if platform.model() == 'Desktop':
121
504
            self._select_all()
122
505
        else:
123
506
            # Touch tap currently doesn't have a press_duration parameter, so
124
507
            # we can't show the popover. Reported as bug http://pad.lv/1268782
125
508
            # --elopio - 2014-01-13
126
509
            self.keyboard.press_and_release('End')
127
510
        while not self.is_empty():
128
511
            # We delete with backspace because the on-screen keyboard has that
129
512
            # key.
130
513
            self.keyboard.press_and_release('BackSpace')
131
514
132
515
    def _select_all(self):
133
516
        self.pointing_device.click_object(self, press_duration=1)
134
517
        root = self.get_root_instance()
135
518
        main_view = root.select_single(MainView)
136
519
        popover = main_view.get_action_selection_popover('text_input_popover')
137
520
        popover.click_button_by_text('Select All')
138
521
139
522
140
449
class QQuickListView(UbuntuUIToolkitEmulatorBase):
523
class QQuickListView(UbuntuUIToolkitEmulatorBase):
141
450
524
142
451
    @autopilot_logging.log_action(logger.info)
525
    @autopilot_logging.log_action(logger.info)
143
452
526
144
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
145
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-01-10 03:45:29 +0000
146
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-01-15 06:43:05 +0000
147
@@ -882,6 +882,79 @@
148
882
        self.assertEqual(self.header.title, 'Page 0')
882
        self.assertEqual(self.header.title, 'Page 0')
149
883
883
150
884
884
151
885
class TextFieldTestCase(tests.QMLStringAppTestCase):
152
886
153
887
    test_qml = ("""
154
888
import QtQuick 2.0
155
889
import Ubuntu.Components 0.1
156
890
157
891
MainView {
158
892
    width: units.gu(48)
159
893
    height: units.gu(60)
160
894
161
895
    Item {
162
896
        TextField {
163
897
            id: simpleTextField
164
898
            objectName: "simple_text_field"
165
899
        }
166
900
        TextField {
167
901
            id: textFieldWithoutClearButton
168
902
            objectName: "text_field_without_clear_button"
169
903
            hasClearButton: false
170
904
            anchors.top: simpleTextField.bottom
171
905
        }
172
906
    }
173
907
}
174
908
""")
175
909
176
910
    def setUp(self):
177
911
        super(TextFieldTestCase, self).setUp()
178
912
        self.simple_text_field = self.main_view.select_single(
179
913
            emulators.TextField, objectName='simple_text_field')
180
914
181
915
    def test_text_field_emulator(self):
182
916
        self.assertIsInstance(self.simple_text_field, emulators.TextField)
183
917
184
918
    def test_write(self):
185
919
        self.simple_text_field.write('test')
186
920
        self.assertEqual(self.simple_text_field.text, 'test')
187
921
188
922
    def test_clear_with_clear_button(self):
189
923
        self.simple_text_field.write('test')
190
924
        self.simple_text_field.clear()
191
925
        self.assertEqual(self.simple_text_field.text, '')
192
926
193
927
    def test_clear_without_clear_button(self):
194
928
        text_field = self.main_view.select_single(
195
929
            emulators.TextField, objectName='text_field_without_clear_button')
196
930
        text_field.write('test')
197
931
        text_field.clear()
198
932
        self.assertEqual(text_field.text, '')
199
933
200
934
    def test_clear_and_write(self):
201
935
        self.simple_text_field.write('test1')
202
936
        self.simple_text_field.write('test2')
203
937
        self.assertEqual(self.simple_text_field.text, 'test2')
204
938
205
939
    def test_write_without_clear(self):
206
940
        self.simple_text_field.write('test1')
207
941
        self.simple_text_field.write('test2', clear=False)
208
942
        self.assertEqual(self.simple_text_field.text, 'test1test2')
209
943
210
944
    def test_write_without_clear_writes_at_the_end(self):
211
945
        self.simple_text_field.write(
212
946
            'long text that will fill more than half of the text field.')
213
947
        self.simple_text_field.write('append', clear=False)
214
948
        self.assertEqual(
215
949
            self.simple_text_field.text,
216
950
            'long text that will fill more than half of the text field.append')
217
951
218
952
    def test_is_empty(self):
219
953
        self.assertTrue(self.simple_text_field.is_empty())
220
954
        self.simple_text_field.write('test')
221
955
        self.assertFalse(self.simple_text_field.is_empty())
222
956
223
957
224
885
class ComposerSheetTestCase(tests.QMLStringAppTestCase):
958
class ComposerSheetTestCase(tests.QMLStringAppTestCase):
225
886
959
226
887
    test_qml = ("""
960
    test_qml = ("""
Status:	Merged
Approved by:	Cris Dywan on 2014-01-17
Approved revision:	818
Merged at revision:	919
Proposed branch:	lp:~elopio/ubuntu-ui-toolkit/textfield_emulators
Merge into:	lp:ubuntu-ui-toolkit
Diff against target:	226 lines (+152/-3) 4 files modified modules/Ubuntu/Components/TextField.qml (+1/-0) modules/Ubuntu/Components/TextInputPopover.qml (+1/-0) tests/autopilot/ubuntuuitoolkit/emulators.py (+77/-3) tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py (+73/-0)
To merge this branch:	bzr merge lp:~elopio/ubuntu-ui-toolkit/textfield_emulators
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Cris Dywan		2014-01-14	Approve on 2014-01-17
PS Jenkins bot	continuous-integration		Approve on 2014-01-15
Richard Huddie		2014-01-17	Pending
Javier Collado		2014-01-17	Pending
Víctor R. Ruiz		2014-01-17	Pending
Florian Boucault		2013-10-08	Pending
Review via email: mp+189796@code.launchpad.net