Merge lp:~nik90/ubuntu-clock-app/edit-alarm-qml-tests into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

- Added edit alarm qml tests
- Added a test utils library which includes commonly used test functions and helps reduce code duplication

Added edit alarm qml tests to prevent future regressions. I also added a test utils library which includes commonly used test functions and helps reduce code duplication.

Note: I numbered the tests to ensure that create_alarm test to run first before edit_alarm test. To be honest, it shouldn't matter which order the tests are run in, but I thought it just makes sense.

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

PASSED: Continuous integration, rev:145
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/557/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/896
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/896/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/edit-alarm-qml-tests]

146. By Nekhelesh Ramananthan on 2014-10-11

Added a test helper libary to house commonly used test functions to avoid duplication

147. By Nekhelesh Ramananthan on 2014-10-11

removed unnecessary return statement

148. By Nekhelesh Ramananthan on 2014-10-11

Added some comments

149. By Nekhelesh Ramananthan on 2014-10-11

More code refactoring

150. By Nekhelesh Ramananthan on 2014-10-11

Updated debian changelog

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

PASSED: Continuous integration, rev:150
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/558/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/897
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/897/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Leo Arias (elopio)]

85 + Usage:
86 + Utils {
87 + id: testUtils
88 + }

I find it weird to import the test utilities this way. Is it a common practice in QML?
I'm wondering if this would be better as the parent test case. Name the file ClockTestCase.qml, and then instead of UbuntuTestCase, you make all your tests extend ClockTestCase.
That has some downsides, because we will be making something like an inheritance hierarchy, which sometimes is bad. What you have here is more like composition, but feels weird because of the declarative paradigm. I'm not sure, just throwing the idea here. Feel free to do it however you think it's best.

102 + testUtils._pressHeaderButton(header, "addAlarmAction")

You have a typo here. Now it doesn't have the leading underscore.

144 + // Click on the clear button shown on the right
145 + mouseClick(textfield, textfield.width - units.gu(2), centerOf(textfield).y)

Wouldn't it be better to find the clear button and then click its center? It should have an objectName.

230 + function _confirmListItemValue(page, objectName, expectedValue, message) {

Instead of confirm, we generally use the word "assert". check or compare also sound better than confirm to me.

321 + compare(Qt.formatTime(alarmTimePicker.date), oldtime, "Time read from the saved alarm is incorrect")
324 + _confirmListItemValue(addAlarmPage, "alarmRepeat", oldrepeat, "Alarm repeat options read from the saved alarm is incorrect")
332 + _confirmListItemValue(addAlarmPage, "alarmLabel", oldlabel, "Alarm name read from the saved alarm is incorrect")
340 + _confirmListItemValue(addAlarmPage, "alarmSound", "Celestial", "Alarm sound read from the saved alarm is incorrect")

Generally, you shouldn't do assertions in the middle of the test steps. Why would the alarm now have an incorrect value? If you have a test that makes sure that the alarm was created correctly where you are already doing these assertions, there's no need to repeat them here. We can assume that the alarm creation is a tested unit of code that will always work. If you haven't done those assertions on a previous test or you can't rely on the alarm creation tests to fail if some of your assumptions for this test break, then you need to work a little more on the alarm creation tests.

391 + #NOTE: This wait is required since as per the design after an alarm is edited and saved
[...]

Awesome, great comment! Bonus points.

403 + _deleteAlarm("Alarm Edited", "Weekends", Qt.formatTime(newDate), true)

I saw this on a previous branch but forgot to comment about it. There's a chance that it won't run, if a previous step fails. So you could end up with an alarm that affects the rest of the tests. As we don't have an addCleanup in QML tests, is there an easy way to delete all the existing alarms (if any) on the cleanup function?
Or, are you planning to mock the alarm data in the short term, so is it better to spend the time doing the mock instead of improving the cleanup?

This looks great. As always, many things are just opinions so feel free to disagree. I just would like to see the typo fixed; and the assertions at the end of a test instead of in the middle of the steps. That is, unless you have a good reason to do...

review: Needs Fixing

[lp:~nik90/ubuntu-clock-app/edit-alarm-qml-tests]

151. By Nekhelesh Ramananthan on 2014-10-14

Renamed Utils to ClockTestCase and made test case derive from that class

152. By Nekhelesh Ramananthan on 2014-10-14

Fixed example comment in ClockTestCase

153. By Nekhelesh Ramananthan on 2014-10-14

removed QtTest and UbuntuTestCase imports in test files since it is already done by ClockTestCase

154. By Nekhelesh Ramananthan on 2014-10-14

Improved clear text field function and removed the hacky way of clearing textfields

155. By Nekhelesh Ramananthan on 2014-10-14

renamed confirm listvalue and confirm alarm creation functions to assert as recommended by elopio

156. By Nekhelesh Ramananthan on 2014-10-14

explained better why the alarm values are verified during the edit alarm test

[Nekhelesh Ramananthan (nik90)]

@elopio, thnx a lot for the detailed review. All the points you raised were very valuable and I have addressed them in the later revisions.

> 85 + Usage:
> 86 + Utils {
> 87 + id: testUtils
> 88 + }
>
> I find it weird to import the test utilities this way. Is it a common practice
> in QML?
> I'm wondering if this would be better as the parent test case. Name the file
> ClockTestCase.qml, and then instead of UbuntuTestCase, you make all your tests
> extend ClockTestCase.
> That has some downsides, because we will be making something like an
> inheritance hierarchy, which sometimes is bad. What you have here is more like
> composition, but feels weird because of the declarative paradigm. I'm not
> sure, just throwing the idea here. Feel free to do it however you think it's
> best.

Excellent Idea! To be honest I am unable to think why I chose the Utils{} approach rather than extending the UbuntuTestCase{} to ClockTestCase{}.

> 144 + // Click on the clear button shown on the right
> 145 + mouseClick(textfield, textfield.width - units.gu(2),
> centerOf(textfield).y)
>
> Wouldn't it be better to find the clear button and then click its center? It
> should have an objectName.
>

I swear I looked at the Ubuntu SDK qml test case and couldn't find it earlier. But today I found it after some more digging. Hmm with AP tests this all was written by you, while in QML I am essentially rewriting the SDK Qml Test helpers for clock app from scratch ;)

> 230 + function _confirmListItemValue(page, objectName, expectedValue,
> message) {
>
> Instead of confirm, we generally use the word "assert". check or compare also
> sound better than confirm to me.
>
> 321 + compare(Qt.formatTime(alarmTimePicker.date), oldtime, "Time read
> from the saved alarm is incorrect")
> 324 + _confirmListItemValue(addAlarmPage, "alarmRepeat", oldrepeat, "Alarm
> repeat options read from the saved alarm is incorrect")
> 332 + _confirmListItemValue(addAlarmPage, "alarmLabel", oldlabel, "Alarm
> name read from the saved alarm is incorrect")
> 340 + _confirmListItemValue(addAlarmPage, "alarmSound", "Celestial",
> "Alarm sound read from the saved alarm is incorrect")
>
> Generally, you shouldn't do assertions in the middle of the test steps. Why
> would the alarm now have an incorrect value? If you have a test that makes
> sure that the alarm was created correctly where you are already doing these
> assertions, there's no need to repeat them here. We can assume that the alarm
> creation is a tested unit of code that will always work. If you haven't done
> those assertions on a previous test or you can't rely on the alarm creation
> tests to fail if some of your assumptions for this test break, then you need
> to work a little more on the alarm creation tests.

I renamed the functions to assert..() and also explained why those assert statement are required. I am essentially try to prevent bug 1338697 from happening again. While Bug 1338697 was certainly due to an upstream revision, it affected clock app and should be detected appropriately by our qml tests. Call me paranoid when it comes to testing alarm functionality.

>
> 403 ...

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

PASSED: Continuous integration, rev:156
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/561/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/930
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/930/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/edit-alarm-qml-tests]

157. By Nekhelesh Ramananthan on 2014-10-14

merged trunk

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

PASSED: Continuous integration, rev:157
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/564/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/934
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/934/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Leo Arias (elopio)]

nik90: now the usage comment of ClockTestCase is not accurate.
on line 82 it says Utils.qml. On line 86 it says UbuntuTestCase.
I'm leaving my approval on that one, but please make the changes to the comments.

review: Approve

[lp:~nik90/ubuntu-clock-app/edit-alarm-qml-tests]

158. By Nekhelesh Ramananthan on 2014-10-14

Fixed ClockTestCase description

159. By Nekhelesh Ramananthan on 2014-10-14

Fixed another typo

=== modified file 'app/alarm/AlarmList.qml'
--- app/alarm/AlarmList.qml	2014-10-05 15:33:27 +0000
+++ app/alarm/AlarmList.qml	2014-10-14 16:01:40 +0000
@@ -129,7 +129,7 @@
 
             else {
                 pageStack.push(Qt.resolvedUrl("EditAlarmPage.qml"),
-                               {"isNewAlarm": false, "alarmIndex": index})
+                               {isNewAlarm: false, alarmIndex: index, alarmModel: alarmModel})
             }
         }
 

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2014-10-10 19:58:49 +0000
+++ app/alarm/EditAlarmPage.qml	2014-10-14 16:01:40 +0000
@@ -37,6 +37,9 @@
     // Temporary alarm used to read saved alarm and modify them
     property var tempAlarm
 
+    // Property to store the alarm model
+    property var alarmModel
+
     title: isNewAlarm ? i18n.tr("New alarm") : i18n.tr("Edit alarm")
     visible: false
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-11 18:41:14 +0000
+++ debian/changelog	2014-10-14 16:01:40 +0000
@@ -12,6 +12,8 @@
   * Synced ListItemWithActions with upstream
   * Delayed loading of AlarmModel to improve app startup time (LP: #1362140)
   * Fixed alarm page header width warning and corrected icon spacing.
+  * Added edit alarm qml tests and added a library helper which contains commonly
+    used test functions to avoid code duplication in future tests.
   * Delayed loading of xmltimezone model until add world city page is loaded and
     dynamically load/unload the jsontimezone model only when necessary.
 

=== modified file 'tests/unit/CMakeLists.txt'
--- tests/unit/CMakeLists.txt	2014-10-05 21:22:25 +0000
+++ tests/unit/CMakeLists.txt	2014-10-14 16:01:40 +0000
@@ -42,3 +42,9 @@
     tst_alarmUtils.qml
 )
 add_custom_target(tst_QmlFiles ALL SOURCES ${QML_TST_FILES})
+
+set(QML_TST_UTILS
+    ClockTestCase.qml
+)
+
+add_custom_target(tst_Utils ALL SOURCES ${QML_TST_UTILS})

=== added file 'tests/unit/ClockTestCase.qml'
--- tests/unit/ClockTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/ClockTestCase.qml	2014-10-14 16:01:40 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This file is part of Ubuntu Clock App
+ *
+ * Ubuntu Clock App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtTest 1.0
+import QtQuick 2.3
+import Ubuntu.Test 1.0
+
+/*
+ ClockTestCase extends UbuntuTestCase with a set of commonly used test functions
+ like pressing header buttons and help reduce code duplication. Ideally several
+ of these functions can be pushed upstream into the Ubuntu SDK. That should happen
+ as when time permits.
+
+ Usage:
+        ClockTestCase {
+            id: sampleTest
+            name: "SampleTest"
+
+            when: windowShown
+
+            function initTestCase() {
+               header = findChild(mainView, "MainView_Header")
+               backButton = findChild(alarmTest.header, "customBackButton")
+            }
+
+            function test_something() {
+               pressHeaderButton(header, "addAlarmAction")
+            }
+       }
+*/
+
+UbuntuTestCase {
+    id: testUtils
+
+    function pressHeaderButton(header, objectName) {
+        var headerButton = findChild(header, objectName + "_header_button")
+        mouseClick(headerButton, centerOf(headerButton).x, centerOf(headerButton).y)
+    }
+
+    function pressButton(objectName) {
+        mouseClick(objectName, centerOf(objectName).x, centerOf(objectName).y)
+    }
+
+    function getPage(pageStack, objectName) {
+        var page = findChild(pageStack, objectName)
+        waitForRendering(page)
+        return page
+    }
+
+    function swipeToDeleteItem(item)
+    {
+        var startX = item.threshold
+        var startY = item.height / 2
+        var endX = item.width
+        var endY = startY
+        mousePress(item, startX, startY)
+        mouseMoveSlowly(item,
+                        startX, startY,
+                        endX - startX, endY - startY,
+                        10, 100)
+        mouseRelease(item, endX, endY)
+        mouseClick(item, startX, startY)
+    }
+
+    function clearTextField(textfield) {
+        var clearButton = findChild(textfield, "clear_button")
+        /*
+         This check is required since if the textfield is read-only or does
+         not have input focus then the clearButton may not be shown resulting
+         in the text field not being cleared.
+        */
+        if (clearButton.visible) {
+            pressButton(clearButton)
+        } else {
+            console.log("Clear Button not visible. Hence textfield cannot be cleared.")
+        }
+    }
+}

=== modified file 'tests/unit/tst_alarm.qml'
--- tests/unit/tst_alarm.qml	2014-10-10 21:24:28 +0000
+++ tests/unit/tst_alarm.qml	2014-10-14 16:01:40 +0000
@@ -17,9 +17,7 @@
  */
 
 import QtQuick 2.3
-import QtTest 1.0
 import DateTime 1.0
-import Ubuntu.Test 1.0
 import Ubuntu.Components 1.1
 import "../../app/alarm"
 
@@ -63,7 +61,7 @@
         id: alarmPage
     }
 
-    UbuntuTestCase {
+    ClockTestCase {
         id: alarmTest
         name: "AlarmTest"
 
@@ -79,31 +77,11 @@
 
         // *************  Helper Functions ************
 
-        function _pressAddAlarmHeaderButton() {
-            var addButton = findChild(header, "addAlarmAction" + "_header_button")
-            mouseClick(addButton, centerOf(addButton).x, centerOf(addButton).y)
-        }
-
-        function _pressSaveAlarmHeaderButton() {
-            var saveButton = findChild(alarmTest.header, "saveAlarmAction" + "_header_button")
-            mouseClick(saveButton, centerOf(saveButton).x, centerOf(saveButton).y)
-        }
-
-        function _pressBackButton() {
-            mouseClick(backButton, centerOf(backButton).x, centerOf(backButton).y)
-        }
-
         function _pressListItem(page, objectName) {
             var listitem = findChild(page, objectName)
             mouseClick(listitem, centerOf(listitem).x, centerOf(listitem).y)
         }
 
-        function _getPage(objectName) {
-            var page = findChild(pageStack, objectName)
-            waitForRendering(page)
-            return page
-        }
-
         function _waitForPickerToStopMoving(picker) {
             waitForRendering(picker);
             tryCompareFunction(function(){return picker.moving}, false);
@@ -112,7 +90,6 @@
         function _setAlarmTime(picker, time) {
             picker.date = time
             _waitForPickerToStopMoving(picker)
-            return picker.date
         }
 
         function _setAlarmRepeatDays(alarmRepeatPage, days) {
@@ -136,8 +113,7 @@
 
         function _setAlarmLabel(alarmLabelPage, label) {
             var alarmLabel = findChild(alarmLabelPage, "labelEntry")
-            mouseClick(alarmLabel, alarmLabel.width - units.gu(2), centerOf(alarmLabel).y)
-            mouseClick(alarmLabel, alarmLabel.width - units.gu(2), centerOf(alarmLabel).y)
+            clearTextField(alarmLabel)
             typeString(label)
         }
 
@@ -167,25 +143,15 @@
             return -1;
         }
 
-        function _confirmAlarmCreation(label, repeat, time, status) {
+        function _assertAlarmCreation(label, repeat, time, status) {
             if (findAlarm(label, repeat, time, status) === -1) {
                 fail("No Alarm found with the specified characteristics")
             }
         }
 
-        function _swipeToDeleteItem(item)
-        {
-            var startX = item.threshold
-            var startY = item.height / 2
-            var endX = item.width
-            var endY = startY
-            mousePress(item, startX, startY)
-            mouseMoveSlowly(item,
-                            startX, startY,
-                            endX - startX, endY - startY,
-                            10, 100)
-            mouseRelease(item, endX, endY)
-            mouseClick(item, startX, startY)
+        function _assertListItemValue(page, objectName, expectedValue, message) {
+            var listitem = findChild(page, objectName)
+            compare(listitem.subText, expectedValue, message)
         }
 
         function _deleteAlarm(label, repeat, time, status) {
@@ -196,50 +162,108 @@
             var alarmObject = findChild(alarmsList, "alarm"+index)
 
             if (index !== -1) {
-                _swipeToDeleteItem(alarmObject)
+                swipeToDeleteItem(alarmObject)
             }
 
             tryCompare(alarmsList, "count", oldCount-1, 10000, "Alarm count did not decrease after deleting the alarm")
         }
 
         function _setAlarm(label, repeat, time) {
-            _pressAddAlarmHeaderButton()
+            pressHeaderButton(header, "addAlarmAction")
 
             var addAlarmPage = findChild(pageStack, "AddAlarmPage")
             waitForRendering(addAlarmPage)
 
+            // Set the alarm time
             var alarmTimePicker = findChild(pageStack, "alarmTime")
-            var date = _setAlarmTime(alarmTimePicker, time)
+            _setAlarmTime(alarmTimePicker, time)
 
+            // Set the alarm repeat options
             _pressListItem(addAlarmPage, "alarmRepeat")
-            var alarmRepeatPage = _getPage("alarmRepeatPage")
+            var alarmRepeatPage = getPage(pageStack, "alarmRepeatPage")
             _setAlarmRepeatDays(alarmRepeatPage, repeat)
-            _pressBackButton()
+            pressButton(backButton)
 
             waitForRendering(addAlarmPage)
 
+            // Set the alarm label
             _pressListItem(addAlarmPage, "alarmLabel")
-            var alarmLabelPage = _getPage("alarmLabelPage")
+            var alarmLabelPage = getPage(pageStack, "alarmLabelPage")
             _setAlarmLabel(alarmLabelPage, label)
-            _pressBackButton()
-
-            waitForRendering(addAlarmPage)
-
-            _pressListItem(addAlarmPage, "alarmSound")
-            var alarmSoundPage = _getPage("alarmSoundPage")
-            _setAlarmSound(alarmSoundPage)
-            _pressBackButton()
-
-            waitForRendering(addAlarmPage)
-
-            _pressSaveAlarmHeaderButton()
+            pressButton(backButton)
+
+            waitForRendering(addAlarmPage)
+
+            // Set the alarm sound
+            _pressListItem(addAlarmPage, "alarmSound")
+            var alarmSoundPage = getPage(pageStack, "alarmSoundPage")
+            _setAlarmSound(alarmSoundPage)
+            pressButton(backButton)
+
+            waitForRendering(addAlarmPage)
+
+            pressHeaderButton(header, "saveAlarmAction")
+
+            waitForRendering(alarmPage)
+        }
+
+        function _editAlarm(oldlabel, oldrepeat, oldtime, status, newlabel, newrepeat, newtime) {
+            // Find the index of the alarm which needs to be edited
+            var alarmIndex = findAlarm(oldlabel, oldrepeat, oldtime, status)
+
+            if (alarmIndex === -1) {
+                fail("Cannot find saved alarm to edit")
+            }
+
+            // Press the alarm to be edited
+            var alarmsList = findChild(alarmPage, "alarmListView")
+            var alarmObject = findChild(alarmsList, "alarm"+alarmIndex)
+            mouseClick(alarmObject, centerOf(alarmObject).x, centerOf(alarmObject).y)
+
+            /*
+             Proceed to verify the alarm read is correct and then set new values.
+             The values are verified after the alarm is read from the alarm model
+             to prevent regressions like http://pad.lv/1338697 in the future.
+            */
+            var addAlarmPage = findChild(pageStack, "AddAlarmPage")
+            waitForRendering(addAlarmPage)
+
+            var alarmTimePicker = findChild(pageStack, "alarmTime")
+            compare(Qt.formatTime(alarmTimePicker.date), oldtime, "Time read from the saved alarm is incorrect")
+            _setAlarmTime(alarmTimePicker, newtime)
+
+            _assertListItemValue(addAlarmPage, "alarmRepeat", oldrepeat, "Alarm repeat options read from the saved alarm is incorrect")
+            _pressListItem(addAlarmPage, "alarmRepeat")
+            var alarmRepeatPage = getPage(pageStack, "alarmRepeatPage")
+            _setAlarmRepeatDays(alarmRepeatPage, newrepeat)
+            pressButton(backButton)
+
+            waitForRendering(addAlarmPage)
+
+            _assertListItemValue(addAlarmPage, "alarmLabel", oldlabel, "Alarm name read from the saved alarm is incorrect")
+            _pressListItem(addAlarmPage, "alarmLabel")
+            var alarmLabelPage = getPage(pageStack, "alarmLabelPage")
+            _setAlarmLabel(alarmLabelPage, newlabel)
+            pressButton(backButton)
+
+            waitForRendering(addAlarmPage)
+
+            _assertListItemValue(addAlarmPage, "alarmSound", "Celestial", "Alarm sound read from the saved alarm is incorrect")
+            _pressListItem(addAlarmPage, "alarmSound")
+            var alarmSoundPage = getPage(pageStack, "alarmSoundPage")
+            _setAlarmSound(alarmSoundPage)
+            pressButton(backButton)
+
+            waitForRendering(addAlarmPage)
+
+            pressHeaderButton(header, "saveAlarmAction")
 
             waitForRendering(alarmPage)
         }
 
         // *************  Test Functions ************
 
-        function test_createAlarm_data() {
+        function test_01_createAlarm_data() {
             return [
                         {tag: "Weekday Alarms",   name: "Weekday Alarm",    repeat: [0,1,2,3,4], repeatLabel: "Weekdays"},
                         {tag: "Weekend Alarms",   name: "Weekend Alarm",    repeat: [5,6],       repeatLabel: "Weekends"},
@@ -248,14 +272,14 @@
         }
 
         // Test to check if creating an alarm works as expected
-        function test_createAlarm(data) {
+        function test_01_createAlarm(data) {
             var date = new Date()
             date.setHours((date.getHours() + 10) % 24)
             date.setMinutes((date.getMinutes() + 40) % 60)
             date.setSeconds(0)
 
             _setAlarm(data.name, data.repeat, date)
-            _confirmAlarmCreation(data.name, data.repeatLabel, Qt.formatTime(date), true)
+            _assertAlarmCreation(data.name, data.repeatLabel, Qt.formatTime(date), true)
 
             /*
              #FIXME: This won't be required once we mock up alarm data. Until
@@ -263,5 +287,37 @@
             */
             _deleteAlarm(data.name, data.repeatLabel, Qt.formatTime(date), true)
         }
+
+        // Test to check if editing an alarm and saving it works as expected
+        function test_02_editAlarm() {
+            var date = new Date()
+            date.setHours((date.getHours() + 10) % 24)
+            date.setMinutes((date.getMinutes() + 40) % 60)
+            date.setSeconds(0)
+
+            _setAlarm("Test Edit Alarm", [0,1,2,3,4], date)
+
+            var newDate = new Date()
+            newDate.setHours((newDate.getHours() + 5) % 24)
+            newDate.setMinutes((newDate.getMinutes() + 15) % 60)
+            newDate.setSeconds(0)
+
+            _editAlarm("Test Edit Alarm", "Weekdays", Qt.formatTime(date), true, "Alarm Edited", [5,6], newDate)
+
+            /*
+             #NOTE: This wait is required since as per the design after an alarm is edited and saved
+             it shows the remaining time to that alarm and then after 5 secs shows the alarm
+             frequency. Hence we need to wait for 5 seconds before confirming alarm creation.
+            */
+            wait(6000)
+
+            _assertAlarmCreation("Alarm Edited", "Weekends", Qt.formatTime(newDate), true)
+
+            /*
+             #FIXME: This won't be required once we mock up alarm data. Until
+             then we need to delete alarms to cleanup after the tests.
+            */
+            _deleteAlarm("Alarm Edited", "Weekends", Qt.formatTime(newDate), true)
+        }
     }
 }

=== modified file 'tests/unit/tst_alarmLabel.qml'
--- tests/unit/tst_alarmLabel.qml	2014-09-25 11:14:24 +0000
+++ tests/unit/tst_alarmLabel.qml	2014-10-14 16:01:40 +0000
@@ -16,9 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import QtTest 1.0
-import Ubuntu.Test 1.0
+import QtQuick 2.3
 import Ubuntu.Components 1.1
 import "../../app/alarm"
 
@@ -38,7 +36,7 @@
         alarm: _alarm
     }
 
-    UbuntuTestCase {
+    ClockTestCase {
         id: alarmLabelPageTest
         name: "AlarmLabelPage"
 
@@ -55,14 +53,6 @@
             backButton = findChild(header, "customBackButton")
         }
 
-        function clearTextField(textfield) {
-            // Get textfield focus by clicking once
-            mouseClick(textfield, textfield.width - units.gu(2), textfield.height/2)
-
-            // Click on the clear button shown on the right
-            mouseClick(textfield, textfield.width - units.gu(2), textfield.height/2)
-        }
-
         /*
          Test to check if the alarm label has focus true by default to ensure
          that the OSK is shown when the opens the alarm label page.