1
=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
2
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-01-13 23:38:20 +0000
3
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-02-04 17:25:32 +0000
4
@@ -472,6 +472,7 @@
5
472
472
6
473
        """
473
        """
7
474
        with self.keyboard.focused_type(self):
474
        with self.keyboard.focused_type(self):
8
475
            self.focus.wait_for(True)
9
475
            if clear:
476
            if clear:
10
476
                self.clear()
477
                self.clear()
11
477
            else:
478
            else:
12
478
479
13
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py'
14
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py	2013-12-12 09:56:16 +0000
15
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py	2014-02-04 17:25:32 +0000
16
@@ -1,6 +1,6 @@
17
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
18
2
#
2
#
20
3
# Copyright (C) 2012, 2013 Canonical Ltd.
3
# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
21
4
#
4
#
22
5
# This program is free software; you can redistribute it and/or modify
5
# This program is free software; you can redistribute it and/or modify
23
6
# it under the terms of the GNU Lesser General Public License as published by
6
# it under the terms of the GNU Lesser General Public License as published by
24
@@ -16,59 +16,59 @@
25
16
16
26
17
"""Tests for the Ubuntu UI Toolkit Gallery - TextInput components"""
17
"""Tests for the Ubuntu UI Toolkit Gallery - TextInput components"""
27
18
18
30
19
from autopilot.matchers import Eventually
19
from ubuntuuitoolkit import emulators
29
20
from testtools.matchers import Equals
31
21
from ubuntuuitoolkit.tests.gallery import GalleryTestCase
20
from ubuntuuitoolkit.tests.gallery import GalleryTestCase
32
22
21
33
23
22
75
24
class TextInputTests(GalleryTestCase):
23
class WriteAndClearTextInputTestCase(GalleryTestCase):
76
25
    """Generic tests for the Gallery"""
24
77
26
25
    scenarios = [
78
27
    def test_textfield_standard(self):
26
        ('standard textfield', dict(
79
28
        item = "Text Field"
27
            objectName='textfield_standard', text_to_write='Hello World',
80
29
        self.loadItem(item)
28
            expected_text='Hello World')),
81
30
        self.checkPageHeader(item)
29
        ('password textfield', dict(
82
31
        textfield_standard = self.getObject('textfield_standard')
30
            objectName='textfield_password', text_to_write='Test password',
83
32
        self.pointing_device.click_object(textfield_standard)
31
            expected_text='Test password')),
84
33
        self.assertThat(textfield_standard.focus, Eventually(Equals(True)))
32
        ('only integers textfield', dict(
85
34
        self.type_string('Hello World')
33
            objectName='textfield_numbers', text_to_write='-100.123',
86
35
        self.assertThat(textfield_standard.text,
34
            expected_text='-100123'))
87
36
                        Eventually(Equals('Hello World')))
35
    ]
88
37
36
89
38
    def test_textfield_password(self):
37
    def setUp(self):
90
39
        item = "Text Field"
38
        super(WriteAndClearTextInputTestCase, self).setUp()
91
40
        self.loadItem(item)
39
        item = 'Text Field'
92
41
        self.checkPageHeader(item)
40
        self.loadItem(item)
93
42
        textfield_password = self.getObject('textfield_password')
41
        self.checkPageHeader(item)
94
43
        self.pointing_device.click_object(textfield_password)
42
95
44
        self.assertThat(textfield_password.text, Equals('password'))
43
    def test_write_on_textfield_must_update_text(self):
96
45
44
        textfield = self.main_view.select_single(
97
46
        self.tap_clearButton('textfield_password')
45
            emulators.TextField, objectName=self.objectName)
98
47
        self.assertThat(textfield_password.text, Eventually(Equals('')))
46
99
48
47
        textfield.write(self.text_to_write)
100
49
        self.type_string('abcdefgh123')
48
        self.assertEqual(self.expected_text, textfield.text)
101
50
        self.assertThat(textfield_password.text,
49
102
51
                        Eventually(Equals('abcdefgh123')))
50
    def test_clear_textfield_must_remove_text(self):
103
52
51
        textfield = self.main_view.select_single(
104
53
    def test_textfield_numbers(self):
52
            emulators.TextField, objectName=self.objectName)
105
54
        item = "Text Field"
53
        textfield.write(self.text_to_write)
106
55
        self.loadItem(item)
54
107
56
        self.checkPageHeader(item)
55
        textfield.clear()
108
57
        textfield_numbers = self.getObject('textfield_numbers')
56
        self.assertEqual('', textfield.text)
109
58
        self.assertThat(textfield_numbers.text, Eventually(Equals('123')))
57
110
59
58
111
60
        self.tap_clearButton('textfield_numbers')
59
class DisabledTextInputTestCase(GalleryTestCase):
112
61
        self.assertThat(textfield_numbers.text, Eventually(Equals('')))
60
113
62
        #try typing decimal value when text filed is int only.
61
    def setUp(self):
114
63
        self.type_string('-100.123')
62
        super(DisabledTextInputTestCase, self).setUp()
115
64
        self.assertThat(textfield_numbers.text, Eventually(Equals('-100123')))
63
        item = 'Text Field'
116
64
        self.loadItem(item)
117
65
        self.checkPageHeader(item)
118
65
66
119
66
    def test_textfield_disabled(self):
67
    def test_textfield_disabled(self):
124
67
        item = "Text Field"
68
        textfield_disabled = self.main_view.select_single(
125
68
        self.loadItem(item)
69
            emulators.TextField, objectName='textfield_disabled')
122
69
        self.checkPageHeader(item)
123
70
        textfield_disabled = self.getObject('textfield_disabled')
126
71
        self.assertFalse(textfield_disabled.enabled)
70
        self.assertFalse(textfield_disabled.enabled)
128
72
        #try tapping a disabled field and verify that focus is false.
71
129
73
        self.pointing_device.click_object(textfield_disabled)
72
        self.pointing_device.click_object(textfield_disabled)
131
74
        self.assertFalse(textfield_disabled.focus)
73
        textfield_disabled.keyboard.type('This should not be writen')
132
74
        self.assertEqual('', textfield_disabled.text)
133
75
75
134
=== modified file 'tests/unit_x11/tst_components/tst_textfield.qml'
135
--- tests/unit_x11/tst_components/tst_textfield.qml	2013-10-22 17:15:24 +0000
136
+++ tests/unit_x11/tst_components/tst_textfield.qml	2014-02-04 17:25:32 +0000
137
@@ -64,6 +64,16 @@
138
64
        }
64
        }
139
65
    }
65
    }
140
66
66
141
67
    TextField {
142
68
        id: enabledTextField
143
69
        enabled: true
144
70
    }
145
71
146
72
    TextField {
147
73
        id: disabledTextField
148
74
        enabled: false
149
75
    }
150
76
151
67
    TestCase {
77
    TestCase {
152
68
        name: "TextFieldAPI"
78
        name: "TextFieldAPI"
153
69
        when: windowShown
79
        when: windowShown
154
@@ -451,5 +461,25 @@
155
451
            id: regExpValidator
461
            id: regExpValidator
156
452
            regExp: /[a-z]*/
462
            regExp: /[a-z]*/
157
453
        }
463
        }
158
464
159
465
        function test_click_enabled_textfield_must_give_focus() {
160
466
            textField.forceActiveFocus();
161
467
            compare(
162
468
                enabledTextField.focus, false,
163
469
                'enabledTextField is not focused');
164
470
            mouseClick(
165
471
                enabledTextField, enabledTextField.width/2,
166
472
                enabledTextField.height/2)
167
473
            compare(
168
474
                enabledTextField.focus, true, 'enabledTextField is focused')
169
475
        }
170
476
171
477
        function test_click_disabled_textfield_must_not_give_focus() {
172
478
            mouseClick(
173
479
                disabledTextField, disabledTextField.width/2,
174
480
                disabledTextField.height/2)
175
481
            compare(
176
482
                textField.focus, false, 'disabledTextField is not focused');
177
483
        }
178
454
    }
484
    }
179
455
}
485
}
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-01-29	Approve on 2014-02-05
Cris Dywan		2014-01-29	Approve on 2014-02-05
Richard Huddie		2014-01-30	Pending
Javier Collado		2014-01-30	Pending
Víctor R. Ruiz		2014-01-30	Pending
Review via email: mp+203831@code.launchpad.net