Merge lp:~nik90/ubuntu-clock-app/fix-alarm-tests into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Fixes the alarm tests.

This MP revamps the entire alarms AP tests by ensuring that,
- All alarm emulator and test function have a proper docstring explaining what each function does.
- Added autopilot logging to the public emulator functions exposed to the alarm tests.
- Removed unnecessary import statements
- Cleaned up tests to only contain high-level statements and moved all the smaller tasks into the emulator functions.
- Added reference to bug reports where needed to make it clear why certain temporary code has been added.

BLOCKED: Do note that the tests currently fail in the jenkins machine since the TextField UITK emulator used in this MP has not yet landed in the 14.04 archive. Please ensure that this is fixed before merging MP to trunk.

[Leo Arias (elopio)]

25 + containerHeight: itemHeight * 7 // Temporary fix for autopilot

Please, file a bug where you explain the problem, and put a link to it next to the comment in the code.

Remember updating the copyright. You are missing it here:
tests/autopilot/ubuntu_clock_app/emulators.py

209 + tx = x + (w / 2)
210 + ty = y + (h / 2.5)
211 + self.pointing_device.drag(tx, ty - (h / 4), tx - (w / 2), ty + (h / 2))
217 + tx = x + (w / 2)
218 + ty = y + (h / 2.5)
219 + self.pointing_device.drag(tx, ty - (h / 4), tx + (w / 2), ty + (h / 2))

I've seen some code by barry where he changes the / to //. // returns the floor division, so it sounds safer to use when we need ints, like in this case. And with it, we will get the same behaviour on python 2 and 3.
http://www.python.org/dev/peps/pep-0238/

266 + days_object = day_option_selector.select_single("StyledItem",
267 + objectName="listContainer")
266 + days_object = day_option_selector.select_single("StyledItem",
267 + objectName="listContainer")
296 + day_array.append(self.wait_select_single('CheckBox',
297 + objectName='repeatDaysSwitch' + repr(i)))
314 + done_button = self.wait_select_single('Button',
315 + objectName='confirmRepeatDaysButton')
367 + alarm = self.wait_select_single('CheckBox',
368 + objectName='listAlarmStatus{}'.format(index))

This is not properly aligned, and pep8 will complain.
I prefer:
days_object = day_option_selector.select_single(
    "StyledItem", objectName="listContainer")

But it's totally valid to break after the first argument and some people prefer it. You just have to make sure all arguments start on the same column.

278 + day_index = i

You can add a break after you found the element, so you stop the loop and don't do more unnecessary checks.
I find the for loops prettier, but that's a matter of preference:

for index, day_element in enumerate(daylist):
    if(day_element.text == day):
        day_index = index
        break

292 + day_array = []

Why do you need this date array?

for index in range(7):
    day_element = self.wait_select_single(
        toolkit_emulators.CheckBox, objectName='repeatDaysSwitch{}'.format(index))
        if index % 2 == 0:
            day_element.check()
        else:
            day_element.uncheck()

That looks a little cleaner for me ^

779 + """ Test to add a single type alarm and check if it is properly
780 + added to the alarm list.
781 + """

When the comments are of more than one line, please split them into a one line summary, and then add extra information on following paragraphs. That's from http://www.python.org/dev/peps/pep-0257/
In this case, I'd just remove the comment because you have given the test a perfect name that explains it all.

I like this very much. You have hidden all the low level details behind the public methods add_alarm, delete_alarm and toggle_alarm, and you named them using the user language. I couldn't have asked for more.

Well, I always can ask for more because I'm a PITA. Please add the logging decorator to those three public methods, so the autopilot logs show a trace of what we were doing.

Thank you!

[Leo Arias (elopio)]

review: Needs Fixing (code review)

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

FAILED: Continuous integration, rev:342
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/212/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1171
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/212
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/212
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/130

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

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

> Remember updating the copyright. You are missing it here:
> tests/autopilot/ubuntu_clock_app/emulators.py
>

fixed in rev 343

> 209 + tx = x + (w / 2)
> 210 + ty = y + (h / 2.5)
> 211 + self.pointing_device.drag(tx, ty - (h / 4), tx - (w / 2), ty + (h /
> 2))
> 217 + tx = x + (w / 2)
> 218 + ty = y + (h / 2.5)
> 219 + self.pointing_device.drag(tx, ty - (h / 4), tx + (w / 2), ty + (h /
> 2))
>
> I've seen some code by barry where he changes the / to //. // returns the
> floor division, so it sounds safer to use when we need ints, like in this
> case. And with it, we will get the same behaviour on python 2 and 3.
> http://www.python.org/dev/peps/pep-0238/

Fixed in rev 345

>
> 266 + days_object = day_option_selector.select_single("StyledItem",
> 267 + objectName="listContainer")
> 266 + days_object = day_option_selector.select_single("StyledItem",
> 267 + objectName="listContainer")
> 296 + day_array.append(self.wait_select_single('CheckBox',
> 297 + objectName='repeatDaysSwitch' + repr(i)))
> 314 + done_button = self.wait_select_single('Button',
> 315 + objectName='confirmRepeatDaysButton')
> 367 + alarm = self.wait_select_single('CheckBox',
> 368 + objectName='listAlarmStatus{}'.format(index))
>
> This is not properly aligned, and pep8 will complain.
> I prefer:
> days_object = day_option_selector.select_single(
> "StyledItem", objectName="listContainer")
>
> But it's totally valid to break after the first argument and some people
> prefer it. You just have to make sure all arguments start on the same column.

Fixed in rev 346

>
> 278 + day_index = i
>
> You can add a break after you found the element, so you stop the loop and
> don't do more unnecessary checks.
> I find the for loops prettier, but that's a matter of preference:
>
> for index, day_element in enumerate(daylist):
> if(day_element.text == day):
> day_index = index
> break
>
> 292 + day_array = []
>
> Why do you need this date array?
>
> for index in range(7):
> day_element = self.wait_select_single(
> toolkit_emulators.CheckBox,
> objectName='repeatDaysSwitch{}'.format(index))
> if index % 2 == 0:
> day_element.check()
> else:
> day_element.uncheck()
>
> That looks a little cleaner for me ^
>

Fixed in rev 347

> 779 + """ Test to add a single type alarm and check if it is properly
> 780 + added to the alarm list.
> 781 + """
>
> When the comments are of more than one line, please split them into a one line
> summary, and then add extra information on following paragraphs. That's from
> http://www.python.org/dev/peps/pep-0257/
> In this case, I'd just remove the comment because you have given the test a
> perfect name that explains it all.

Fixed in rev 349. I removed the comments since the test name is good enough.

> I like this very much. You have hidden all the low level details behind the
> public methods add_alarm, delete_alarm and toggle_alarm, and you named them
> using the user language. I couldn't have asked for more.
>
> Well, I always can ask for more because I'm a PITA. Please add the logg...

[Nekhelesh Ramananthan (nik90)]

elopio> nik90: oh, and I forgot one more thing. Try to be consistent on your use of 'strings' vrs "strings". I prefer the single quote.

Fixed in rev 344

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

FAILED: Continuous integration, rev:350
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/213/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1174
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/213
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/213
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/131

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

I've not yet run it on the phone, some thoughts;

Can you explain what this temp fix is, etc? bug number?
containerHeight: itemHeight * 7 // Temporary fix for autopilot

I like the changes to page up and page down with _wait_to_stop_moving.

Yay for using _ to start function names of utility functions :-)

Probably should try and be consistent on all of your docstrings, add them for all the emulator functions.

Your ' and " are still inconsistent, since elopio mentioned it :-) My preference is probably different than his; strings are ", literal strings are '.

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

FAILED: Continuous integration, rev:351
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/214/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1188
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/214
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/214
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/132

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

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Thanks for your review Nicholas. I am happy that you like the changes to the emulator functions in terms of naming and other subtle changes.

>
> Can you explain what this temp fix is, etc? bug number?
> containerHeight: itemHeight * 7 // Temporary fix for autopilot
>

Fixed in rev 351. I have added a detailed comment there explaining why that fix is needed for the AP tests.

>
> Probably should try and be consistent on all of your docstrings, add them for
> all the emulator functions.
>

In this MP I want to only modify/improve the alarm tests. I do not want to change other parts of the tests. As a result, looking at the test_alarm.py and the alarm emulator functions, all of them have a docstring explaining what they. I added better docstrings for the alarm tests in rev 352.

> Your ' and " are still inconsistent, since elopio mentioned it :-) My
> preference is probably different than his; strings are ", literal strings are
> '.

As far as the alarms AP is concerned, I have made all of the consistently to using single quotes. There are inconsistencies in stopwatch, timer and clock tests. But I rather address in another MP than this one.

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

FAILED: Continuous integration, rev:352
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/215/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1190
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/215
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/215
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/133

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Yes, I agree not to inflate the merge with lots of changes in other places. This is looking REALLY good :-)

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

FAILED: Continuous integration, rev:353
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/221/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1215
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/221
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/221
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/139

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:353
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/239/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1318
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/239
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/239
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/157

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:354
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/241/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1320
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/241
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/241
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/159

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:354
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/243/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1326
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/243
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/243
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/161

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:354
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/246/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1329
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/246
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/246
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/164

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:354
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/247/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1330
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/247
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/247
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/165

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:355
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/248/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1331
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/248
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/248
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/166

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

Thanks for all your work on this.

review: Approve (code review)

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

FAILED: Continuous integration, rev:356
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/258/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1392
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/258
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/258
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/176

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:356
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/259/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1396
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/259
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/259
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/177

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:356
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/260/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1397
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/260
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/260
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/178

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:358
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/262/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1400
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/262
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/262
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/180

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
Unapproved changes made after approval.
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/130/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1403
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/130
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/130
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-autolanding/66

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'alarm/AddAlarmPage.qml'
--- alarm/AddAlarmPage.qml	2014-02-10 13:55:59 +0000
+++ alarm/AddAlarmPage.qml	2014-02-19 00:55:51 +0000
@@ -310,6 +310,7 @@
 
                             Label {
                                 id: hourLabel
+                                objectName: "hourLabel"
                                 color: "LightGreen"
                                 font.pixelSize: units.dp(55)
                                 anchors.verticalCenter: parent.verticalCenter
@@ -336,6 +337,7 @@
 
                             Label {
                                 id: minuteLabel
+                                objectName: "minuteLabel"
                                 font.pixelSize: units.dp(41)
                                 anchors.verticalCenter: parent.verticalCenter
                                 onTextChanged: if(addAlarmFace.state == "minuteMode") updateHoursOnMinuteRotation()
@@ -489,7 +491,13 @@
                     objectName: "OccursSelector"
                     text: i18n.tr("Occurs")
                     visible: repeatSwitch.checked == false  // Show the day selector only when the alarm is a one-type alarm
-                    containerHeight: itemHeight * 4
+
+                    // TODO: To avoid a long option selector list, it would be best to only show 4 days at a time and encourage
+                    // scrolling the option selector to choose other days. However this is blocked by http://pad.lv/1277059 since
+                    // showing only 4 days will inhibit the alarm autopilot tests since they use a custom emulator function.
+                    // -- nik90 2014-02-10
+                    containerHeight: itemHeight * 7
+
                     model: [Qt.locale().standaloneDayName(0), Qt.locale().standaloneDayName(1), Qt.locale().standaloneDayName(2), Qt.locale().standaloneDayName(3), Qt.locale().standaloneDayName(4), Qt.locale().standaloneDayName(5), Qt.locale().standaloneDayName(6)]
 
                     selectedIndex: alarm.date.getDay();
@@ -523,9 +531,9 @@
 
                 ListItem.MultiValue {
                     id: multipleOccurSelector
-                    anchors { left: parent.left; right: parent.right; margins: -units.gu(2) }
-                    text: i18n.tr("Occurrence")
                     objectName: "OccurrenceList"
+                    anchors { left: parent.left; right: parent.right; margins: -units.gu(2) }
+                    text: i18n.tr("Occurrence")                    
                     values: getValues()
                     visible: repeatSwitch.checked == true
                     onClicked: PopupUtils.open(Qt.resolvedUrl("AlarmDays.qml"), multipleOccurSelector, {"alarm": alarm});

=== modified file 'alarm/AlarmDays.qml'
--- alarm/AlarmDays.qml	2014-02-01 15:30:26 +0000
+++ alarm/AlarmDays.qml	2014-02-19 00:55:51 +0000
@@ -73,6 +73,7 @@
                 }
 
                 control: Switch {
+                    objectName: "repeatDaysSwitch" + index
                     checked: (alarm.daysOfWeek & flag) == flag
                     onCheckedChanged: {
                         if (checked)
@@ -87,6 +88,7 @@
 
     Button {
         text: "Done"
+        objectName: "confirmRepeatDaysButton"
         onClicked: PopupUtils.close(root);
     }
 }

=== modified file 'alarm/AlarmPage.qml'
--- alarm/AlarmPage.qml	2014-02-11 15:45:26 +0000
+++ alarm/AlarmPage.qml	2014-02-19 00:55:51 +0000
@@ -202,9 +202,10 @@
                 currentIndex: -1
 
                 delegate: ListItem.Base {
+                    objectName: "alarm" + index
                     Label {
                         id: alarmTime
-                        objectName: "listAlarmTime"
+                        objectName: "listAlarmTime" + index
                         fontSize: "large";
                         text: Utils.convertTime(date.getHours(), date.getMinutes(), 0, appSetting.contents.timeFormat)
                         anchors { verticalCenter: parent.verticalCenter; right: alarmStatus.left; rightMargin: units.gu(2) }
@@ -213,7 +214,7 @@
 
                     Label {
                         id: alarmLabel
-                        objectName: "listAlarmLabel"
+                        objectName: "listAlarmLabel" + index
                         fontSize: "large";
                         text: message
                         elide: Text.ElideRight
@@ -230,7 +231,7 @@
 
                     Label {
                         id: alarmSubtitle
-                        objectName: "listAlarmSubtitle"
+                        objectName: "listAlarmSubtitle" + index
                         fontSize: "small";
                         text: format_day_string(daysOfWeek, type)
                         anchors { left: alarmLabel.left; top: alarmLabel.bottom }
@@ -239,7 +240,7 @@
 
                     Switch {
                         id: alarmStatus
-                        objectName: "listAlarmStatus"
+                        objectName: "listAlarmStatus" + index
                         checked: model.enabled
                         anchors { right: parent.right; verticalCenter: alarmTime.verticalCenter }
                         onClicked: {

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	2014-02-05 15:18:08 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-02-19 00:55:51 +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 Lesser General Public License as published by
@@ -17,21 +17,26 @@
 # Authored by: Nekhelesh Ramananthan <[e-mail]>
 #              Nicholas Skaggs <[e-mail]>
 
+import logging
+from time import sleep
+
+from autopilot import logging as autopilot_logging
 from ubuntuuitoolkit import emulators as toolkit_emulators
-from autopilot.matchers import Eventually
-from testtools.matchers import Not, Is, Equals
-from time import sleep
+
+logger = logging.getLogger(__name__)
+
+
+class ClockEmulatorException(toolkit_emulators.ToolkitEmulatorException):
+    """Exception raised when there is an error with the emulator."""
+
 
 class MainView(toolkit_emulators.MainView):
 
     # Common Emulator Functions
-    def _drag_page(self, page, test_case, direction):
+    def _drag_page(self, page, direction):
         """Function to drag the page up/down"""
         page = self.wait_select_single(page)
-        animating = lambda: page.select_single("QQuickFlickable").moving
-
-        #make sure we're not already moving :-)
-        test_case.assertThat(animating, Eventually(Equals(False)))
+        self._wait_to_stop_moving(page)
 
         x, y, w, h = page.globalRect
         tx = x + (w / 2)
@@ -42,15 +47,15 @@
         else:
             self.pointing_device.drag(tx, ty, tx, ty - h / 3)
 
-        test_case.assertThat(animating, Eventually(Equals(False)))
+        self._wait_to_stop_moving(page)
 
-    def drag_page_up(self, page, test_case):
+    def drag_page_up(self, page):
         """Drag the given page up."""
-        self._drag_page(page, test_case, "up")
+        self._drag_page(page, "up")
 
-    def drag_page_down(self, page, test_case):
+    def drag_page_down(self, page):
         """Drag the given page down."""
-        self._drag_page(page, test_case, "down")
+        self._drag_page(page, "down")
 
     def longpress_object(self, obj):
         """Function to longpress an object"""
@@ -59,6 +64,9 @@
         sleep(2)
         self.pointing_device.release()
 
+    def _wait_to_stop_moving(self, page):
+        page.select_single("QQuickFlickable").moving.wait_for(False)
+
     # CLOCK Page Emulator Functions
     def get_clock_page(self):
         """Return the page containing the main clock."""
@@ -108,7 +116,7 @@
 
     def get_timer_name_preset(self):
         """Returns the TextField where insert the name of the preset"""
-        return self.wait_select_single("LabelDots", objectName="namePreset")
+        return self.wait_select_single(LabelDots, objectName="namePreset")
 
     def get_timer_minute_hand(self):
         """Returns the hour hand of clock in timer tab"""
@@ -167,156 +175,175 @@
     # ALARM Page Emulator Functions
     def get_addalarm_page(self):
         """Returns the add alarm page object"""
-        return self.select_single("Page", objectName="addAlarmPage")
+        return self.select_single('Page', objectName='addAlarmPage')
 
     def get_alarm_page(self):
         """Returns the alarm page object"""
-        return self.select_single("AlarmPage")
-
-    def get_alarm_name_label(self):
-        """Returns the TextField where insert the name of the preset"""
-        return self.select_single("LabelDots", objectName="addAlarmName")
-
-    def get_label_alarm(self):
-        """Return the label with the alarm"""
-        return self.select_single("Label", objectName="labelAlarmSetup")
+        return self.select_single('AlarmPage')
+
+    @autopilot_logging.log_action(logger.info)
+    def add_alarm(self, name, alarm_type, day):
+        """Function to add an alarm"""
+        self._click_add_alarm_button()
+        self._set_alarm_time()
+        self.drag_page_up('AddAlarmPage')
+        self._set_alarm_name(name)
+        self._click_alarm_hour_label()
+        self._set_alarm_type(alarm_type)
+        self.drag_page_up('AddAlarmPage')
+        self._set_alarm_trigger_day(day, alarm_type)
+        self._click_save_alarm_button()
+
+    def _click_add_alarm_button(self):
+        """Internal function to click add alarm toolbar button"""
+        toolbar = self.open_toolbar()
+        toolbar.click_button('addAlarmButton')
+
+    def _set_alarm_name(self, name):
+        """Internal funcion to set alarm name"""
+        name_alarm = self.wait_select_single(
+            LabelDots, objectName='addAlarmName')
+        name_alarm.write(name)
+
+    def _set_alarm_time(self):
+        """Internal function to set alarm time"""
+        self._click_alarm_hour_label()
+        hour = self._get_alarm_hour_hand()
+
+        x, y, w, h = hour.globalRect
+        tx = x + (w // 2)
+        ty = y + (h // 2.5)
+        self.pointing_device.drag(
+            tx, ty - (h // 4), tx - (w // 2), ty + (h // 2))
+
+        self._click_alarm_minute_label()
+        minute = self._get_alarm_minute_hand()
+
+        x, y, w, h = minute.globalRect
+        tx = x + (w // 2)
+        ty = y + (h // 2.5)
+        self.pointing_device.drag(
+            tx, ty - (h // 4), tx + (w // 2), ty + (h // 2))
+
+    def _click_alarm_hour_label(self):
+        """Internal function to click alarm hour label"""
+        hour_label = self.wait_select_single(
+            'Label', objectName='hourLabel')
+        self.pointing_device.click_object(hour_label)
+
+    def _click_alarm_minute_label(self):
+        """Internal function to click alarm minute label"""
+        minute_label = self.wait_select_single(
+            'Label', objectName='minuteLabel')
+        self.pointing_device.click_object(minute_label)
+
+    def _get_alarm_hour_hand(self):
+        """Returns the hour hand of clock in add alarm page"""
+        return self.select_single("AddAlarmPage").wait_select_single(
+            'DialerHand', objectName='hourHand')
+
+    def _get_alarm_minute_hand(self):
+        """Returns the minute hand of clock in add alarm page"""
+        return self.select_single("AddAlarmPage").wait_select_single(
+            'DialerHand', objectName='minuteHand')
+
+    def _set_alarm_type(self, alarm_type):
+        """Internal function to set the alarm type"""
+        alarm_type_checkbox = self.wait_select_single(
+            toolkit_emulators.CheckBox, objectName='RepeatSelector')
+        if alarm_type == 'Single':
+            alarm_type_checkbox.uncheck()
+        else:
+            alarm_type_checkbox.check()
+
+    def _set_alarm_trigger_day(self, day, alarm_type):
+        """Internal function to set the day the alarm triggers on"""
+        if alarm_type == 'Single':
+            self._set_single_alarm_day(day)
+        else:
+            self._set_recurring_alarm_day()
+
+    def _set_single_alarm_day(self, day):
+        """Internal function to set the alarm day of a single type alarm"""
+        # TODO: we need a proper UITK emulator for optionSelector
+        # http://pad.lv/1277059  --nik90 2014-02-06
+        day_option_selector = self.select_single(
+            'OptionSelector', objectName='OccursSelector')
+        days_object = day_option_selector.select_single(
+            'StyledItem', objectName='listContainer')
+        dayslist = days_object.select_many('Label', visible=True)
+
+        # Click on days option selector to expand it
+        self.pointing_device.click_object(dayslist[0])
+
+        for index, day_element in enumerate(dayslist):
+            if(day_element.text == day):
+                day_index = index
+                break
+        else:
+            raise ClockEmulatorException('Unknown day: {}'.format(day))
+
+        self.drag_page_up('AddAlarmPage')
+        self.pointing_device.click_object(dayslist[day_index])
+
+    def _set_recurring_alarm_day(self):
+        """Internal function to set the alarm days of a recurring alarm"""
+        self._open_recurring_alarm_dialog()
+
+        # Get all the day objects in the column and enable only those
+        # days whose index is an even number and disable the others
+        for index in range(7):
+            day_element = self.wait_select_single(
+                toolkit_emulators.CheckBox,
+                objectName='repeatDaysSwitch{}'.format(index))
+            if index % 2 == 0:
+                day_element.check()
+            else:
+                day_element.uncheck()
+
+        self._click_confirm_recurring_alarm_days()
+
+    def _open_recurring_alarm_dialog(self):
+        """Internal function to open the recurring alarm dialogue"""
+        recurring_option = self.wait_select_single(
+            toolkit_emulators.MultiValue, objectName='OccurrenceList')
+        self.pointing_device.click_object(recurring_option)
+
+    def _click_confirm_recurring_alarm_days(self):
+        """Internal function to click Done button in recurring alarms dialog"""
+        done_button = self.wait_select_single(
+            'Button', objectName='confirmRepeatDaysButton')
+        self.pointing_device.click_object(done_button)
+
+    def _click_save_alarm_button(self):
+        """Click the save alarm button"""
+        toolbar = self.open_toolbar()
+        toolbar.click_button('saveAlarmButton')
 
     def get_num_of_alarms(self):
-        """Returns the number of alarms in the alarm page."""
-        listview = self.select_single("QQuickListView",
-                                      objectName="listSavedAlarm")
-        #each alarm has 3 labels
-        return len(listview.select_many("Label", visible=True)) / 3
-
-        #TODO: QQuickListView.count does not work as expected
-        #fix once this is working properly and use it
-
-    #TODO: all of the get_first functions need to
-    #be refactored where possible to get X item, not
-    #just the first
-
-    def get_first_alarm_list_item(self):
-        """Returns the first alarm list item in the alarm page."""
-        listview = self.select_single("QQuickListView",
-                                      objectName="listSavedAlarm")
-        return listview.select_many("Base")[0]
-
-    def toggle_first_alarm(self, test_case):
-        """Toggles the alarm on and off in the alarm page."""
-        alarm = self.select_single("CheckBox",
-                                   objectName="listAlarmStatus")
+        """Return the number of saved alarms"""
+        return int(self.wait_select_single(
+            toolkit_emulators.QQuickListView,
+            objectName='listSavedAlarm').count)
+
+    @autopilot_logging.log_action(logger.info)
+    def delete_alarm(self, index):
+        """Deletes an alarm at the specified index"""
+        alarm = self.wait_select_single(
+            toolkit_emulators.Base, objectName='alarm{}'.format(index))
+        self.drag_page_up('AlarmPage')
+        alarm.swipe_to_delete()
+        alarm.confirm_removal()
+
+    @autopilot_logging.log_action(logger.info)
+    def toggle_alarm(self, index):
+        """Toggles an alarm on/off"""
+        alarm = self.wait_select_single(
+            toolkit_emulators.CheckBox,
+            objectName='listAlarmStatus{}'.format(index))
+        self.drag_page_up('AlarmPage')
         self.pointing_device.click_object(alarm)
 
-        test_case.assertThat(lambda: self.get_alarm_page().select_single(
-                     "QQuickFlickable").moving,
-                     Eventually(Equals(False)))
-
-    def get_first_alarm_time(self):
-        """Gets the first alarm time in the alarm page."""
-        alarm = self.get_first_alarm_list_item()
-        return alarm.select_single("Label",
-                                   objectName="listAlarmTime").text
-
-    def get_first_alarm_subtitle(self):
-        """Gets the first alarm subtitle in the alarm page."""
-        alarm = self.get_first_alarm_list_item()
-        return alarm.select_single("Label",
-                                   objectName="listAlarmSubtitle").text
-
-    def get_first_alarm_label(self):
-        """Gets the first alarm label in the alarm page."""
-        alarm = self.get_first_alarm_list_item()
-        return alarm.select_single("Label",
-                                   objectName="listAlarmLabel").text
-
-    def get_first_alarm_status(self):
-        """Gets the first alarm checkbox status in the alarm page."""
-        alarm = self.get_first_alarm_list_item()
-        return alarm.select_single("CheckBox",
-                                   objectName="listAlarmStatus").checked
-
-    def get_alarm_minute_hand(self):
-        """Returns the hour hand of clock in alarm tab"""
-        return self.select_single("AlarmPage").select_single("DialerHand",
-                                  objectName="minuteHand")
-
-    def get_alarm_hour_hand(self):
-        """Returns the hour hand of clock in alarm tab"""
-        return self.select_single("AlarmPage").select_single("DialerHand",
-                                  objectName="hourHand")
-
-    def set_alarm_week(self, day, test_case):
-        #TODO: add support for setting days of week
-        dayselectDialog = self.select_single("Dialog",
-                                             objectName="alarmDaysDialog")
-
-        return dayselectDialog
-
-    def _retry_selector_assert(self, clickobj, selector, status, test_case):
-        test_case.assertThat(lambda: self.get_alarm_page().select_single(
-                             "QQuickFlickable").moving,
-                             Eventually(Equals(False)))
-        timeout = 0
-        test_case.assertThat(lambda: selector.select_single(
-            "OptionSelectorDelegate", selected=True),
-            Eventually(Not(Is(None))))
-
-        option = selector.select_single("OptionSelectorDelegate",
-                                        selected=True).state
-        while option != status and timeout < 10:
-            self.pointing_device.click_object(clickobj)
-            option = selector.select_single("OptionSelectorDelegate",
-                                            selected=True).state
-            sleep(1)
-            timeout += 1
-
-        test_case.assertThat(lambda: self.get_alarm_page().select_single(
-                             "QQuickFlickable").moving,
-                             Eventually(Equals(False)))
-
-    def set_alarm_day(self, day, test_case):
-        select = self.select_single("OptionSelector",
-                                    objectName="OccursSelector")
-        occur = select.select_single("StyledItem", objectName="listContainer")
-        #optionslist = occur.select_single("OptionSelectorDelegate",
-        #                                   selected=True)
-        occurlist = occur.select_many("Label", visible=True)
-
-        self.pointing_device.click_object(select)
-        self._retry_selector_assert(select, occur,
-                                    "dividerExpanded", test_case)
-
-        self.drag_page_up("AlarmPage", test_case)
-        self.pointing_device.click_object(occurlist[day])
-        self._retry_selector_assert(select, occur,
-                                    "dividerCollapsed", test_case)
-
-        #check index
-        #TODO: clock doesn't put things in in the proper order atm
-        #test_case.assertThat(lambda: self.select_single("OptionSelector",
-        #                     objectName="OccursSelector").selectedIndex+1,
-        #                     Eventually(Equals(day)))
-
-    def set_alarm_frequency(self, occurence, test_case):
-        select = self.select_single("OptionSelector",
-                                    objectName="RepeatSelector")
-        repeat = select.select_single("StyledItem",
-                                      objectName="listContainer")
-        #optionslist = occur.select_single("OptionSelectorDelegate",
-        #                                   selected=True)
-        repeatlist = repeat.select_many("Label", visible=True)
-
-        self.pointing_device.click_object(repeat)
-        self._retry_selector_assert(select, repeat,
-                                    "dividerExpanded", test_case)
-
-        self.drag_page_up("AlarmPage", test_case)
-        self.pointing_device.click_object(repeatlist[occurence])
-        self._retry_selector_assert(select, repeat,
-                                    "dividerCollapsed", test_case)
-
-        #check index
-        test_case.assertThat(lambda: self.select_single(
-            "OptionSelector", objectName="RepeatSelector").selectedIndex+1,
-            Eventually(Equals(occurence)))
-
+
+class LabelDots(toolkit_emulators.TextField):
+    """Autopilot helper for the LabelDots component."""

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	2014-02-10 22:41:51 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2014-02-19 00:55:51 +0000
@@ -118,4 +118,4 @@
 
     @property
     def main_view(self):
-        return self.app.select_single(emulators.MainView)
+        return self.app.wait_select_single(emulators.MainView)

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_alarm.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_alarm.py	2014-01-21 15:10:14 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_alarm.py	2014-02-19 00:55:51 +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
@@ -15,284 +15,101 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Authored by: Nicholas Skaggs <[e-mail]>
+#              Nekhelesh Ramananthan <[e-mail]>
 
 """Tests for the Clock App - Alarm"""
 
 from __future__ import absolute_import
 
-from testtools.matchers import Equals, NotEquals, Is, Not
+import datetime
+import unittest
+
 from autopilot.matchers import Eventually
-import time
-import datetime
+from testtools.matchers import Equals, NotEquals
 from ubuntu_clock_app.tests import ClockAppTestCase
-import unittest
 
 
 class TestAlarm(ClockAppTestCase):
     """Tests the alarm page features"""
 
-    """ This is needed to wait for the application to start.
-        In the testfarm, the application may take some time to show up."""
-
-    #TODO: alarms shares similarities with stopwatch
-    #the utility functions could be shared between them
-    #ie, the emulator functions
     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(TestAlarm, self).setUp()
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
 
-        #move to alarm tab
-        self.main_view.switch_to_tab("AlarmTab")
-
-    def select_name_alarm_label(self):
-        label = self.main_view.get_alarm_name_label()
-        timeout = 0
-        while not label.focus and timeout < 10:
-            self.pointing_device.click_object(label)
-            time.sleep(1)
-            timeout += 1
-        return label
-
-    @unittest.skip("Pending development, bug 1269064")
-    def test_longpress_new_alarm(self):
-        """Test longpress on alarm and back button"""
-        #TODO: needs this merge
-        #https://code.launchpad.net/~elopio/
-        #ubuntu-ui-toolkit/fix1239751_go_back/+merge/191002
-        #thus is disabled for now until landing
-
-        self.assertThat(self.main_view.get_label_alarm,
-                        Eventually(Not(Is(None))))
-        self.main_view.longpress_object(self.main_view.get_label_alarm())
-
-        self.assertThat(self.main_view.get_addalarm_page,
-                        Eventually(Not(Is(None))))
-
-        toolbar = self.main_view.open_toolbar()
-
-        # Click the add alarm button
-        toolbar.go_back()
-
-        self.assertThat(self.main_view.get_alarm_page,
-                        Eventually(Not(Is(None))))
-
-    @unittest.skip("Pending development, bug 1269064")
-    def test_add_remove_alarm(self):
-        """Test to check if button to add and remove an alarm working"""
-
-        #test once
-        #use tomorrow as day
-        day = datetime.datetime.today().weekday() + 1
-        if day > 7:
-            day = 0
-        self.add_alarm(day, 1)
-        self.delete_alarm()
-
-        #test daily
-        self.add_alarm(4, 2)
-        self.delete_alarm()
-
-        #test weekly
-        #self.add_alarm(1, 3)
-        #self.delete_alarm()
-
-    def add_alarm(self, day, occurence):
-        #setTime = "16:20"
-
-        # Show the toolbar
-        toolbar = self.main_view.open_toolbar()
-
-        # Click the add alarm button
-        toolbar.click_button("addAlarmButton")
-
-        self.assertThat(lambda: self.main_view.get_alarm_page().select_single(
-                        "QQuickFlickable").moving,
-                        Eventually(Equals(False)))
-
-        #TODO: these should be broken out for reuse in timer as well
-        #as well as allowing for various times
-        # Set hour
-        self.assertThat(self.main_view.get_alarm_hour_hand,
-                        Eventually(Not(Is(None))))
-        hour = self.main_view.get_alarm_hour_hand()
-
-        x, y, w, h = hour.globalRect
-        tx = x + (w / 2)
-        ty = y + (h / 2)
-        self.pointing_device.drag(tx, ty - (h / 4), tx - (w / 2), ty + (h / 2))
-
-        self.assertThat(lambda: self.main_view.get_alarm_page().select_single(
-                        "QQuickFlickable").moving,
-                        Eventually(Equals(False)))
-
-        # Set minute
-        self.assertThat(self.main_view.get_alarm_minute_hand,
-                        Eventually(Not(Is(None))))
-        minute = self.main_view.get_alarm_minute_hand()
-
-        x, y, w, h = minute.globalRect
-        tx = x + (w / 2)
-        ty = y + (h / 2.5)
-        self.pointing_device.drag(tx, ty - (h / 4), tx + (w / 2), ty + (h / 2))
-
-        self.assertThat(lambda: self.main_view.get_alarm_page().select_single(
-                        "QQuickFlickable").moving,
-                        Eventually(Equals(False)))
-
-        #TODO: Choosing the same day hides the day
-        #https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1240629
-
-        self.edit_alarm(day, occurence)
-
-
-        #TODO: fix time check.. time doesn't always set properly
-        #and will randomly fail the test
-        #self.assertThat(self.main_view.get_first_alarm_time,
-        #                Eventually(Equals(setTime)))
-
-    def edit_alarm(self, day, occurence):
-        setName = "test" + str(int(time.time()))
-        setStatus = True
-
-        # Write in the label
-        self.main_view.drag_page_up("AlarmPage", self)
-        self.assertThat(self.main_view.get_alarm_name_label,
-                        Eventually(Not(Is(None))))
-        label = self.select_name_alarm_label()
-        self.assertThat(label.focus, Eventually(Equals(True)))
-        self.keyboard.press('Ctrl+a')
-        self.assertThat(label.focus, Eventually(Equals(True)))
-
-        #set unique alarm name
-        self.keyboard.type(setName)
-        self.assertThat(label.text, Eventually(Equals(setName)))
-
-        #set alarm day and frequency
-        self.main_view.set_alarm_frequency(occurence, self)
-
-        #depending on occurrence, we set the day differently
-        if occurence == 1:
-            #one time, use day passed in
-            self.main_view.set_alarm_day(day, self)
-        elif occurence == 2:
-            #daily, ignore day
-            pass
-        elif occurence == 3:
-            #weekly, pass day into dialog
-            #TODO: support weekly dialog
-            self.main_view.set_alarm_week(day, self)
-
-        #grab current alarm number
-        self.assertThat(self.main_view.get_num_of_alarms,
-                        Eventually(Not(Is(None))))
-        num_of_alarms_old = self.main_view.get_num_of_alarms()
-
-        # Press "Save" toolbar button
-        toolbar = self.main_view.open_toolbar()
-        toolbar.click_button("saveAlarmButton")
-
-        #assert alarm is added
-        self.assertThat(self.main_view.get_num_of_alarms,
-                        Eventually(NotEquals(num_of_alarms_old)))
-
-        #check label, time, subtitle, name
-        #TODO: decipher proper subtitles and check for them
-        #self.assertThat(self.main_view.get_first_alarm_subtitle,
-        #                Eventually(Equals( ? )))
-
-        self.assertThat(self.main_view.get_first_alarm_label,
-                        Eventually(Not(Is(None))))
-
-        self.assertThat(self.main_view.get_first_alarm_label,
-                        Eventually(Equals(setName)))
-
-        self.assertThat(self.main_view.get_first_alarm_status,
-                        Eventually(Equals(setStatus)))
-
-    def delete_alarm(self):
-        """Test if the swipe of a alarm deletes it"""
-        #TODO: fix this with https://code.launchpad.net/~renatofilho/
-        #ubuntu-ui-toolkit/fix-1236464/+merge/190496
-        #once it lands
-        self.assertThat(self.main_view.get_num_of_alarms,
-                        Eventually(Not(Is(None))))
-        num_of_alarms_old = self.main_view.get_num_of_alarms()
-
-        self.main_view.drag_page_up("AlarmPage", self)
-
-        # Delete the alarm
-        self.assertThat(self.main_view.get_first_alarm_list_item,
-                        Eventually(Not(Is(None))))
-        timeout = 0
-        while self.main_view.get_num_of_alarms() != num_of_alarms_old - 1 \
-                and timeout < 10:
-            first_alarm = self.main_view.get_first_alarm_list_item()
-            x, y, w, h = first_alarm.globalRect
-            tx = x + (w / 8)
-            ty = y + (h / 2)
-            self.pointing_device.drag(tx, ty, w - w / 8, ty)
-            time.sleep(1)
-            timeout += 1
-
-        # Check has been deleted
-        self.assertThat(
-            self.main_view.get_num_of_alarms,
-            Eventually(Equals(num_of_alarms_old - 1)))
-
-    @unittest.skip("Pending development, bug 1269064")
-    def test_toggle_and_edit_alarm(self):
-        """Tests if a alarm can be toggled on and off and edited"""
-
-        # Create a new alarm
-        self.add_alarm(1, 2)
-
-        self.main_view.drag_page_up("AlarmPage", self)
-
-        # Click to select the alarm
-        self.assertThat(self.main_view.get_first_alarm_list_item,
-                        Eventually(Not(Is(None))))
-        first_alarm = self.main_view.get_first_alarm_list_item()
-
-        #grab current values
-        self.assertThat(self.main_view.get_first_alarm_label,
-                        Eventually(Not(Is(None))))
-
-        oldName = self.main_view.get_first_alarm_label()
-        oldStatus = self.main_view.get_first_alarm_status()
-
-        # Perform edit
-        self.pointing_device.click_object(first_alarm)
-
-        #TODO: objects aren't quite the same :-(
-        #self.edit_alarm(1, 1)
-        #just save it instead
-        toolbar = self.main_view.open_toolbar()
-        toolbar.click_button("saveAlarmButton")
-
-        #verify everything is still good
-        self.assertThat(self.main_view.get_first_alarm_label,
-                        Eventually(Not(Is(None))))
-
-        self.assertThat(self.main_view.get_first_alarm_label,
-                        Eventually(Equals(oldName)))
-
-        self.assertThat(self.main_view.get_first_alarm_status,
-                        Eventually(Equals(oldStatus)))
-
-        # Click to switch off the alarm
-        self.assertThat(self.main_view.get_first_alarm_status,
-                        Eventually(Equals(True)))
-
-        self.main_view.toggle_first_alarm(self)
-
-        self.assertThat(self.main_view.get_first_alarm_status,
-                        Eventually(Equals(False)))
-
-        # Click to switch on the alarm
-        self.main_view.toggle_first_alarm(self)
-
-        self.assertThat(self.main_view.get_first_alarm_status,
-                        Eventually(Equals(True)))
-
-        self.delete_alarm()
+        # move to alarm tab
+        self.main_view.switch_to_tab('AlarmTab')
+
+    def test_add_single_type_alarm_must_add_to_alarm_list(self):
+        """Test to check if a single type alarm is saved properly
+
+        This test saves a single type alarm and verifies if it is added to the
+        alarm list in the alarm page.
+
+        """
+        # The alarm day is always set to tomorrow to ensure that it is
+        # not rejected by the clock app since the clock app does not
+        # allow alarms to be created before the current time of the same
+        # day. This limitation will be removed later.
+        # -- nik90 2014-02-06
+        now = datetime.datetime.now() + datetime.timedelta(days=1)
+        tomorrow_day = now.strftime("%A")
+        old_alarm_count = self.main_view.get_num_of_alarms()
+        self.main_view.add_alarm('Single Test', 'Single', tomorrow_day)
+
+        # Check if the alarm count has increased
+        self.assertThat(self.main_view.get_num_of_alarms,
+                        Eventually(NotEquals(old_alarm_count)))
+
+        #TODO: Check if the newly saved alarm has the properties set by
+        # add_alarm method
+
+    def test_add_recurring_type_alarm_must_add_to_alarm_list(self):
+        """ Test to check if a recurring alarm is saved properly
+
+        Recurring alarms are triggered on more than one day. This test saves a
+        recurring alarm and check if it has been saved and is added to the
+        alarm list in the alarm page.
+
+        """
+        old_alarm_count = self.main_view.get_num_of_alarms()
+        self.main_view.add_alarm('Recurring Test', 'Recurring', 'Null')
+
+        # Check if the alarm count has increased
+        self.assertThat(self.main_view.get_num_of_alarms,
+                        Eventually(NotEquals(old_alarm_count)))
+
+    def test_delete_alarm_must_delete_from_alarm_list(self):
+        """Test to delete an alarm and check if it has been properly removed"""
+        # FIXME: Instead of always deleting the first alarm, run the alarm
+        # 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
+
+        # (set-up) Create a recurring alarm
+        self.main_view.add_alarm('Recurring Test', 'Recurring', 'Null')
+
+        old_alarm_count = self.main_view.get_num_of_alarms()
+        self.main_view.delete_alarm(index=0)
+
+        # Check that the alarm is deleted
+        self.assertThat(self.main_view.get_num_of_alarms,
+                        Eventually(Equals(old_alarm_count - 1)))
+
+    @unittest.skip("Pending development, bug 1272337")
+    def test_toggle_alarm_status_must_enable_or_disable_alarm(self):
+        """Test to toggle an alarm and check it has been done properly"""
+        # FIXME: This test is skipped due to an upstream bug in EDS which
+        # causes the alarm status to not be properly toggled. This could
+        # result in flaky test.
+        # http://pad.lv/1272337 -- nik90 - 2014-02-07
+
+        # (set-up) Create a recurring alarm
+        self.main_view.add_alarm('Recurring Test', 'Recurring', 'Null')
+
+        self.main_view.toggle_alarm(index=0)

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_clock.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2014-02-05 15:28:52 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2014-02-19 00:55:51 +0000
@@ -48,7 +48,7 @@
         super(TestClock, self).tearDown()
 
     def add_local_world_city(self):
-        # Open clock toolbar        
+        # Open clock toolbar
         self.main_view.open_toolbar()
 
         # Click add city toolbar button
@@ -74,21 +74,21 @@
     def test_add_local_world_city(self):
         """Test to check if adding a local listed world city works"""
 
-        # Add a local world city  
+        # Add a local world city
         city_name = self.add_local_world_city()
-        
+
         saved_city_name = self.main_view.get_city_name(self.main_view.grab_first_saved_city())
-        self.assertThat(saved_city_name, Eventually(Equals(city_name)))      
-        
+        self.assertThat(saved_city_name, Eventually(Equals(city_name)))
+
     def test_delete_local_world_city(self):
         """Test to check if deleting a saved local world city works"""
 
-        # Add a local world city  
+        # Add a local world city
         city_name = self.add_local_world_city()
 
-        # Close toolbar and drag page up to see the saved world city list        
+        # Close toolbar and drag page up to see the saved world city list
         self.main_view.close_toolbar()
-        self.main_view.drag_page_up("ClockPage", self)
+        self.main_view.drag_page_up("ClockPage")
 
         # Get the saved world city and swipe to delete
         old_saved_city_count = self.main_view.get_saved_cities_list().count

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py	2013-12-17 22:17:08 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py	2014-02-19 00:55:51 +0000
@@ -49,7 +49,7 @@
     def start_stop_stopwatch(self):
         """Function to start/stop the stopwatch"""
         start_stop_button = self.main_view.get_stopwatch_button()
-        self.pointing_device.click_object(start_stop_button)        
+        self.pointing_device.click_object(start_stop_button)
 
     def test_start_stop_reset_stopwatch(self):
         """Test to check the proper functioning of the start/stop/reset of stopwatch"""
@@ -105,7 +105,7 @@
         self.create_lap()
 
         num_of_laps_old = self.main_view.get_num_of_laps()
-        self.main_view.drag_page_up("StopwatchPage", self)
+        self.main_view.drag_page_up("StopwatchPage")
 
         # Delete stopwatch lap
         first_lap = self.main_view.get_first_laps_list_item()

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_timer.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2014-01-21 15:32:01 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2014-02-19 00:55:51 +0000
@@ -44,17 +44,8 @@
         # Move to Timer tab
         self.main_view.switch_to_tab("TimerTab")
 
-    def select_name_preset_label(self):
-        label = self.main_view.get_timer_name_preset()
-        timeout = 0
-        while not label.focus and timeout < 10:
-            self.pointing_device.click_object(label)
-            sleep(1)
-            timeout += 1
-        return label
-
     def delete_first_preset(self):
-        self.main_view.drag_page_up("TimerPage", self)
+        self.main_view.drag_page_up("TimerPage")
 
         # Delete the preset
         first_preset = self.main_view.get_first_preset_list_item()
@@ -69,13 +60,11 @@
         self.main_view.get_toolbar().click_button('addPresetButton')
 
         # Set Timer label as "test"
-        self.main_view.drag_page_up("TimerPage", self)
-        label = self.select_name_preset_label()
-        self.assertThat(label.focus, Eventually(Equals(True)))
-        self.keyboard.type("test")
-        self.assertThat(label.text, Eventually(Equals("test")))
-
-        self.main_view.drag_page_down("TimerPage", self)
+        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")))
+        self.main_view.drag_page_down("TimerPage")
 
         if setTime:
             # Set timer minute
@@ -124,14 +113,14 @@
         # Create a new preset
         self.add_preset()
 
-        self.main_view.drag_page_up("TimerPage", self)
+        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)
 
-        self.main_view.drag_page_down("TimerPage", self)
+        self.main_view.drag_page_down("TimerPage")
 
         # Click to start the preset
         label = self.main_view.get_label_timer()