Merge lp:~elopio/ubuntu-clock-app/refactor_timer_tests into lp:ubuntu-clock-app/saucy

[Leo Arias]

Refactored the timer autopilot tests.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:318
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/175/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/898
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/175
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/175
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/93

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/175/rebuild

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

I fixed pep8 and pyflakes, because I'm a freak and can't live without that.
Then, I encapsulated the actions of the timer page in the TimerPage class, making public only the methods that represent action users. All internal things, like _get_X_element, or _click_something are private details of the emulators.

With this we make sure that the tests are high level user stories. They are short, and use the user language.

Lets say that in the future, designers decide that it's best if we add a button to add timers instead of doing that from the toolbar. In that case, we don't have to modify the test case, we only have to modify the _click_add_timer_button method.

On the prerequisite branch, nik added a check that the name of the timer was properly written. I moved it to
260 + if name_label.text != name:
but, the right thing to do is to have the textfield emulator making the check for us. I reported that as bug https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1275078

[Nicholas Skaggs (nskaggs)]

So most of this is actually pep8 and pyflakes. Don't worry Leo, it bothers me as well (even though I don't like pep8 in some cases).

Most of the restructuring is straightforward; really nothing crazy. It gets my +1. I will say, it's difficult to read the diff because of the pep8 and pyflakes changes, but I understand the desire to lump them.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:318
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/198/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/963
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/198
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/198
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/116

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/198/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:318
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/237/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1274/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/237/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/237/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/155/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/237/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:318
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/244/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1327/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/244/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/244/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/162/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/244/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:320
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/249/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1332
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/249
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/249
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/167

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/249/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:320
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/263/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1402
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/263
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/263
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/181

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/263/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:321
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/267/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1417
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/267
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/267
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/185

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/267/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:322
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/268/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1418
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/268
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/268
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/186

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/268/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

I had started on this at one point; glad you've seen it through :-)

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:323
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/273/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1425
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/273
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/273
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/191

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/273/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:323
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/276/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1428
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/276
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/276
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/194

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/276/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/136/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1430/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/136/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/136/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-autolanding/72/console

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

I think you will need to another massive trunk merge since we just landed the convergence layout design into trunk few minutes ago. This means that the test will need to adapt if it is running the phone or tablet interface. I have already accounted for this in trunk. You will need to merge trunk to get those important AP fixes.

review: Needs Fixing

[lp:~elopio/ubuntu-clock-app/refactor_timer_tests]

324. By Leo Arias on 2014-02-19

Merged with trunk.

325. By Leo Arias on 2014-02-19

Revert the extra changes.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:325
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/277/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1431
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/277
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/277
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/195

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/277/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

547 - // TODO: Fix autopilot test first before enabling this change in another MP
548 - //PropertyChanges { target: namePreset; text: "Timer #" + (listPreset.listCount + 1) }
549 + PropertyChanges { target: namePreset; text: "Timer #" + (listPreset.listCount + 1) }

This fix is not present in the trunk. I believe this is an old remaining part from the add-timer-placeholder-text MP. Please revert this.

189 + self.drag_page_up()

I see this code in several places. It won't work for the following reasons,
a) You need a condition to check if dragging the page action is necessary in the first place since in the tablet interface there is dragging page up/down actions. This is why I added the if condition, if not(self.wideAspect) wherever I made the drag_page function calls. I don't see it in this MP.

[Nekhelesh Ramananthan (nik90)]

In my comment above I meant that there are *no* dragging the page up/down actions.

[lp:~elopio/ubuntu-clock-app/refactor_timer_tests]

326. By Leo Arias on 2014-02-20

Reverted change from other branch.

327. By Leo Arias on 2014-02-20

Drag only if we are not on maguro.

328. By Leo Arias on 2014-02-20

Fixed.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:327
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/278/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1443
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/278
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/278
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/196

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/278/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:328
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/279/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1444
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/279
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/279
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/197

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/279/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-clock-app/refactor_timer_tests]

329. By Leo Arias on 2014-02-20

Use the object name.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:328
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/280/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1445
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/280
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/280
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/198

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/280/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:329
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/281/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1446
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/281
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/281
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/199

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/281/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-clock-app/refactor_timer_tests]

330. By Leo Arias on 2014-02-20

Added another wait.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:330
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/282/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1447
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/282
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/282
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/200

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/282/rebuild

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:330
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/283/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1448
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/283
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/283
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/201

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/283/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-clock-app/refactor_timer_tests]

331. By Leo Arias on 2014-02-20

Added another wait.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:331
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/284/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1449
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/284
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/284
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/202

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/284/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-clock-app/refactor_timer_tests]

332. By Leo Arias on 2014-02-20

fix

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:332
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/285/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1450
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/285
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/285
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/203

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/285/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-clock-app/refactor_timer_tests]

333. By Leo Arias on 2014-02-20

Added the object name to the flickables.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:333
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/286/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1451
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/286
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/286
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/204

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/286/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-clock-app/refactor_timer_tests]

334. By Leo Arias on 2014-02-20

Added the objectName.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:334
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/287/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1452
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/287
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/287
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/205

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/287/rebuild

review: Approve (continuous-integration)

[lp:~elopio/ubuntu-clock-app/refactor_timer_tests]

335. By Leo Arias on 2014-02-21

Removed the unused imports.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:335
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/288/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1453
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/288
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/288
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/206

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/288/rebuild

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Wow! Well organised and look awesome. It just needs two small fixes.

521 + self.page.drag_page_up()
534 + self.page.drag_page_up()

In these two lines in test_timer.py you can the function drag_page_up() without checking if the interface is phone or tablet. As a result when I tested on my desktop using tablet interface, AP tried dragging the page up, however there was nothing to drag up. The test did still pass, but it would be nice to check the interface before doing this step.

A if loop like below should fix it.

if not self.main_view.wideAspect:
    + self.drag_page_up()

Otherwise this commit is ready for merge.

review: Needs Fixing

[lp:~elopio/ubuntu-clock-app/refactor_timer_tests]

336. By Leo Arias on 2014-02-24

Drag only when we are nto on wide mode, as suggested by nik.

337. By Leo Arias on 2014-02-24

Fixed comment.

[Nekhelesh Ramananthan (nik90)]

lgtm!

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'alarm/AddAlarmPage.qml'
--- alarm/AddAlarmPage.qml	2014-02-19 17:43:14 +0000
+++ alarm/AddAlarmPage.qml	2014-02-24 16:24:49 +0000
@@ -324,6 +324,7 @@
 
         Flickable {
             id: addAlarmPageAnimationContainer
+            objectName: "animationContainer"
 
             anchors.fill: parent
             contentWidth: addAlarmPage.width

=== modified file 'alarm/AlarmPage.qml'
--- alarm/AlarmPage.qml	2014-02-19 17:43:14 +0000
+++ alarm/AlarmPage.qml	2014-02-24 16:24:49 +0000
@@ -199,6 +199,7 @@
 
         Flickable {
             id: alarmAnimationContainer
+            objectName: "animationContainer"
 
             Component.onCompleted: alarmPageFlickable = alarmAnimationContainer
 

=== modified file 'stopwatch/StopwatchPage.qml'
--- stopwatch/StopwatchPage.qml	2014-02-19 17:43:14 +0000
+++ stopwatch/StopwatchPage.qml	2014-02-24 16:24:49 +0000
@@ -197,6 +197,7 @@
 
         Flickable {
             id: stopwatchAnimationContainer
+            objectName: "animationContainer"
 
             Component.onCompleted: stopwatchPageFlickable = stopwatchAnimationContainer
 

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	2014-02-19 18:04:36 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-02-24 16:24:49 +0000
@@ -21,8 +21,11 @@
 from time import sleep
 
 from autopilot import logging as autopilot_logging
+
+
 from ubuntuuitoolkit import emulators as toolkit_emulators
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -32,6 +35,16 @@
 
 class MainView(toolkit_emulators.MainView):
 
+    @autopilot_logging.log_action(logger.info)
+    def open_timer(self):
+        """Open the Timer tab.
+
+        :return: the Timer page.
+
+        """
+        self.switch_to_tab('TimerTab')
+        return self.wait_select_single(TimerPage)
+
     # Common Emulator Functions
     def _drag_page(self, page, direction):
         """Function to drag the page up/down"""
@@ -65,7 +78,9 @@
         self.pointing_device.release()
 
     def _wait_to_stop_moving(self, page):
-        page.select_single("QQuickFlickable").moving.wait_for(False)
+        page.select_single(
+            'QQuickFlickable',
+            objectName='animationContainer').moving.wait_for(False)
 
     # CLOCK Page Emulator Functions
     def get_clock_page(self):
@@ -74,7 +89,8 @@
 
     def get_time_label(self):
         """Return the label with the timer countdown"""
-        return self.select_single("ClockPage").wait_select_single("Label", objectName="label")
+        return self.select_single("ClockPage").wait_select_single(
+            "Label", objectName="label")
 
     # WORLD CLOCK Page Emulator Functions
     def get_world_cities_page(self):
@@ -83,10 +99,11 @@
 
     def get_search_box(self):
         """Returns the search box used to search for world cities online."""
-        return self.wait_select_single('SearchBox', objectName="worldSearchBox")
+        return self.wait_select_single(
+            'SearchBox', objectName="worldSearchBox")
 
     def get_world_cities_list(self):
-        """Return the component containing the list of available world cities."""
+        """Return the component of the list of available world cities."""
         return self.wait_select_single(objectName="worldList")
 
     def get_city_name(self, city):
@@ -94,11 +111,15 @@
         return city.wait_select_single('Label', objectName='city_name').text
 
     def get_saved_cities_list(self):
-        """Return the component containing list of user saved world city locations."""
+        """Return the component of the user saved world city locations."""
         return self.wait_select_single(objectName="listWorldClocks")
 
     def grab_first_listed_city(self):
-        """Return the first city from the available world cities list (both local and online)"""
+        """Return the first city from the available world cities.
+
+        It returns both local and online.
+
+        """
         return self.wait_select_single("Base", objectName="worldcity0")
 
     def select_city(self, city):
@@ -107,53 +128,19 @@
 
     def grab_first_saved_city(self):
         """Return the first city from the user saved world cities list"""
-        return self.wait_select_single("Standard", objectName="savedworldcity0")
-
-    # TIMER Page Emulator Functions
-    def get_timer_reset_button(self):
-        """Returns the select for the reset button"""
-        return self.select_single("ImageButton", objectName="resetButtonTimer")
-
-    def get_timer_name_preset(self):
-        """Returns the TextField where insert the name of the preset"""
-        return self.wait_select_single(LabelDots, objectName="namePreset")
-
-    def get_timer_minute_hand(self):
-        """Returns the hour hand of clock in timer tab"""
-        return self.select_single("TimerPage").wait_select_single("DialerHand", objectName="minuteHand")
-
-    def get_preset_label_text(self):
-        """Returns the label with the preset text"""
-        preset = self.select_many("Label", objectName="presetTextLabel")
-        return preset[0]  # last preset, the one created by autopilot
-
-    def get_preset_label_timer(self):
-        """Returns the label with the preset timer"""
-        preset = self.select_many("Label", objectName="presetTimerLabel")
-        return preset[0]  # last preset, the one created by autopilot
-
-    def get_label_timer(self):
-        """Return the label with the timer countdown"""
-        return self.select_single("TimerPage").wait_select_single("Label", objectName="label")
-
-    def get_first_preset_list_item(self):
-        """Returns the first preset list item in the timer page."""
-        return self.wait_select_single("Standard", objectName="preset0")
-
-    def get_num_of_presets(self):
-        """Returns the number of presets in the timer page."""
-        timer_page = self.select_single("TimerPage")
-        return int(timer_page.wait_select_single("QQuickListView").count)
+        return self.wait_select_single(
+            "Standard", objectName="savedworldcity0")
 
     # STOPWATCH Page Emulator Functions
     def get_stopwatch_label(self):
         """Returns the select for the stopwatch label"""
-        return self.select_single("StopwatchPage").wait_select_single("Label", objectName="label")
+        return self.select_single(
+            "StopwatchPage").wait_select_single("Label", objectName="label")
 
     def get_stopwatch_button(self):
         """Returns the select for the stopwatch button"""
-        return self.wait_select_single("StopwatchFace",
-                                  objectName="stopwatchFace")
+        return self.wait_select_single(
+            "StopwatchFace", objectName="stopwatchFace")
 
     def get_lap_button(self):
         """Returns the select for the lap button"""
@@ -350,5 +337,165 @@
         self.pointing_device.click_object(alarm)
 
 
+class Page(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+    """Autopilot helper for Pages."""
+
+    def drag_page_up(self):
+        """Drag the given page up."""
+        self._drag_page(direction='up')
+
+    def drag_page_down(self):
+        """Drag the given page down."""
+        self._drag_page(direction='down')
+
+    def _drag_page(self, direction):
+        """Function to drag the page up/down."""
+        self._wait_to_stop_moving()
+
+        x, y, w, h = self.globalRect
+        start_x = stop_x = x + (w / 2)
+        start_y = y + (h / 2)
+
+        if direction == "down":
+            stop_y = start_y + h / 3
+            self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+        else:
+            stop_y = start_y - h / 3
+            self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+
+        self._wait_to_stop_moving()
+
+    def _wait_to_stop_moving(self):
+        self.select_single(
+            'QQuickFlickable',
+            objectName='animationContainer').moving.wait_for(False)
+
+
+class TimerPage(Page):
+    """Autopilot helper for the Timer page."""
+
+    def __init__(self, *args):
+        super(Page, self).__init__(*args)
+        # XXX we need a better way to keep reference to the main view.
+        # --elopio - 2014-01-31
+        self.main_view = self.get_root_instance().select_single(MainView)
+
+    def get_num_of_presets(self):
+        """Return the number of presets in the timer page."""
+        return int(self.wait_select_single('QQuickListView').count)
+
+    @autopilot_logging.log_action(logger.info)
+    def add_timer(self, name, set_time=False):
+        self._click_add_timer_button()
+        self._wait_to_stop_moving()
+        if not self.main_view.wideAspect:
+            self.drag_page_up()
+        self._set_timer_name(name)
+        if not self.main_view.wideAspect:
+            self.drag_page_down()
+        if set_time:
+            self._set_time()
+        self._click_save()
+
+    def _click_add_timer_button(self):
+        toolbar = self.main_view.open_toolbar()
+        toolbar.click_button('addPresetButton')
+
+    def _set_timer_name(self, name):
+        name_label = self.wait_select_single(
+            LabelDots, objectName='namePreset')
+        name_label.write(name)
+        if name_label.text != name:
+            raise ClockEmulatorException('Failed to write the timer name.')
+
+    def _set_time(self):
+        # Set timer minute
+        logger.debug('Grabbing minute hand')
+
+        timeout = 0
+        timer_face = self.select_single('TimerFace')
+        #need to select clock in order to set time
+        while not timer_face.focus and timeout < 10:
+            logger.debug('Timerlabel loop')
+            self._click_timer_label()
+            sleep(1)
+            timeout += 1
+
+        # TODO we need a dialer hand emulator, with proper self-tests.
+        # --elopio -2014-01-31
+        minute = self._get_timer_minute_hand()
+        #make sure timer is set
+        x, y, w, h = minute.globalRect
+        tx = x + (w / 2)
+        ty = y + (h / 2.5)
+        timeout = 0
+        reset_button = self._get_timer_reset_button()
+        logger.debug('reset_button %s' % reset_button.visible)
+
+        #Try again if we failed at first
+        while not reset_button.visible and timeout < 10:
+            logger.debug('Dragging minute hand')
+            self.pointing_device.drag(
+                tx, ty - (h / 4), tx + (w / 2), ty + (h / 2))
+            sleep(1)
+            timeout += 1
+
+    def _get_timer_minute_hand(self):
+        """Return the hour hand of clock in timer tab."""
+        return self.wait_select_single('DialerHand', objectName='minuteHand')
+
+    def _click_timer_label(self):
+        timer_label = self._get_label_timer()
+        self.pointing_device.click_object(timer_label)
+
+    def _get_label_timer(self):
+        """Return the label with the timer countdown."""
+        return self.select_single('Label', objectName='label')
+
+    def _get_timer_reset_button(self):
+        """Return the select for the reset button."""
+        return self.select_single('ImageButton', objectName='resetButtonTimer')
+
+    def _click_save(self):
+        toolbar = self.main_view.open_toolbar()
+        toolbar.click_button('savePresetButton')
+
+    def get_presets(self):
+        """Return a list with the information of the presets.
+
+        Each item of the returned list is a tuple of (name, time).
+
+        """
+        presets = []
+        for index in range(self.get_num_of_presets()):
+            text = self.select_single(
+                'Label', objectName='presetTextLabel{}'.format(index)).text
+            time = self.select_single(
+                'Label', objectName='presetTimerLabel{}'.format(index)).text
+            presets.append((text, time))
+        return presets
+
+    @autopilot_logging.log_action(logger.info)
+    def run_preset_timer(self, index):
+        self._select_preset(index)
+        self._click_timer_label()
+
+    def _select_preset(self, index):
+        presets_list = self.select_single(
+            toolkit_emulators.QQuickListView, objectName='listTimerPreset')
+        presets_list.click_element('preset{}'.format(index))
+
+    def get_current_time(self):
+        """Return the time of the currently selected timer."""
+        self._get_label_timer().text
+
+    @autopilot_logging.log_action(logger.info)
+    def delete_preset_timer(self, index):
+        preset = self.select_single(
+            toolkit_emulators.Standard, objectName='preset{}'.format(index))
+        preset.swipe_to_delete()
+        preset.confirm_removal()
+
+
 class LabelDots(toolkit_emulators.TextField):
     """Autopilot helper for the LabelDots component."""

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_clock.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2014-02-19 12:03:16 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2014-02-24 16:24:49 +0000
@@ -95,6 +95,7 @@
         # Get the saved world city and swipe to delete
         old_saved_city_count = self.main_view.get_saved_cities_list().count
         saved_city = self.main_view.grab_first_saved_city()
+        self.main_view._wait_to_stop_moving(self.main_view.get_clock_page())
         saved_city.swipe_to_delete()
         saved_city.confirm_removal()
 

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_timer.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2014-02-19 18:04:36 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2014-02-24 16:24:49 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013 Canonical Ltd
+# Copyright (C) 2013, 2014 Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -21,9 +21,8 @@
 
 from __future__ import absolute_import
 
-from testtools.matchers import Equals, NotEquals, Is, Not
+from testtools.matchers import Equals, NotEquals
 from autopilot.matchers import Eventually
-from time import sleep
 
 from ubuntu_clock_app.tests import ClockAppTestCase
 import logging
@@ -34,120 +33,58 @@
 class TestTimer(ClockAppTestCase):
     """Tests the timer page features"""
 
-    """ This is needed to wait for the application to start.
-        In the testfarm, the application may take some time to show up."""
     def setUp(self):
+        """This is needed to wait for the application to start.
+
+        In the testfarm, the application may take some time to show up.
+
+        """
         super(TestTimer, self).setUp()
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
 
-        # Move to Timer tab
-        self.main_view.switch_to_tab("TimerTab")
-
-    def delete_first_preset(self):
-        if not(self.main_view.wideAspect):
-            self.main_view.drag_page_up("TimerPage")
-
-        # Delete the preset
-        first_preset = self.main_view.get_first_preset_list_item()
-        first_preset.swipe_to_delete()
-        first_preset.confirm_removal()
-
-    def add_preset(self, setTime=0):
-        # Show the toolbar
-        self.main_view.open_toolbar()
-
-        # Click the add preset button
-        self.main_view.get_toolbar().click_button('addPresetButton')
-
-        # Set Timer label as "test"
-        if not(self.main_view.wideAspect):
-            self.main_view.drag_page_up("TimerPage")
-        label = self.main_view.get_timer_name_preset()
-        label.write("AutopilotTimer")
-        self.assertThat(label.text, Eventually(Equals("AutopilotTimer")))
-        if not(self.main_view.wideAspect):
-            self.main_view.drag_page_down("TimerPage")
-
-        if setTime:
-            # Set timer minute
-            logger.debug("Grabbing minute hand")
-            minute = self.main_view.get_timer_minute_hand()
-            timeout = 0
-
-            #need to select clock in order to set time
-            while label.focus and timeout < 10:
-                logger.debug("Timerlabel loop")
-                TimerLabel = self.main_view.get_label_timer()
-                self.pointing_device.click_object(TimerLabel)
-                sleep(1)
-                timeout += 1
-
-            #make sure timer is set
-            x, y, w, h = minute.globalRect
-            tx = x + (w / 2)
-            ty = y + (h / 2.5)
-            timeout = 0
-            reset_button = self.main_view.get_timer_reset_button()
-            logger.debug("reset_button %s" % reset_button.visible)
-
-            #Try again if we failed at first
-            while not reset_button.visible and timeout < 10:
-                logger.debug("Dragging minute hand")
-                self.pointing_device.drag(tx, ty - (h / 4), tx + (w / 2), ty + (h / 2))
-                sleep(1)
-                timeout += 1
-
-        self.main_view.open_toolbar()
-        self.main_view.get_toolbar().click_button('savePresetButton')
-
-    def test_add_preset(self):
-        """Test to check if button to add a preset working"""
-        num_of_presets_old = self.main_view.get_num_of_presets()
-        self.add_preset(1)
+        self.page = self.main_view.open_timer()
+
+    def test_add_timer_must_add_timer_to_presets_lists(self):
+        """Test to check if button to add a preset working."""
+        num_of_presets_old = self.page.get_num_of_presets()
+        self.page.add_timer('test', set_time=True)
 
         # check that the timer preset has been added.
         self.assertThat(
-            self.main_view.get_num_of_presets,
+            self.page.get_num_of_presets,
             Eventually(Equals(num_of_presets_old + 1)))
 
-    def test_run_preset(self):
-        """Tests if a preset can runs"""
-
-        # Create a new preset
-        self.add_preset()
-
-        if not(self.main_view.wideAspect):
-            self.main_view.drag_page_up("TimerPage")
-
-        # Click to select the preset
-        # FIXME: Instead of always running the first preset, run the preset which was created
-        first_preset = self.main_view.get_first_preset_list_item()
-        self.pointing_device.click_object(first_preset)
-
-        if not(self.main_view.wideAspect):
-            self.main_view.drag_page_down("TimerPage")
-
-        # Click to start the preset
-        label = self.main_view.get_label_timer()
-        self.pointing_device.click_object(label)
-
-        # Check if timer is started
-        self.assertThat(label.text, Eventually(NotEquals("03:00")))
-
-    def test_delete_preset(self):
-        """Test if the swipe of a preset deletes it"""
-
-        # Create a new preset
-        self.add_preset()
-
-        num_of_presets_old = self.main_view.get_num_of_presets()
-
-        #delete preset
-        self.delete_first_preset()
+        last_preset_name, _ = self.page.get_presets()[0]
+        self.assertEqual('test', last_preset_name)
+
+    def test_run_preset_must_update_timer(self):
+        """Tests if a preset can run."""
+        # FIXME: Instead of always running the first preset, run the preset
+        # which was created. To do this in a nice way, we should use the
+        # QQuickListView but it has a bug that makes it fail in this case:
+        # http://pad.lv/1275060 --elopio - 2014-01-31
+        timer_index = 0
+        _, initial_time = self.page.get_presets()[timer_index]
+        if not self.main_view.wideAspect:
+            self.page.drag_page_up()
+        self.page.run_preset_timer(index=timer_index)
+
+        self.assertThat(
+            self.page.get_current_time, Eventually(NotEquals(initial_time)))
+
+    def test_delete_preset_must_remove_from_presets_list(self):
+        """Test if the swipe of a preset deletes it."""
+        # FIXME: Instead of always running the first preset, run the preset
+        # which was created. To do this in a nice way, we should use the
+        # QQuickListView but it has a bug that makes it fail in this case:
+        # http://pad.lv/1275060 --elopio - 2014-01-31
+        num_of_presets_old = self.page.get_num_of_presets()
+        if not self.main_view.wideAspect:
+            self.page.drag_page_up()
+        self.page.delete_preset_timer(index=0)
 
         # Check that the timer preset has been deleted
         self.assertThat(
-            self.main_view.get_num_of_presets,
+            self.page.get_num_of_presets,
             Eventually(Equals(num_of_presets_old - 1)))
-

=== modified file 'timer/PresetList.qml'
--- timer/PresetList.qml	2014-02-19 14:17:38 +0000
+++ timer/PresetList.qml	2014-02-24 16:24:49 +0000
@@ -54,7 +54,7 @@
 
         return Utils.zeroleft(minutes, 1) + ":" + Utils.zeroleft(seconds, 2);
     }
-    
+
     ListItem.ThinDivider {
         id: divider
     }
@@ -68,15 +68,16 @@
             fontSize: "medium"
         }
     }
-    
+
     ListView {
         id: listTimerPreset
-        
+        objectName: "listTimerPreset"
+
         clip: true
         currentIndex: -1
         height: maxItemsVisible * units.gu(6)
         anchors { left: parent.left; right: parent.right }
-        
+
         delegate: ListItem.Standard {
             objectName: "preset" + index
             Label {
@@ -88,20 +89,20 @@
                 color: Theme.palette.normal.baseText
                 anchors { verticalCenter: parent.verticalCenter; left: parent.left; right: presetTimeLabel.left; rightMargin: units.gu(2); leftMargin: units.gu(3) }
             }
-            
+
             Label {
                 id: presetTimeLabel
-                objectName: "presetTimerLabel"
+                objectName: "presetTimerLabel" + index
                 fontSize: "large"
                 text: getstringTimer(model.contents.duration);
                 color: Theme.palette.normal.baseText
                 anchors { verticalCenter: parent.verticalCenter; right: parent.right; rightMargin: units.gu(2) }
             }
-            
+
             selected: listTimerPreset.currentIndex == index
             removable: true
             confirmRemoval: true
-            
+
             onItemRemoved: {
                 // NOTE: This causes the document to be deleted twice resulting in an error.
                 // The bug has been reported at https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1276118