Merge lp:~nik90/ubuntu-clock-app/use-default-swipe-delete into lp:ubuntu-clock-app/saucy

[Nekhelesh Ramananthan]

Adds confirm to delete option to clock, alarm, timer and stopwatch. It also removes the custom swipe delete class since it is now provided by the SDK. Autopilot tests have been fixed, cleaned and ported to Autopilot 1.4. They also make more use of upstream UITK emulator functions.

This MP implements the following,

UI Change
- Adds confirm to delete option to clock, alarm, timer and stopwatch.
- It removes the custom swipe delete class since it is now provided by the SDK.

Autopilot Tests
- Ports clock app autopilot tests to 1.4 which results in less assert statements and other improvements.
- Emulator function and test cases clean up
- It also improves the testing logic of the delete_local_world_city() testcase.

2 Autopilot tests test_delete_local_world_city() and test_delete_preset() are failing due to bug https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1245651. Wait until this is fixed before merging.

Another point worth noting is that the alarm test cases have not been ported to 1.4. However the alarm tests are skipped until the Alarm features matures and is more stable. This should happen in the upcoming weeks at which point the alarm test cases will also be updated.

[Nekhelesh Ramananthan (nik90)]

Requesting nskaggs review of autopilot tests. Tests fail due to the upstream confirm_removal() function. Logs shown in http://paste.ubuntu.com/6318817/. Consistent failure in other places as well.

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

FAILED: Continuous integration, rev:253
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/84/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/1231
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/84
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/84
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/2

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This looks good, but I'm getting failures on my desktop using it ;-( I see the lab has some failures also. I'll dig in to see what's up in a minute if you believe this to be working.

The changes to get rid of "get_button_x" are good, as is the swipe to delete :-)

[Nekhelesh Ramananthan (nik90)]

I am getting failures in the tests ubuntu_clock_app.tests.test_clock.TestClock.test_add_remove_world_location(with mouse) and ubuntu_clock_app.tests.test_timer.TestTimer.test_delete_preset(with mouse) as the lab suggests. This is due to the confirm_delete() upstream function we discussed on IRC. Other tests should pass.

[Nicholas Skaggs (nskaggs)]

Let's await the fix for the upstream confirm delete issue. nik90 can you add a comment with a link to the bug once it's been filed?

review: Needs Fixing

[Nekhelesh Ramananthan (nik90)]

MP is frozen until https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1245651 is fixed. Until then porting is autopilot 1.4 is being implemented.

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

FAILED: Continuous integration, rev:259
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/87/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/87/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/87/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/5

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/use-default-swipe-delete]

260. By Nekhelesh Ramananthan on 2013-11-07

Added an additional assert statement to ensure that world city list is available before returning it

261. By Nekhelesh Ramananthan on 2013-11-07

reverted previous commit

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

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

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:261
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/92/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/94
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/92
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/92
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/10

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

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/use-default-swipe-delete]

262. By Nekhelesh Ramananthan on 2013-11-07

Fixed add local city test failure

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

FAILED: Continuous integration, rev:262
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/95/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/97
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/95
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/95
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/13

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:262
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/98/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/113
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/98
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/98
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/16

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:262
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/99/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/125
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/99
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/99
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/17

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:262
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/100/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/150
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/100
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/100
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/18

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Leo says the emulator has landed and thus this should work very shortly :-) Perhaps tomorrow :-)

[Nekhelesh Ramananthan (nik90)]

Yup it landed 20 hours ago. Waiting on the update to land in the jenkins machine :-).

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

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

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

review: Approve

=== modified file 'alarm/AlarmPage.qml'
--- alarm/AlarmPage.qml	2013-10-26 13:55:35 +0000
+++ alarm/AlarmPage.qml	2013-11-07 16:34:52 +0000
@@ -217,14 +217,7 @@
 
                     selected: listSavedAlarm.currentIndex == index
                     removable: true
-
-                    // TODO: Replace SwipeDelete custom component with SDK default component. Ensure that bugs
-                    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1241506, https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1242089
-                    // and https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1236464 are fixed beforehand.
-                    backgroundIndicator: SwipeDelete {
-                        id: swipeDelete
-                        state: swipingState
-                    }
+                    confirmRemoval: true
 
                     onItemRemoved: {
                         var alarm = alarmModel.get(index)

=== modified file 'clock/ClockPage.qml'
--- clock/ClockPage.qml	2013-11-01 16:10:28 +0000
+++ clock/ClockPage.qml	2013-11-07 16:34:52 +0000
@@ -214,6 +214,7 @@
                 currentIndex: -1
 
                 delegate: ListItem.Standard {
+                    objectName: "savedworldcity" + index
                     Label {
                         text: cityName
                         objectName: "city_name"
@@ -231,18 +232,9 @@
 
                     selected: listWorldClocks.currentIndex == index
                     removable: true
-
-                    // TODO: Replace SwipeDelete custom component with SDK default component. Ensure that bugs
-                    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1241506, https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1242089
-                    // and https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1236464 are fixed beforehand.
-                    backgroundIndicator: SwipeDelete {
-                        id: swipeDelete
-                        state: swipingState
-                    }
-
-                    onItemRemoved: {
-                        worldModel.removePreset(index);
-                    }
+                    confirmRemoval: true
+
+                    onItemRemoved: worldModel.removePreset(index);
                 }
             }
         }

=== modified file 'clock/WorldClock.qml'
--- clock/WorldClock.qml	2013-10-25 04:33:48 +0000
+++ clock/WorldClock.qml	2013-11-07 16:34:52 +0000
@@ -126,6 +126,7 @@
             section.labelPositioning: ViewSection.InlineLabels
 
             delegate: ListItem.Base {
+                objectName: "worldcity" + index
                 visible: !errorMessage.visible
                 height: adminName || adminName2 ? units.gu(8) : units.gu(6)
                 Column {

=== removed file 'common/SwipeDelete.qml'
--- common/SwipeDelete.qml	2013-07-20 07:54:03 +0000
+++ common/SwipeDelete.qml	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2013 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
- * published by the Free Software Foundation.
- *
- * This program 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/>.
- *
- * Authored by: Nekhelesh Ramananthan <[e-mail]>
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-// Qml element to customize list item swipe behavior.
-Rectangle {
-    id: swipeBackgroundItem
-
-    anchors.fill: parent
-    color: Theme.palette.normal.base;
-
-    Image {
-        id: swipeDeleteIcon
-
-        property int slidingMargin: units.gu(12)
-
-        anchors { verticalCenter: parent.verticalCenter; left: parent.left; right: parent.right }
-        verticalAlignment: Image.AlignVCenter        
-        fillMode: Image.Pad
-    }
-
-    Label {
-        id: swipeBackgroundText
-
-        property int slidingMargin: units.gu(3)
-
-        anchors.fill: parent
-        verticalAlignment: Text.AlignVCenter
-        color: Theme.palette.normal.baseText
-        fontSize: "large"
-    }
-
-    states: [
-        State {
-            name: "SwipingRight"
-            PropertyChanges { target: swipeBackgroundText; anchors.rightMargin: swipeBackgroundText.slidingMargin
-                anchors.leftMargin: 0; horizontalAlignment: Text.AlignRight; text: i18n.tr("Delete") }
-            PropertyChanges { target: swipeDeleteIcon; anchors.rightMargin: swipeDeleteIcon.slidingMargin
-                anchors.leftMargin: 0; horizontalAlignment: Image.AlignRight; source: Qt.resolvedUrl("../images/trash_icon.png")}
-        },
-
-        State {
-            name: "SwipingLeft"
-            PropertyChanges { target: swipeBackgroundText; anchors.rightMargin: 0; anchors.leftMargin: swipeBackgroundText.slidingMargin
-                horizontalAlignment: Text.AlignLeft; text: i18n.tr("Delete") }
-            PropertyChanges { target: swipeDeleteIcon; anchors.rightMargin: 0; source: Qt.resolvedUrl("../images/trash_icon.png")
-                anchors.leftMargin: swipeDeleteIcon.slidingMargin; horizontalAlignment: Image.AlignLeft }
-        }
-    ]
-}

=== modified file 'stopwatch/LapList.qml'
--- stopwatch/LapList.qml	2013-10-26 13:55:35 +0000
+++ stopwatch/LapList.qml	2013-11-07 16:34:52 +0000
@@ -91,15 +91,10 @@
             }
             
             removable: true
-            
-            // TODO: Replace SwipeDelete custom component with SDK default component. Ensure that bugs
-            // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1241506, https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1242089
-            // and https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1236464 are fixed beforehand.
-            backgroundIndicator: SwipeDelete {
-                id: swipeDelete
-                state: swipingState
-            }
-            
+            // FIXME: Confirm removal for stopwatch is not required. However if set to false, then the SDK does not display
+            // the delete text and icon leading to the user not being aware which action is performed on swiping left/right.
+            // Reported bug at https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1242089
+            confirmRemoval: true
             onItemRemoved: lapModel.remove(index)
             
             Label {

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	2013-10-26 13:02:16 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2013-11-07 16:34:52 +0000
@@ -13,16 +13,20 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Nekhelesh Ramananthan <[e-mail]>
+#              Nicholas Skaggs <[e-mail]>
 
 from ubuntuuitoolkit import emulators as toolkit_emulators
 from autopilot.matchers import Eventually
 from testtools.matchers import Not, Is, Equals
 from time import sleep
 
-
 class MainView(toolkit_emulators.MainView):
 
+    # Common Emulator Functions    
     def _drag_page(self, page, test_case, direction):
+        """Function to drag the page up/down"""
         page_func = lambda: self.select_single(page)
         test_case.assertThat(page_func, Eventually(Not(Is(None))))
         page = self.select_single(page)
@@ -49,59 +53,58 @@
         self._drag_page(page, test_case, "down")
 
     def longpress_object(self, obj):
+        """Function to longpress an object"""
         self.pointing_device.move_to_object(obj)
         self.pointing_device.press()
         sleep(2)
         self.pointing_device.release()
 
-    #stopwatch page
-    def get_stopwatch_label(self):
-        """Returns the select for the stopwatch label"""
-        return self.select_single("Label", objectName="labelStopwatch")
-
-    def get_stopwatch_button(self):
-        """Returns the select for the stopwatch button"""
-        return self.select_single("AnalogStopwatch",
-                                  objectName="buttonStopwatch")
-
-    def get_lap_button(self):
-        """Returns the select for the lap button"""
-        return self.select_single("Button", objectName="lapButton")
-
-    def get_reset_button(self):
-        """Returns the select for the reset button"""
-        return self.select_single("ImageButton", objectName="resetButton")
-
-    def get_laps(self):
-        """Returns the select for the lap count"""
-        return self.select_single("ListModel", objectName="laps")
-
-    #timer page
-    def get_toolbar_timer(self):
-        """Returns the toolbar of timer tab"""
-        return self.select_single("ToolbarItems")
-
-    def get_toolbar_timer_button(self, button_idx):
-        """Returns a button of toolbar of timer tab"""
-        toolbar = self.select_single("ToolbarItems")
-        button = toolbar.get_children()
-        return button[button_idx]
-
-    def get_toolbar_timer_add_preset_button(self):
-        """Returns the button for add preset of toolbar of timer tab"""
-        return self.select_single('ActionItem', objectName="addPresetButton")
-
-    def get_toolbar_timer_save_preset_button(self):
-        """Returns the button for add preset of toolbar of timer tab"""
-        return self.select_single("ActionItem", objectName="savePresetButton")
-
+    # CLOCK Page Emulator Functions
+    def get_clock_page(self):
+        """Return the page containing the main clock."""
+        return self.select_single("ClockPage")
+
+    def get_time_label(self):
+        """Return the label with the timer countdown"""
+        return self.wait_select_single("Label", objectName="currentTimeLabel")
+
+    # WORLD CLOCK Page Emulator Functions
+    def get_world_cities_page(self):
+        """Return the page containing the world cities."""
+        return self.wait_select_single("WorldClock")    
+
+    def get_world_cities_list(self):
+        """Return the component containing the list of available world cities."""
+        return self.wait_select_single(objectName="worldList")
+
+    def get_city_name(self, city):
+        """Return the name of the city passed as argument"""
+        return city.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 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 self.wait_select_single("Base", objectName="worldcity0")
+
+    def select_city(self, city):
+        """Click the selected city passed as argument"""
+        self.pointing_device.click_object(city)
+
+    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_name_preset(self):
         """Returns the TextField where insert the name of the preset"""
-        return self.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"""
-        return self.select_single("AnalogTouchHand", objectName="minuteHand")
+        return self.wait_select_single("AnalogTouchHand", objectName="minuteHand")
 
     def get_preset_label_text(self):
         """Returns the label with the preset text"""
@@ -115,22 +118,40 @@
 
     def get_label_timer(self):
         """Return the label with the timer countdown"""
-        return self.select_single("Label", objectName="labelTimer")
+        return self.wait_select_single("Label", objectName="labelTimer")
 
     def get_first_preset_list_item(self):
         """Returns the first preset list item in the timer page."""
-        return self.select_single("Standard", objectName="preset0")
-
-    def get_time_label(self):
-        """Return the label with the timer countdown"""
-        return self.select_single("Label", objectName="currentTimeLabel")
+        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.select_single("QQuickListView").count)
-
-    #alarm page
+        return int(timer_page.wait_select_single("QQuickListView").count)
+
+    # STOPWATCH Page Emulator Functions
+    def get_stopwatch_label(self):
+        """Returns the select for the stopwatch label"""
+        return self.wait_select_single("Label", objectName="labelStopwatch")
+
+    def get_stopwatch_button(self):
+        """Returns the select for the stopwatch button"""
+        return self.wait_select_single("AnalogStopwatch",
+                                  objectName="buttonStopwatch")
+
+    def get_lap_button(self):
+        """Returns the select for the lap button"""
+        return self.wait_select_single("Button", objectName="lapButton")
+
+    def get_reset_button(self):
+        """Returns the select for the reset button"""
+        return self.wait_select_single("ImageButton", objectName="resetButton")
+
+    def get_laps(self):
+        """Returns the select for the lap count"""
+        return self.wait_select_single("ListModel", objectName="laps")
+    
+    # ALARM Page Emulator Functions
     def get_addalarm_page(self):
         """Returns the add alarm page object"""
         return self.select_single("Page", objectName="addAlarmPage")
@@ -285,25 +306,4 @@
         test_case.assertThat(lambda: self.select_single(
             "OptionSelector", objectName="RepeatSelector").selectedIndex+1,
             Eventually(Equals(occurence)))
-
-    #world clock page
-    def get_add_city_button(self):
-        """Return the button for adding a new clock location."""
-        return self.select_single(
-            "ActionItem", objectName="addCityAction")
-
-    def get_world_cities_page(self):
-        """Return the page containing the world cities."""
-        return self.select_single("WorldClock")
-
-    def get_clock_page(self):
-        """Return the page containing the main clock."""
-        return self.select_single("ClockPage")
-
-    def get_world_cities_list(self):
-        """Return the component containing the list of world cities."""
-        return self.select_single(objectName="worldList")
-
-    def get_selected_cities_list(self):
-        """Return the component containing list of selected clock locations."""
-        return self.select_single(objectName="listWorldClocks")
+    

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_alarm.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_alarm.py	2013-10-22 15:20:06 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_alarm.py	2013-11-07 16:34:52 +0000
@@ -13,6 +13,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Nicholas Skaggs <[e-mail]>
 
 """Tests for the Clock App - Alarm"""
 

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_clock.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2013-10-25 04:33:48 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2013-11-07 16:34:52 +0000
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Authored by: Renato Araujo Oliveira Filho <[e-mail]>
+#              Nekhelesh Ramananthan <[e-mail]>
 
 """
 Tests for the Clock App, main window.
@@ -54,64 +55,40 @@
         # and compare the values
         self.assertThat(label.text, Eventually(NotEquals('')))
 
-    def test_add_remove_world_location(self):
-        """It must be possible to add and remove world locations."""
+    def test_add_local_world_city(self):
+        """Test to check if adding a local listed world city works"""
 
-        self.assert_no_cities_selected()
+        # Open clock toolbar        
         self.main_view.open_toolbar()
-        self.switch_to_world_cities_page()
-        city = self.grab_first_city()
-        city_name = self.city_name_from(city)
-
-        self.select_city(city)
-
-        selected_city_name = self.city_name_from(self.selected_city())
-        self.assertThat(selected_city_name, Eventually(Equals(city_name)))
-
-        delete_button = self.enable_delete_button()
-        self.pointing_device.click_object(delete_button)
-        self.assert_no_cities_selected()
-
-    def city_name_from(self, city):
-        return city.select_single('Label', objectName='city_name').text
-
-    def enable_delete_button(self):
-        selected_city = self.selected_city()
-        x, y, w, h = selected_city.globalRect
-
-        tx = x + (w / 8)
-        ty = y + (h / 2)
-
-        self.pointing_device.drag(tx, ty, w - w / 8, ty)
-        delete_button = selected_city.select_many("QQuickItem")[2]
-        self.assertThat(lambda: delete_button, Eventually(NotEquals(None)))
-
-        return delete_button
-
-    def switch_to_world_cities_page(self):
-        add_city_button = self.main_view.get_add_city_button()
-        self.pointing_device.click_object(add_city_button)
-        self.assertThat(self.main_view.get_world_cities_page, Eventually(NotEquals(None)))
-
-    def grab_first_city(self):
-        self.assertThat(self.main_view.get_world_cities_list, Eventually(NotEquals(None)))
-        cities_list = self.main_view.get_world_cities_list()
-        self.assertThat(lambda: not cities_list.select_many("Base"), Eventually(Equals(False)))
-
-        return cities_list.select_many("Base")[0]
-
-    def select_city(self, city):
-        self.pointing_device.click_object(city)
-        self.assertThat(self.main_view.get_clock_page, Eventually(NotEquals(None)))
-
-    def selected_city(self):
-        self.assertThat(self.main_view.get_selected_cities_list, Eventually(NotEquals(None)))
-        selected_cities = self.main_view.get_selected_cities_list()
-        self.assertThat(lambda: not selected_cities.select_many("Standard"), Eventually(Equals(False)))
-
-        return selected_cities.select_many("Standard")[0]
-
-    def assert_no_cities_selected(self):
+
+        # Click add city toolbar button
+        self.main_view.get_toolbar().click_button('addCityAction')
+
+        # Click on first city in the list shown and ensure that it was saved
+        city = self.main_view.grab_first_listed_city()
+        city_name = self.main_view.get_city_name(city)
+        self.main_view.select_city(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)))
+
+    def test_delete_local_world_city(self):
+        """Test to check if deleting a saved local world city works"""
+
+        # Add a local world city        
+        self.test_add_local_world_city()
+
+        # 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)
-        cities = self.main_view.get_selected_cities_list()
-        self.assertThat(cities.count, Eventually(Equals(0)))
+
+        # 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()
+        saved_city.swipe_to_delete()
+        saved_city.confirm_removal()
+
+        # Assert deletion of saved city
+        cities = self.main_view.get_saved_cities_list()
+        self.assertThat(
+            cities.count,
+            Eventually(Equals(old_saved_city_count - 1)))

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py	2013-08-14 02:07:36 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py	2013-11-07 16:34:52 +0000
@@ -35,8 +35,7 @@
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
 
-        #move to stopwatch tab
-        #ignoring the emulator tab functions until fixed
+        # Move to stopwatch tab
         self.main_view.switch_to_tab("StopwatchTab")
 
     def tearDown(self):
@@ -45,15 +44,11 @@
     def test_start_stop_reset_stopwatch(self):
         """Test to check the proper functioning of the start/stop/reset of stopwatch"""
 
-        self.assertThat(self.main_view.get_stopwatch_button, Eventually(Not(Is(None))))
         start_stop_button = self.main_view.get_stopwatch_button()
-        self.assertThat(self.main_view.get_stopwatch_label, Eventually(Not(Is(None))))
         stopwatch_label = self.main_view.get_stopwatch_label()
-        self.assertThat(self.main_view.get_reset_button, Eventually(Not(Is(None))))
         reset_button = self.main_view.get_reset_button()
 
-        # Press the start button to start the stopwatch
-        self.assertThat(self.main_view.get_stopwatch_label, Eventually(Not(Is(None))))
+        # Press the start button to start the stopwatch and check if the stopwatch starts ticking
         stopwatch_label_before = self.main_view.get_stopwatch_label().text
         self.pointing_device.click_object(start_stop_button)
         self.assertThat(stopwatch_label.text, Eventually(NotEquals("00:00.0")))

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_timer.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2013-10-16 18:54:28 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_timer.py	2013-11-07 16:34:52 +0000
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Authored by: Riccardo Padovani <[e-mail]>
+#              Nekhelesh Ramananthan <[e-mail]>
 
 """Tests for the Clock App - Timer"""
 
@@ -36,7 +37,7 @@
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
 
-        #move to timer tab
+        # Move to Timer tab
         self.main_view.switch_to_tab("TimerTab")
 
     def select_name_preset_label(self):
@@ -55,13 +56,10 @@
         self.main_view.open_toolbar()
 
         # Click the add preset button
-        self.assertThat(self.main_view.get_toolbar_timer_add_preset_button, Eventually(Not(Is(None))))
-        add_preset_button = self.main_view.get_toolbar_timer_add_preset_button()
-        self.pointing_device.click_object(add_preset_button)
+        self.main_view.get_toolbar().click_button('addPresetButton')
 
-        # Write in the label
+        # Set Timer label as "test"
         self.main_view.drag_page_up("TimerPage", self)
-        self.assertThat(self.main_view.get_timer_name_preset, Eventually(Not(Is(None))))
         label = self.select_name_preset_label()
         self.assertThat(label.focus, Eventually(Equals(True)))
         self.keyboard.type("test")
@@ -69,10 +67,8 @@
 
         self.main_view.drag_page_down("TimerPage", self)
 
-        # Set minute
-        self.assertThat(self.main_view.get_timer_minute_hand, Eventually(Not(Is(None))))
+        # Set timer minute
         minute = self.main_view.get_timer_minute_hand()
-
         timeout = 0
         while label.focus == True and timeout < 10:
             TimerLabel = self.main_view.get_label_timer()
@@ -83,49 +79,15 @@
         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(self.main_view.get_num_of_presets, Eventually(Not(Is(None))))
-        num_of_presets_old = self.main_view.get_num_of_presets()
-
-        # Press "Save" toolbar button
-        self.assertThat(self.main_view.get_toolbar_timer_save_preset_button, Eventually(Not(Is(None))))
-
-        #make sure preset is saved, and shows up properly
-        timeout = 0
-        while self.main_view.get_num_of_presets() != num_of_presets_old + 1 and timeout < 10:
-            save_preset_button = self.main_view.get_toolbar_timer_save_preset_button()
-            self.pointing_device.click_object(save_preset_button)
-            sleep(1)
-            timeout += 1
-
-    def test_delete_preset(self):
-        """Test if the swipe of a preset deletes it"""
-
-        # Create a new preset
-        self.test_add_preset()
-
-        self.assertThat(self.main_view.get_num_of_presets, Eventually(Not(Is(None))))
-        num_of_presets_old = self.main_view.get_num_of_presets()
-        self.assertThat(self.main_view.get_first_preset_list_item, Eventually(Not(Is(None))))
-
-        self.main_view.drag_page_up("TimerPage", self)
-
-        # Delete the preset
-        timeout = 0
-        while self.main_view.get_num_of_presets() != num_of_presets_old - 1 and timeout < 10:
-            first_preset = self.main_view.get_first_preset_list_item()
-            x, y, w, h = first_preset.globalRect
-            tx = x + (w / 8)
-            ty = y + (h / 2)
-            self.pointing_device.drag(tx, ty, w - w / 8, ty)
-            sleep(1)
-            timeout += 1
-
-        # Check has been deleted
+        self.pointing_device.drag(tx, ty - (h / 4), tx + (w / 2), ty + (h / 2))        
+
+        # Press "Save" toolbar button and ensure that preset is saved and check that
+        # the timer preset has been added.
+        num_of_presets_old = self.main_view.get_num_of_presets()
+        self.main_view.get_toolbar().click_button('savePresetButton')
         self.assertThat(
             self.main_view.get_num_of_presets,
-            Eventually(Equals(num_of_presets_old - 1)))
+            Eventually(Equals(num_of_presets_old + 1)))
 
     def test_run_preset(self):
         """Tests if a preset can runs"""
@@ -133,26 +95,39 @@
         # Create a new preset
         self.test_add_preset()
 
+        self.main_view.drag_page_up("TimerPage", self)
+
         # Click to select the preset
-        self.assertThat(self.main_view.get_first_preset_list_item, Eventually(Not(Is(None))))
-        first_preset = self.main_view.get_first_preset_list_item()
-
-        self.main_view.drag_page_up("TimerPage", self)
+        # 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)
 
         # Click to start the preset
-        self.assertThat(self.main_view.get_label_timer, Eventually(Not(Is(None))))
-        timeout = 0
-        while self.main_view.get_label_timer() is None and timeout < 10:
-            label = self.main_view.get_label_timer()
-            self.pointing_device.click_object(label)
-            sleep(1)
-            timeout += 1
+        label = self.main_view.get_label_timer()
+        self.pointing_device.click_object(label)
 
         # Check if timer is started
-        self.assertThat(self.main_view.get_label_timer, Eventually(Not(Is(None))))
-        label_timer = self.main_view.get_label_timer()
-        self.pointing_device.click_object(label_timer)
-        self.assertThat(label_timer.text, Eventually(NotEquals("21:00")))
+        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.test_add_preset()
+
+        num_of_presets_old = self.main_view.get_num_of_presets()
+        self.main_view.drag_page_up("TimerPage", self)
+
+        # Delete the preset
+        # FIXME: Delete the preset that was added instead of always deleting the first preset
+        first_preset = self.main_view.get_first_preset_list_item()
+        first_preset.swipe_to_delete()
+        first_preset.confirm_removal()
+
+        # Check that the timer preset has been deleted
+        self.assertThat(
+            self.main_view.get_num_of_presets,
+            Eventually(Equals(num_of_presets_old - 1)))
+    

=== modified file 'timer/PresetList.qml'
--- timer/PresetList.qml	2013-10-26 13:48:27 +0000
+++ timer/PresetList.qml	2013-11-07 16:34:52 +0000
@@ -87,14 +87,7 @@
             
             selected: listTimerPreset.currentIndex == index
             removable: true
-            
-            // TODO: Replace SwipeDelete custom component with SDK default component. Ensure that bugs
-            // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1241506, https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1242089
-            // and https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1236464 are fixed beforehand.
-            backgroundIndicator: SwipeDelete {
-                id: swipeDelete
-                state: swipingState
-            }
+            confirmRemoval: true
             
             onItemRemoved: {
                 presetModel.removePreset(index);