1
=== modified file 'alarm/AddAlarmPage.qml'
2
--- alarm/AddAlarmPage.qml	2014-02-19 17:43:14 +0000
3
+++ alarm/AddAlarmPage.qml	2014-02-24 16:24:49 +0000
4
@@ -324,6 +324,7 @@
5
324
324
6
325
        Flickable {
325
        Flickable {
7
326
            id: addAlarmPageAnimationContainer
326
            id: addAlarmPageAnimationContainer
8
327
            objectName: "animationContainer"
9
327
328
10
328
            anchors.fill: parent
329
            anchors.fill: parent
11
329
            contentWidth: addAlarmPage.width
330
            contentWidth: addAlarmPage.width
12
330
331
13
=== modified file 'alarm/AlarmPage.qml'
14
--- alarm/AlarmPage.qml	2014-02-19 17:43:14 +0000
15
+++ alarm/AlarmPage.qml	2014-02-24 16:24:49 +0000
16
@@ -199,6 +199,7 @@
17
199
199
18
200
        Flickable {
200
        Flickable {
19
201
            id: alarmAnimationContainer
201
            id: alarmAnimationContainer
20
202
            objectName: "animationContainer"
21
202
203
22
203
            Component.onCompleted: alarmPageFlickable = alarmAnimationContainer
204
            Component.onCompleted: alarmPageFlickable = alarmAnimationContainer
23
204
205
24
205
206
25
=== modified file 'stopwatch/StopwatchPage.qml'
26
--- stopwatch/StopwatchPage.qml	2014-02-19 17:43:14 +0000
27
+++ stopwatch/StopwatchPage.qml	2014-02-24 16:24:49 +0000
28
@@ -197,6 +197,7 @@
29
197
197
30
198
        Flickable {
198
        Flickable {
31
199
            id: stopwatchAnimationContainer
199
            id: stopwatchAnimationContainer
32
200
            objectName: "animationContainer"
33
200
201
34
201
            Component.onCompleted: stopwatchPageFlickable = stopwatchAnimationContainer
202
            Component.onCompleted: stopwatchPageFlickable = stopwatchAnimationContainer
35
202
203
36
203
204
37
=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
38
--- tests/autopilot/ubuntu_clock_app/emulators.py	2014-02-19 18:04:36 +0000
39
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-02-24 16:24:49 +0000
40
@@ -21,8 +21,11 @@
41
21
from time import sleep
21
from time import sleep
42
22
22
43
23
from autopilot import logging as autopilot_logging
23
from autopilot import logging as autopilot_logging
44
24
45
25
46
24
from ubuntuuitoolkit import emulators as toolkit_emulators
26
from ubuntuuitoolkit import emulators as toolkit_emulators
47
25
27
48
28
49
26
logger = logging.getLogger(__name__)
29
logger = logging.getLogger(__name__)
50
27
30
51
28
31
52
@@ -32,6 +35,16 @@
53
32
35
54
33
class MainView(toolkit_emulators.MainView):
36
class MainView(toolkit_emulators.MainView):
55
34
37
56
38
    @autopilot_logging.log_action(logger.info)
57
39
    def open_timer(self):
58
40
        """Open the Timer tab.
59
41
60
42
        :return: the Timer page.
61
43
62
44
        """
63
45
        self.switch_to_tab('TimerTab')
64
46
        return self.wait_select_single(TimerPage)
65
47
66
35
    # Common Emulator Functions
48
    # Common Emulator Functions
67
36
    def _drag_page(self, page, direction):
49
    def _drag_page(self, page, direction):
68
37
        """Function to drag the page up/down"""
50
        """Function to drag the page up/down"""
69
@@ -65,7 +78,9 @@
70
65
        self.pointing_device.release()
78
        self.pointing_device.release()
71
66
79
72
67
    def _wait_to_stop_moving(self, page):
80
    def _wait_to_stop_moving(self, page):
74
68
        page.select_single("QQuickFlickable").moving.wait_for(False)
81
        page.select_single(
75
82
            'QQuickFlickable',
76
83
            objectName='animationContainer').moving.wait_for(False)
77
69
84
78
70
    # CLOCK Page Emulator Functions
85
    # CLOCK Page Emulator Functions
79
71
    def get_clock_page(self):
86
    def get_clock_page(self):
80
@@ -74,7 +89,8 @@
81
74
89
82
75
    def get_time_label(self):
90
    def get_time_label(self):
83
76
        """Return the label with the timer countdown"""
91
        """Return the label with the timer countdown"""
85
77
        return self.select_single("ClockPage").wait_select_single("Label", objectName="label")
92
        return self.select_single("ClockPage").wait_select_single(
86
93
            "Label", objectName="label")
87
78
94
88
79
    # WORLD CLOCK Page Emulator Functions
95
    # WORLD CLOCK Page Emulator Functions
89
80
    def get_world_cities_page(self):
96
    def get_world_cities_page(self):
90
@@ -83,10 +99,11 @@
91
83
99
92
84
    def get_search_box(self):
100
    def get_search_box(self):
93
85
        """Returns the search box used to search for world cities online."""
101
        """Returns the search box used to search for world cities online."""
95
86
        return self.wait_select_single('SearchBox', objectName="worldSearchBox")
102
        return self.wait_select_single(
96
103
            'SearchBox', objectName="worldSearchBox")
97
87
104
98
88
    def get_world_cities_list(self):
105
    def get_world_cities_list(self):
100
89
        """Return the component containing the list of available world cities."""
106
        """Return the component of the list of available world cities."""
101
90
        return self.wait_select_single(objectName="worldList")
107
        return self.wait_select_single(objectName="worldList")
102
91
108
103
92
    def get_city_name(self, city):
109
    def get_city_name(self, city):
104
@@ -94,11 +111,15 @@
105
94
        return city.wait_select_single('Label', objectName='city_name').text
111
        return city.wait_select_single('Label', objectName='city_name').text
106
95
112
107
96
    def get_saved_cities_list(self):
113
    def get_saved_cities_list(self):
109
97
        """Return the component containing list of user saved world city locations."""
114
        """Return the component of the user saved world city locations."""
110
98
        return self.wait_select_single(objectName="listWorldClocks")
115
        return self.wait_select_single(objectName="listWorldClocks")
111
99
116
112
100
    def grab_first_listed_city(self):
117
    def grab_first_listed_city(self):
114
101
        """Return the first city from the available world cities list (both local and online)"""
118
        """Return the first city from the available world cities.
115
119
116
120
        It returns both local and online.
117
121
118
122
        """
119
102
        return self.wait_select_single("Base", objectName="worldcity0")
123
        return self.wait_select_single("Base", objectName="worldcity0")
120
103
124
121
104
    def select_city(self, city):
125
    def select_city(self, city):
122
@@ -107,53 +128,19 @@
123
107
128
124
108
    def grab_first_saved_city(self):
129
    def grab_first_saved_city(self):
125
109
        """Return the first city from the user saved world cities list"""
130
        """Return the first city from the user saved world cities list"""
163
110
        return self.wait_select_single("Standard", objectName="savedworldcity0")
131
        return self.wait_select_single(
164
111
132
            "Standard", objectName="savedworldcity0")
128
112
    # TIMER Page Emulator Functions
129
113
    def get_timer_reset_button(self):
130
114
        """Returns the select for the reset button"""
131
115
        return self.select_single("ImageButton", objectName="resetButtonTimer")
132
116
133
117
    def get_timer_name_preset(self):
134
118
        """Returns the TextField where insert the name of the preset"""
135
119
        return self.wait_select_single(LabelDots, objectName="namePreset")
136
120
137
121
    def get_timer_minute_hand(self):
138
122
        """Returns the hour hand of clock in timer tab"""
139
123
        return self.select_single("TimerPage").wait_select_single("DialerHand", objectName="minuteHand")
140
124
141
125
    def get_preset_label_text(self):
142
126
        """Returns the label with the preset text"""
143
127
        preset = self.select_many("Label", objectName="presetTextLabel")
144
128
        return preset[0]  # last preset, the one created by autopilot
145
129
146
130
    def get_preset_label_timer(self):
147
131
        """Returns the label with the preset timer"""
148
132
        preset = self.select_many("Label", objectName="presetTimerLabel")
149
133
        return preset[0]  # last preset, the one created by autopilot
150
134
151
135
    def get_label_timer(self):
152
136
        """Return the label with the timer countdown"""
153
137
        return self.select_single("TimerPage").wait_select_single("Label", objectName="label")
154
138
155
139
    def get_first_preset_list_item(self):
156
140
        """Returns the first preset list item in the timer page."""
157
141
        return self.wait_select_single("Standard", objectName="preset0")
158
142
159
143
    def get_num_of_presets(self):
160
144
        """Returns the number of presets in the timer page."""
161
145
        timer_page = self.select_single("TimerPage")
162
146
        return int(timer_page.wait_select_single("QQuickListView").count)
165
147
133
166
148
    # STOPWATCH Page Emulator Functions
134
    # STOPWATCH Page Emulator Functions
167
149
    def get_stopwatch_label(self):
135
    def get_stopwatch_label(self):
168
150
        """Returns the select for the stopwatch label"""
136
        """Returns the select for the stopwatch label"""
170
151
        return self.select_single("StopwatchPage").wait_select_single("Label", objectName="label")
137
        return self.select_single(
171
138
            "StopwatchPage").wait_select_single("Label", objectName="label")
172
152
139
173
153
    def get_stopwatch_button(self):
140
    def get_stopwatch_button(self):
174
154
        """Returns the select for the stopwatch button"""
141
        """Returns the select for the stopwatch button"""
177
155
        return self.wait_select_single("StopwatchFace",
142
        return self.wait_select_single(
178
156
                                  objectName="stopwatchFace")
143
            "StopwatchFace", objectName="stopwatchFace")
179
157
144
180
158
    def get_lap_button(self):
145
    def get_lap_button(self):
181
159
        """Returns the select for the lap button"""
146
        """Returns the select for the lap button"""
182
@@ -350,5 +337,165 @@
183
350
        self.pointing_device.click_object(alarm)
337
        self.pointing_device.click_object(alarm)
184
351
338
185
352
339
186
340
class Page(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
187
341
    """Autopilot helper for Pages."""
188
342
189
343
    def drag_page_up(self):
190
344
        """Drag the given page up."""
191
345
        self._drag_page(direction='up')
192
346
193
347
    def drag_page_down(self):
194
348
        """Drag the given page down."""
195
349
        self._drag_page(direction='down')
196
350
197
351
    def _drag_page(self, direction):
198
352
        """Function to drag the page up/down."""
199
353
        self._wait_to_stop_moving()
200
354
201
355
        x, y, w, h = self.globalRect
202
356
        start_x = stop_x = x + (w / 2)
203
357
        start_y = y + (h / 2)
204
358
205
359
        if direction == "down":
206
360
            stop_y = start_y + h / 3
207
361
            self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
208
362
        else:
209
363
            stop_y = start_y - h / 3
210
364
            self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
211
365
212
366
        self._wait_to_stop_moving()
213
367
214
368
    def _wait_to_stop_moving(self):
215
369
        self.select_single(
216
370
            'QQuickFlickable',
217
371
            objectName='animationContainer').moving.wait_for(False)
218
372
219
373
220
374
class TimerPage(Page):
221
375
    """Autopilot helper for the Timer page."""
222
376
223
377
    def __init__(self, *args):
224
378
        super(Page, self).__init__(*args)
225
379
        # XXX we need a better way to keep reference to the main view.
226
380
        # --elopio - 2014-01-31
227
381
        self.main_view = self.get_root_instance().select_single(MainView)
228
382
229
383
    def get_num_of_presets(self):
230
384
        """Return the number of presets in the timer page."""
231
385
        return int(self.wait_select_single('QQuickListView').count)
232
386
233
387
    @autopilot_logging.log_action(logger.info)
234
388
    def add_timer(self, name, set_time=False):
235
389
        self._click_add_timer_button()
236
390
        self._wait_to_stop_moving()
237
391
        if not self.main_view.wideAspect:
238
392
            self.drag_page_up()
239
393
        self._set_timer_name(name)
240
394
        if not self.main_view.wideAspect:
241
395
            self.drag_page_down()
242
396
        if set_time:
243
397
            self._set_time()
244
398
        self._click_save()
245
399
246
400
    def _click_add_timer_button(self):
247
401
        toolbar = self.main_view.open_toolbar()
248
402
        toolbar.click_button('addPresetButton')
249
403
250
404
    def _set_timer_name(self, name):
251
405
        name_label = self.wait_select_single(
252
406
            LabelDots, objectName='namePreset')
253
407
        name_label.write(name)
254
408
        if name_label.text != name:
255
409
            raise ClockEmulatorException('Failed to write the timer name.')
256
410
257
411
    def _set_time(self):
258
412
        # Set timer minute
259
413
        logger.debug('Grabbing minute hand')
260
414
261
415
        timeout = 0
262
416
        timer_face = self.select_single('TimerFace')
263
417
        #need to select clock in order to set time
264
418
        while not timer_face.focus and timeout < 10:
265
419
            logger.debug('Timerlabel loop')
266
420
            self._click_timer_label()
267
421
            sleep(1)
268
422
            timeout += 1
269
423
270
424
        # TODO we need a dialer hand emulator, with proper self-tests.
271
425
        # --elopio -2014-01-31
272
426
        minute = self._get_timer_minute_hand()
273
427
        #make sure timer is set
274
428
        x, y, w, h = minute.globalRect
275
429
        tx = x + (w / 2)
276
430
        ty = y + (h / 2.5)
277
431
        timeout = 0
278
432
        reset_button = self._get_timer_reset_button()
279
433
        logger.debug('reset_button %s' % reset_button.visible)
280
434
281
435
        #Try again if we failed at first
282
436
        while not reset_button.visible and timeout < 10:
283
437
            logger.debug('Dragging minute hand')
284
438
            self.pointing_device.drag(
285
439
                tx, ty - (h / 4), tx + (w / 2), ty + (h / 2))
286
440
            sleep(1)
287
441
            timeout += 1
288
442
289
443
    def _get_timer_minute_hand(self):
290
444
        """Return the hour hand of clock in timer tab."""
291
445
        return self.wait_select_single('DialerHand', objectName='minuteHand')
292
446
293
447
    def _click_timer_label(self):
294
448
        timer_label = self._get_label_timer()
295
449
        self.pointing_device.click_object(timer_label)
296
450
297
451
    def _get_label_timer(self):
298
452
        """Return the label with the timer countdown."""
299
453
        return self.select_single('Label', objectName='label')
300
454
301
455
    def _get_timer_reset_button(self):
302
456
        """Return the select for the reset button."""
303
457
        return self.select_single('ImageButton', objectName='resetButtonTimer')
304
458
305
459
    def _click_save(self):
306
460
        toolbar = self.main_view.open_toolbar()
307
461
        toolbar.click_button('savePresetButton')
308
462
309
463
    def get_presets(self):
310
464
        """Return a list with the information of the presets.
311
465
312
466
        Each item of the returned list is a tuple of (name, time).
313
467
314
468
        """
315
469
        presets = []
316
470
        for index in range(self.get_num_of_presets()):
317
471
            text = self.select_single(
318
472
                'Label', objectName='presetTextLabel{}'.format(index)).text
319
473
            time = self.select_single(
320
474
                'Label', objectName='presetTimerLabel{}'.format(index)).text
321
475
            presets.append((text, time))
322
476
        return presets
323
477
324
478
    @autopilot_logging.log_action(logger.info)
325
479
    def run_preset_timer(self, index):
326
480
        self._select_preset(index)
327
481
        self._click_timer_label()
328
482
329
483
    def _select_preset(self, index):
330
484
        presets_list = self.select_single(
331
485
            toolkit_emulators.QQuickListView, objectName='listTimerPreset')
332
486
        presets_list.click_element('preset{}'.format(index))
333
487
334
488
    def get_current_time(self):
335
489
        """Return the time of the currently selected timer."""
336
490
        self._get_label_timer().text
337
491
338
492
    @autopilot_logging.log_action(logger.info)
339
493
    def delete_preset_timer(self, index):
340
494
        preset = self.select_single(
341
495
            toolkit_emulators.Standard, objectName='preset{}'.format(index))
342
496
        preset.swipe_to_delete()
343
497
        preset.confirm_removal()
344
498
345
499
346
353
class LabelDots(toolkit_emulators.TextField):
500
class LabelDots(toolkit_emulators.TextField):
347
354
    """Autopilot helper for the LabelDots component."""
501
    """Autopilot helper for the LabelDots component."""
348
355
502
349
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_clock.py'
350
--- tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2014-02-19 12:03:16 +0000
351
+++ tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2014-02-24 16:24:49 +0000
352
@@ -95,6 +95,7 @@
353
95
        # Get the saved world city and swipe to delete
95
        # Get the saved world city and swipe to delete
354
96
        old_saved_city_count = self.main_view.get_saved_cities_list().count
96
        old_saved_city_count = self.main_view.get_saved_cities_list().count
355
97
        saved_city = self.main_view.grab_first_saved_city()
97
        saved_city = self.main_view.grab_first_saved_city()
356
98
        self.main_view._wait_to_stop_moving(self.main_view.get_clock_page())
357
98
        saved_city.swipe_to_delete()
99
        saved_city.swipe_to_delete()
358
99
        saved_city.confirm_removal()
100
        saved_city.confirm_removal()
359
100
101
360
101
102
361
=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_timer.py'
362
--- tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2014-02-19 18:04:36 +0000
363
+++ tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2014-02-24 16:24:49 +0000
364
@@ -1,6 +1,6 @@
365
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 -*-
366
2
#
2
#
368
3
# Copyright (C) 2013 Canonical Ltd
3
# Copyright (C) 2013, 2014 Canonical Ltd
369
4
#
4
#
370
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
371
6
# it under the terms of the GNU General Public License version 3 as
6
# it under the terms of the GNU General Public License version 3 as
372
@@ -21,9 +21,8 @@
373
21
21
374
22
from __future__ import absolute_import
22
from __future__ import absolute_import
375
23
23
377
24
from testtools.matchers import Equals, NotEquals, Is, Not
24
from testtools.matchers import Equals, NotEquals
378
25
from autopilot.matchers import Eventually
25
from autopilot.matchers import Eventually
379
26
from time import sleep
380
27
26
381
28
from ubuntu_clock_app.tests import ClockAppTestCase
27
from ubuntu_clock_app.tests import ClockAppTestCase
382
29
import logging
28
import logging
383
@@ -34,120 +33,58 @@
384
34
class TestTimer(ClockAppTestCase):
33
class TestTimer(ClockAppTestCase):
385
35
    """Tests the timer page features"""
34
    """Tests the timer page features"""
386
36
35
387
37
    """ This is needed to wait for the application to start.
388
38
        In the testfarm, the application may take some time to show up."""
389
39
    def setUp(self):
36
    def setUp(self):
390
37
        """This is needed to wait for the application to start.
391
38
392
39
        In the testfarm, the application may take some time to show up.
393
40
394
41
        """
395
40
        super(TestTimer, self).setUp()
42
        super(TestTimer, self).setUp()
396
41
        self.assertThat(
43
        self.assertThat(
397
42
            self.main_view.visible, Eventually(Equals(True)))
44
            self.main_view.visible, Eventually(Equals(True)))
398
43
45
463
44
        # Move to Timer tab
46
        self.page = self.main_view.open_timer()
464
45
        self.main_view.switch_to_tab("TimerTab")
47
465
46
48
    def test_add_timer_must_add_timer_to_presets_lists(self):
466
47
    def delete_first_preset(self):
49
        """Test to check if button to add a preset working."""
467
48
        if not(self.main_view.wideAspect):
50
        num_of_presets_old = self.page.get_num_of_presets()
468
49
            self.main_view.drag_page_up("TimerPage")
51
        self.page.add_timer('test', set_time=True)
405
50
406
51
        # Delete the preset
407
52
        first_preset = self.main_view.get_first_preset_list_item()
408
53
        first_preset.swipe_to_delete()
409
54
        first_preset.confirm_removal()
410
55
411
56
    def add_preset(self, setTime=0):
412
57
        # Show the toolbar
413
58
        self.main_view.open_toolbar()
414
59
415
60
        # Click the add preset button
416
61
        self.main_view.get_toolbar().click_button('addPresetButton')
417
62
418
63
        # Set Timer label as "test"
419
64
        if not(self.main_view.wideAspect):
420
65
            self.main_view.drag_page_up("TimerPage")
421
66
        label = self.main_view.get_timer_name_preset()
422
67
        label.write("AutopilotTimer")
423
68
        self.assertThat(label.text, Eventually(Equals("AutopilotTimer")))
424
69
        if not(self.main_view.wideAspect):
425
70
            self.main_view.drag_page_down("TimerPage")
426
71
427
72
        if setTime:
428
73
            # Set timer minute
429
74
            logger.debug("Grabbing minute hand")
430
75
            minute = self.main_view.get_timer_minute_hand()
431
76
            timeout = 0
432
77
433
78
            #need to select clock in order to set time
434
79
            while label.focus and timeout < 10:
435
80
                logger.debug("Timerlabel loop")
436
81
                TimerLabel = self.main_view.get_label_timer()
437
82
                self.pointing_device.click_object(TimerLabel)
438
83
                sleep(1)
439
84
                timeout += 1
440
85
441
86
            #make sure timer is set
442
87
            x, y, w, h = minute.globalRect
443
88
            tx = x + (w / 2)
444
89
            ty = y + (h / 2.5)
445
90
            timeout = 0
446
91
            reset_button = self.main_view.get_timer_reset_button()
447
92
            logger.debug("reset_button %s" % reset_button.visible)
448
93
449
94
            #Try again if we failed at first
450
95
            while not reset_button.visible and timeout < 10:
451
96
                logger.debug("Dragging minute hand")
452
97
                self.pointing_device.drag(tx, ty - (h / 4), tx + (w / 2), ty + (h / 2))
453
98
                sleep(1)
454
99
                timeout += 1
455
100
456
101
        self.main_view.open_toolbar()
457
102
        self.main_view.get_toolbar().click_button('savePresetButton')
458
103
459
104
    def test_add_preset(self):
460
105
        """Test to check if button to add a preset working"""
461
106
        num_of_presets_old = self.main_view.get_num_of_presets()
462
107
        self.add_preset(1)
469
108
52
470
109
        # check that the timer preset has been added.
53
        # check that the timer preset has been added.
471
110
        self.assertThat(
54
        self.assertThat(
473
111
            self.main_view.get_num_of_presets,
55
            self.page.get_num_of_presets,
474
112
            Eventually(Equals(num_of_presets_old + 1)))
56
            Eventually(Equals(num_of_presets_old + 1)))
475
113
57
510
114
    def test_run_preset(self):
58
        last_preset_name, _ = self.page.get_presets()[0]
511
115
        """Tests if a preset can runs"""
59
        self.assertEqual('test', last_preset_name)
512
116
60
513
117
        # Create a new preset
61
    def test_run_preset_must_update_timer(self):
514
118
        self.add_preset()
62
        """Tests if a preset can run."""
515
119
63
        # FIXME: Instead of always running the first preset, run the preset
516
120
        if not(self.main_view.wideAspect):
64
        # which was created. To do this in a nice way, we should use the
517
121
            self.main_view.drag_page_up("TimerPage")
65
        # QQuickListView but it has a bug that makes it fail in this case:
518
122
66
        # http://pad.lv/1275060 --elopio - 2014-01-31
519
123
        # Click to select the preset
67
        timer_index = 0
520
124
        # FIXME: Instead of always running the first preset, run the preset which was created
68
        _, initial_time = self.page.get_presets()[timer_index]
521
125
        first_preset = self.main_view.get_first_preset_list_item()
69
        if not self.main_view.wideAspect:
522
126
        self.pointing_device.click_object(first_preset)
70
            self.page.drag_page_up()
523
127
71
        self.page.run_preset_timer(index=timer_index)
524
128
        if not(self.main_view.wideAspect):
72
525
129
            self.main_view.drag_page_down("TimerPage")
73
        self.assertThat(
526
130
74
            self.page.get_current_time, Eventually(NotEquals(initial_time)))
527
131
        # Click to start the preset
75
528
132
        label = self.main_view.get_label_timer()
76
    def test_delete_preset_must_remove_from_presets_list(self):
529
133
        self.pointing_device.click_object(label)
77
        """Test if the swipe of a preset deletes it."""
530
134
78
        # FIXME: Instead of always running the first preset, run the preset
531
135
        # Check if timer is started
79
        # which was created. To do this in a nice way, we should use the
532
136
        self.assertThat(label.text, Eventually(NotEquals("03:00")))
80
        # QQuickListView but it has a bug that makes it fail in this case:
533
137
81
        # http://pad.lv/1275060 --elopio - 2014-01-31
534
138
    def test_delete_preset(self):
82
        num_of_presets_old = self.page.get_num_of_presets()
535
139
        """Test if the swipe of a preset deletes it"""
83
        if not self.main_view.wideAspect:
536
140
84
            self.page.drag_page_up()
537
141
        # Create a new preset
85
        self.page.delete_preset_timer(index=0)
504
142
        self.add_preset()
505
143
506
144
        num_of_presets_old = self.main_view.get_num_of_presets()
507
145
508
146
        #delete preset
509
147
        self.delete_first_preset()
538
148
86
539
149
        # Check that the timer preset has been deleted
87
        # Check that the timer preset has been deleted
540
150
        self.assertThat(
88
        self.assertThat(
542
151
            self.main_view.get_num_of_presets,
89
            self.page.get_num_of_presets,
543
152
            Eventually(Equals(num_of_presets_old - 1)))
90
            Eventually(Equals(num_of_presets_old - 1)))
544
153
545
154
91
546
=== modified file 'timer/PresetList.qml'
547
--- timer/PresetList.qml	2014-02-19 14:17:38 +0000
548
+++ timer/PresetList.qml	2014-02-24 16:24:49 +0000
549
@@ -54,7 +54,7 @@
550
54
54
551
55
        return Utils.zeroleft(minutes, 1) + ":" + Utils.zeroleft(seconds, 2);
55
        return Utils.zeroleft(minutes, 1) + ":" + Utils.zeroleft(seconds, 2);
552
56
    }
56
    }
554
57
    
57
555
58
    ListItem.ThinDivider {
58
    ListItem.ThinDivider {
556
59
        id: divider
59
        id: divider
557
60
    }
60
    }
558
@@ -68,15 +68,16 @@
559
68
            fontSize: "medium"
68
            fontSize: "medium"
560
69
        }
69
        }
561
70
    }
70
    }
563
71
    
71
564
72
    ListView {
72
    ListView {
565
73
        id: listTimerPreset
73
        id: listTimerPreset
567
74
        
74
        objectName: "listTimerPreset"
568
75
569
75
        clip: true
76
        clip: true
570
76
        currentIndex: -1
77
        currentIndex: -1
571
77
        height: maxItemsVisible * units.gu(6)
78
        height: maxItemsVisible * units.gu(6)
572
78
        anchors { left: parent.left; right: parent.right }
79
        anchors { left: parent.left; right: parent.right }
574
79
        
80
575
80
        delegate: ListItem.Standard {
81
        delegate: ListItem.Standard {
576
81
            objectName: "preset" + index
82
            objectName: "preset" + index
577
82
            Label {
83
            Label {
578
@@ -88,20 +89,20 @@
579
88
                color: Theme.palette.normal.baseText
89
                color: Theme.palette.normal.baseText
580
89
                anchors { verticalCenter: parent.verticalCenter; left: parent.left; right: presetTimeLabel.left; rightMargin: units.gu(2); leftMargin: units.gu(3) }
90
                anchors { verticalCenter: parent.verticalCenter; left: parent.left; right: presetTimeLabel.left; rightMargin: units.gu(2); leftMargin: units.gu(3) }
581
90
            }
91
            }
583
91
            
92
584
92
            Label {
93
            Label {
585
93
                id: presetTimeLabel
94
                id: presetTimeLabel
587
94
                objectName: "presetTimerLabel"
95
                objectName: "presetTimerLabel" + index
588
95
                fontSize: "large"
96
                fontSize: "large"
589
96
                text: getstringTimer(model.contents.duration);
97
                text: getstringTimer(model.contents.duration);
590
97
                color: Theme.palette.normal.baseText
98
                color: Theme.palette.normal.baseText
591
98
                anchors { verticalCenter: parent.verticalCenter; right: parent.right; rightMargin: units.gu(2) }
99
                anchors { verticalCenter: parent.verticalCenter; right: parent.right; rightMargin: units.gu(2) }
592
99
            }
100
            }
594
100
            
101
595
101
            selected: listTimerPreset.currentIndex == index
102
            selected: listTimerPreset.currentIndex == index
596
102
            removable: true
103
            removable: true
597
103
            confirmRemoval: true
104
            confirmRemoval: true
599
104
            
105
600
105
            onItemRemoved: {
106
            onItemRemoved: {
601
106
                // NOTE: This causes the document to be deleted twice resulting in an error.
107
                // NOTE: This causes the document to be deleted twice resulting in an error.
602
107
                // The bug has been reported at https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1276118
108
                // The bug has been reported at https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1276118
Status:	Merged
Approved by:	Nekhelesh Ramananthan on 2014-02-24
Approved revision:	337
Merged at revision:	350
Proposed branch:	lp:~elopio/ubuntu-clock-app/refactor_timer_tests
Merge into:	lp:ubuntu-clock-app/saucy
Diff against target:	602 lines (+249/-160) 7 files modified alarm/AddAlarmPage.qml (+1/-0) alarm/AlarmPage.qml (+1/-0) stopwatch/StopwatchPage.qml (+1/-0) tests/autopilot/ubuntu_clock_app/emulators.py (+193/-46) tests/autopilot/ubuntu_clock_app/tests/test_clock.py (+1/-0) tests/autopilot/ubuntu_clock_app/tests/test_timer.py (+43/-106) timer/PresetList.qml (+9/-8)
To merge this branch:	bzr merge lp:~elopio/ubuntu-clock-app/refactor_timer_tests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration	2014-02-19	Approve on 2014-02-24
Nekhelesh Ramananthan		2014-02-19	Approve on 2014-02-24
Nicholas Skaggs (community)		2014-02-19	Approve on 2014-02-19
Review via email: mp+207307@code.launchpad.net