Merge lp:~carla-sella/ubuntu-clock-app/alarm-tests into lp:ubuntu-clock-app

[Carla Sella]

Autopilot alarm test for new clock app

Merge proposal for fixing click on header back button.

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

FAILED: Continuous integration, rev:31
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/61/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1104/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/61/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/61/rebuild

review: Needs Fixing (continuous-integration)

[lp:~carla-sella/ubuntu-clock-app/alarm-tests]

32. By Carla Sella on 2014-07-22

Made changes for click packages.

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

FAILED: Continuous integration, rev:32
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/62/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1106/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/62/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/62/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

During my testing, I noticed that the header button errors you got were due to timing issues. The alarm page was not fully visible before it tried clicking on the header buttons.

In the README.autopilot, can you add the following lines,

Prerequisities
==============

Install the following autopilot packages required to run the tests,
sudo apt-get install python-autopilot libautopilot-qt ubuntu-ui-toolkit-autopilot

review: Needs Fixing

[Carla Sella (carla-sella)]

Ok thank you I will try to solve the timing issues.

[lp:~carla-sella/ubuntu-clock-app/alarm-tests]

33. By Carla Sella on 2014-07-23

For merging.

34. By Carla Sella on 2014-07-25

Working on alarmListRepeater problem.

[Carla Sella (carla-sella)]

Stuck on getting count property of alarmListRepeater, I get StateNotFoundError.

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

FAILED: Continuous integration, rev:34
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/69/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1155/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/69/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/69/rebuild

review: Needs Fixing (continuous-integration)

[lp:~carla-sella/ubuntu-clock-app/alarm-tests]

35. By Carla Sella on 2014-07-25

Uncommented line.

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

FAILED: Continuous integration, rev:35
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/70/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1156/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/70/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/70/rebuild

review: Needs Fixing (continuous-integration)

[Carla Sella (carla-sella)]

Fixed the count property of alarmListRepeater issue, I will carry on with the test now.

[lp:~carla-sella/ubuntu-clock-app/alarm-tests]

36. By Carla Sella on 2014-07-25

Commit for merging.

37. By Carla Sella on 2014-07-26

Commit for merging.

38. By Carla Sella on 2014-07-26

Commit for merging.

[Carla Sella (carla-sella)]

I'm getting this error if launching clock app with autopilot launch -i Qt qmlscene ../../app/ubuntu-clock-app.qml:

file:///home/letozaf/autopilot-tests/reboot/app/worldclock/UserWorldCityList.qml:20 module "Timezone" is not installed

and this error with autopilot run -vv : http://paste.ubuntu.com/7866133/.

Had to merge otherwise could not get header addAlarmAction head button, it used to work and then didn't anymore I think after un apt-get upgrade && apt-get dist-upgrade.

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

FAILED: Continuous integration, rev:38
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/72/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1160/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/72/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/72/rebuild

review: Needs Fixing (continuous-integration)

[Victor Thompson (vthompson)]

Carla, to resolve your issue, please follow the instructions in README.developers. Mostly you'll need to do steps 2 and 3 and modify your autopilot call (I believe you might be able to do a "sudo make install" to avoid adding the "-I" portion):

1. mkdir builddir && cd builddir
2. cmake .. && make
3. autopilot launch -i Qt qmlscene ../../app/ubuntu-clock-app.qml -I ../../builddir/backend/

[Victor Thompson (vthompson)]

Please see my inline comments.

review: Needs Fixing

[lp:~carla-sella/ubuntu-clock-app/alarm-tests]

39. By Carla Sella on 2014-07-28

For merging.

40. By Carla Sella on 2014-07-28

For merging.

[Carla Sella (carla-sella)]

Thank you Victor, eveything looks fine now.
I will carry on finishing the test.

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

FAILED: Continuous integration, rev:40
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/81/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1176/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/81/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/81/rebuild

review: Needs Fixing (continuous-integration)

[lp:~carla-sella/ubuntu-clock-app/alarm-tests]

41. By Carla Sella on 2014-07-28

Test completed, only needs locale fixing.

42. By Carla Sella on 2014-07-28

Fixed pep8 and pyflakes.

43. By Carla Sella on 2014-07-28

Fixed minor things.

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

FAILED: Continuous integration, rev:43
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/82/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1178/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/82/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/82/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Hmm I notice a lot of code diff from other branches that were recently merged to trunk. Carla how do you merge trunk into your branch? This technically shouldn't show up in this MP.

[Carla Sella (carla-sella)]

I also noted something weired :(.
I do not understand why, maybe it has been a revert I made when I had some problems with the Timezone module.
So what should I do to fix this mess I made ?
Thanks.

[Nekhelesh Ramananthan (nik90)]

Can you ping me on irc later tonight when you are free? I can go over the steps with you.

[Carla Sella (carla-sella)]

Ok I will ping you tonight around 21:00 if that's ok for you.
Thanks.

[Nekhelesh Ramananthan (nik90)]

Yup that's fine :)

Unmerged revisions

43. By Carla Sella on 2014-07-28

Fixed minor things.

42. By Carla Sella on 2014-07-28

Fixed pep8 and pyflakes.

41. By Carla Sella on 2014-07-28

Test completed, only needs locale fixing.

40. By Carla Sella on 2014-07-28

For merging.

39. By Carla Sella on 2014-07-28

For merging.

38. By Carla Sella on 2014-07-26

Commit for merging.

37. By Carla Sella on 2014-07-26

Commit for merging.

36. By Carla Sella on 2014-07-25

Commit for merging.

35. By Carla Sella on 2014-07-25

Uncommented line.

34. By Carla Sella on 2014-07-25

Working on alarmListRepeater problem.

=== added file 'README.autopilot'
--- README.autopilot	1970-01-01 00:00:00 +0000
+++ README.autopilot	2014-07-28 20:36:30 +0000
@@ -0,0 +1,37 @@
+Running autopilot tests
+=======================
+
+
+Prerequisities:
+
+Install the following autopilot packages required to run the tests,
+sudo apt-get install python-autopilot libautopilot-qt ubuntu-ui-toolkit-autopilot
+
+
+
+on the desktop:
+
+from terminal:
+
+1.  Branch the code.
+    bzr branch lp:ubuntu-clock-app/reboot
+2.  Navigate to the tests/autopilot directory.
+    cd ubuntu-clock-app/reboot/tests/autopilot
+3.  run all tests.
+    $ autopilot run -vv ubuntu_clock_app
+
+    to list all tests:
+    $ autopilot list ubuntu_clock_app
+
+    To run only one test (for instance: test_add_single_type_alarm_must_add_to_alarm_list in TestAlarm.py):
+    $ autopilot run -vv ubuntu_clock_app.tests.test_alarm.TestAlarm.test_add_single_type_alarm_must_add_to_alarm_list
+
+
+
+
+on device:
+
+Using autopkg:
+
+1. navigate to the directory where the ubuntu-clock-app branch is and run:
+  $ adt-run ubuntu-clock-app --click=com.ubuntu.clock.devel --- ssh -s /usr/share/autopkgtest/ssh-setup/adb

=== modified file 'app/alarm/AlarmLabel.qml'
--- app/alarm/AlarmLabel.qml	2014-07-17 12:21:45 +0000
+++ app/alarm/AlarmLabel.qml	2014-07-28 20:36:30 +0000
@@ -21,6 +21,7 @@
 
 Page {
     id: _alarmLabelPage
+    objectName: "alarmLabelPage"
 
     visible: false
     title: i18n.tr("Label")
@@ -44,6 +45,7 @@
 
         TextField {
             id: _labelEntry
+            objectName: "labelEntry"
             text: alarm.message
             width: parent.width
         }

=== modified file 'app/alarm/AlarmList.qml'
--- app/alarm/AlarmList.qml	2014-07-17 12:21:45 +0000
+++ app/alarm/AlarmList.qml	2014-07-28 20:36:30 +0000
@@ -58,14 +58,18 @@
 
     Column {
         id: alarmList
+        objectName: 'alarmList'
         anchors.fill: parent
 
         Repeater {
             model: alarmListFlickable.model
+            objectName: "alarmListRepeater"
             ListItem.Base {
+                objectName: "alarm" + index
 
                 Label {
                     id: alarmTime
+                    objectName: "listAlarmTime" + index
 
                     anchors {
                         top: alarmDetailsColumn.top
@@ -89,6 +93,7 @@
 
                     Label {
                         id: alarmLabel
+                        objectName: "listAlarmLabel" + index
 
                         text: message
                         fontSize: "medium"
@@ -98,6 +103,7 @@
 
                     Label {
                         id: alarmSubtitle
+                        objectName: "listAlarmSubtitle" + index
 
                         fontSize: "xx-small"
                         width: parent.width
@@ -108,6 +114,7 @@
 
                 Switch {
                     id: alarmStatus
+                    objectName: "listAlarmStatus" + index
 
                     anchors {
                         right: parent.right

=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2014-07-17 12:21:45 +0000
+++ app/alarm/AlarmPage.qml	2014-07-28 20:36:30 +0000
@@ -26,6 +26,7 @@
     flickable: null
 
     head.actions: Action {
+        objectName: "addAlarmAction"
         iconName: "add"
         text: i18n.tr("Alarm")
         onTriggered: {

=== modified file 'app/alarm/AlarmRepeat.qml'
--- app/alarm/AlarmRepeat.qml	2014-07-17 12:21:45 +0000
+++ app/alarm/AlarmRepeat.qml	2014-07-28 20:36:30 +0000
@@ -22,6 +22,7 @@
 
 Page {
     id: _alarmRepeatPage
+    objectName: "alarmRepeatPage"
 
     visible: false
     title: i18n.tr("Repeat")
@@ -75,12 +76,14 @@
 
         Repeater {
             id: _alarmDays
+            objectName: 'alarmDays'
 
             model: daysModel
 
             ListItem.Standard {
                 Label {
                     id: _alarmDay
+                    objectName: 'alarmDay' + index
 
                     anchors {
                         left: parent.left
@@ -93,6 +96,7 @@
                 }
 
                 control: Switch {
+                    objectName: 'daySwitch' + index
                     checked: (alarm.daysOfWeek & flag) == flag
                     onCheckedChanged: {
                         if (checked) {

=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml	2014-07-17 12:21:45 +0000
+++ app/alarm/AlarmSound.qml	2014-07-28 20:36:30 +0000
@@ -52,6 +52,7 @@
 
             Repeater {
                 id: _alarmSounds
+                objectName: "alarmSounds"
 
                 model: _soundModel
 
@@ -64,6 +65,7 @@
 
                     Label {
                         id: _soundName
+                        objectName: "soundName" + index
 
                         anchors {
                             left: parent.left
@@ -77,6 +79,7 @@
 
                     CheckBox {
                         id: _soundStatus
+                        objectName: "soundStatus" + index
 
                         anchors {
                             right: parent.right

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2014-07-17 12:21:45 +0000
+++ app/alarm/EditAlarmPage.qml	2014-07-28 20:36:30 +0000
@@ -25,6 +25,7 @@
 
 Page {
     id: _addAlarmPage
+    objectName: "AddAlarmPage"
 
     // Property to determine if this is a new/saved alarm
     property bool isNewAlarm: true
@@ -47,6 +48,7 @@
 
         actions: Action {
             iconName: "ok"
+            objectName: "saveAlarmAction"
             text: i18n.tr("Alarm")
             onTriggered: {
                 if(isNewAlarm) {
@@ -171,6 +173,7 @@
 
         SubtitledListItem {
             id: _alarmRepeat
+            objectName: "alarmRepeat"
 
             text: i18n.tr("Repeat")
             subText: alarmUtils.format_day_string(_alarm.daysOfWeek)
@@ -180,6 +183,7 @@
 
         SubtitledListItem {
             id: _alarmLabel
+            objectName: "alarmLabel"
 
             text: i18n.tr("Label")
             subText: _alarm.message
@@ -189,6 +193,7 @@
 
         SubtitledListItem {
             id: _alarmSound
+            objectName: "alarmSound"
             /*
               #TODO: Add support for choosing new alarm sound when indicator-
               datetime supports custom alarm sounds

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2014-07-21 16:48:11 +0000
+++ app/clock/ClockPage.qml	2014-07-28 20:36:30 +0000
@@ -20,7 +20,6 @@
 import U1db 1.0 as U1db
 import Ubuntu.Components 1.1
 import "../components"
-import "../worldclock"
 import "../components/Utils.js" as Utils
 
 PageWithBottomEdge {
@@ -50,7 +49,6 @@
         anchors.fill: parent
         contentWidth: parent.width
         contentHeight: clock.height + date.height + locationRow.height
-                       + worldCityColumn.height + units.gu(20)
 
         PullToAdd {
             id: addCityButton
@@ -144,10 +142,6 @@
             }
         }
 
-        UserWorldCityList {
-            id: worldCityColumn
-        }
-
         onDragEnded: {
             if(contentY < _minThreshold) {
                 mainStack.push(Qt.resolvedUrl("../worldclock/WorldCityList.qml"))

=== removed directory 'app/tests'
=== removed directory 'app/tests/autopilot'
=== removed file 'app/tests/autopilot/run'
--- app/tests/autopilot/run	2014-06-06 18:45:49 +0000
+++ app/tests/autopilot/run	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if [[ -z `which autopilot` ]]; then
-  echo "Autopilot is not installed. Skip"
-  exit
-fi
-
-SCRIPTPATH=`dirname $0`
-pushd ${SCRIPTPATH}
-autopilot run ubuntu-clock-app
-popd

=== removed directory 'app/tests/autopilot/ubuntu-clock-app'
=== removed file 'app/tests/autopilot/ubuntu-clock-app/__init__.py'
--- app/tests/autopilot/ubuntu-clock-app/__init__.py	2014-06-06 18:45:49 +0000
+++ app/tests/autopilot/ubuntu-clock-app/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Ubuntu Touch App autopilot tests."""
-
-from os import remove
-import os.path
-from tempfile import mktemp
-import subprocess
-
-from autopilot.input import Mouse, Touch, Pointer
-from autopilot.matchers import Eventually
-from autopilot.platform import model
-from testtools.matchers import Is, Not, Equals
-from autopilot.testcase import AutopilotTestCase
-
-def get_module_include_path():
-    return os.path.abspath(
-        os.path.join(
-            os.path.dirname(__file__),
-            '..',
-            '..',
-            '..',
-            '..',
-            'backend',
-            'modules')
-        )
-
-
-class UbuntuTouchAppTestCase(AutopilotTestCase):
-    """A common test case class that provides several useful methods for the tests."""
-
-    if model() == 'Desktop':
-        scenarios = [
-        ('with mouse', dict(input_device_class=Mouse))
-        ]
-    else:
-        scenarios = [
-        ('with touch', dict(input_device_class=Touch))
-        ]
-
-    @property
-    def main_window(self):
-        return MainWindow(self.app)
-
-
-    def setUp(self):
-        self.pointing_device = Pointer(self.input_device_class.create())
-        super(UbuntuTouchAppTestCase, self).setUp()
-        self.launch_test_qml()
-
-
-    def launch_test_qml(self):
-        # If the test class has defined a 'test_qml' class attribute then we
-        # write it to disk and launch it inside the QML Scene. If not, then we
-        # silently do nothing (presumably the test has something else planned).
-        arch = subprocess.check_output(["dpkg-architecture",
-        "-qDEB_HOST_MULTIARCH"]).strip()
-        if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
-            qml_path = mktemp(suffix='.qml')
-            open(qml_path, 'w').write(self.test_qml)
-            self.addCleanup(remove, qml_path)
-
-            self.app = self.launch_test_application(
-                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
-                "-I", get_module_include_path(),
-                qml_path,
-                app_type='qt')
-
-        if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
-            qml_path = self.test_qml_file
-            self.app = self.launch_test_application(
-                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
-                "-I", get_module_include_path(),
-                qml_path,
-                app_type='qt')
-
-        self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
-
-
-    def get_qml_view(self):
-        """Get the main QML view"""
-
-        return self.app.select_single("QQuickView")
-
-    def get_mainview(self):
-        """Get the QML MainView"""
-
-        mainView = self.app.select_single("MainView")
-        self.assertThat(mainView, Not(Is(None)))
-        return mainView
-
-
-    def get_object(self,objectName):
-        """Get a object based on the objectName"""
-
-        obj = self.app.select_single(objectName=objectName)
-        self.assertThat(obj, Not(Is(None)))
-        return obj
-
-
-    def mouse_click(self,objectName):
-        """Move mouse on top of the object and click on it"""
-
-        obj = self.get_object(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.click()
-
-
-    def mouse_press(self,objectName):
-        """Move mouse on top of the object and press mouse button (without releasing it)"""
-
-        obj = self.get_object(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.press()
-
-
-    def mouse_release(self):
-        """Release mouse button"""
-
-        self.pointing_device.release()     
-
-
-    def type_string(self, string):
-        """Type a string with keyboard"""
-
-        self.keyboard.type(string)
-
-
-    def type_key(self, key):
-        """Type a single key with keyboard"""
-
-        self.keyboard.key(key)

=== removed directory 'app/tests/autopilot/ubuntu-clock-app/main'
=== removed file 'app/tests/autopilot/ubuntu-clock-app/main/__init__.py'
--- app/tests/autopilot/ubuntu-clock-app/main/__init__.py	2014-06-06 18:45:49 +0000
+++ app/tests/autopilot/ubuntu-clock-app/main/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-""" A main.qml test suite """

=== removed file 'app/tests/autopilot/ubuntu-clock-app/main/test_main.py'
--- app/tests/autopilot/ubuntu-clock-app/main/test_main.py	2014-06-06 18:45:49 +0000
+++ app/tests/autopilot/ubuntu-clock-app/main/test_main.py	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Tests for the Hello World"""
-
-from autopilot.matchers import Eventually
-from textwrap import dedent
-from testtools.matchers import Is, Not, Equals
-from testtools import skip
-import os
-from ubuntu-clock-app import UbuntuTouchAppTestCase
-
-
-class MainTests(UbuntuTouchAppTestCase):
-    """Generic tests for the Hello World"""
-
-    test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../ubuntu-clock-app")
-
-    def test_0_can_select_mainView(self):
-        """Must be able to select the mainview."""
-
-        mainView = self.get_mainview()
-        self.assertThat(mainView.visible,Eventually(Equals(True)))
-

=== removed directory 'app/tests/unit'
=== removed file 'app/tests/unit/tst_hellocomponent.qml'
--- app/tests/unit/tst_hellocomponent.qml	2014-06-06 18:45:49 +0000
+++ app/tests/unit/tst_hellocomponent.qml	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-import QtQuick 2.0
-import QtTest 1.0
-import Ubuntu.Components 0.1
-import "../../components"
-
-// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
-
-// Execute tests with:
-//   qmltestrunner
-
-Item {
-    // The objects
-    HelloComponent {
-        id: objectUnderTest
-    }
-
-    TestCase {
-        name: "HelloComponent"
-
-        function init() {
-            console.debug(">> init");
-            compare("",objectUnderTest.text,"text was not empty on init");
-            console.debug("<< init");
-        }
-
-        function cleanup() {
-            console.debug(">> cleanup");
-            console.debug("<< cleanup");
-        }
-
-        function initTestCase() {
-            console.debug(">> initTestCase");
-            console.debug("<< initTestCase");
-        }
-
-        function cleanupTestCase() {
-            console.debug(">> cleanupTestCase");
-            console.debug("<< cleanupTestCase");
-        }
-
-        function test_canReadAndWriteText() {
-            var expected = "Hello World";
-
-            objectUnderTest.text = expected;
-
-            compare(expected,objectUnderTest.text,"expected did not equal result");
-        }
-    }
-}

=== removed file 'app/worldclock/UserWorldCityList.qml'
--- app/worldclock/UserWorldCityList.qml	2014-07-22 13:02:03 +0000
+++ app/worldclock/UserWorldCityList.qml	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-/*
- * 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 QtQuick 2.0
-import Timezone 1.0
-import U1db 1.0 as U1db
-import Ubuntu.Components 1.1
-import "../components"
-import "../components/Utils.js" as Utils
-
-Column {
-    id: worldCityColumn
-    
-    function getTimeDiff(time) {
-        var hours, minutes;
-        time = Math.floor(time / 60)
-        minutes = time % 60
-        hours = Math.floor(time / 60)
-        return [hours, minutes]
-    }
-    
-    anchors.top: locationRow.bottom
-    anchors.topMargin: units.gu(6)
-    width: parent.width
-    
-    // U1db Index to index all documents storing the world city details
-    U1db.Index {
-        id: by_worldcity
-        database: clockDB
-        expression: [
-            "worldlocation.city",
-            "worldlocation.country",
-            "worldlocation.timezone"
-        ]
-    }
-    
-    // U1db Query to create a model of the world cities saved by the user
-    U1db.Query {
-        id: worldCityQuery
-        index: by_worldcity
-        query: ["*","*","*"]
-    }
-    
-    GenericTimeZoneModel {
-        id: u1dbModel
-        updateInterval: 1000
-        results: worldCityQuery.results
-    }
-    
-    Repeater {
-        model: u1dbModel
-        delegate: SubtitledListItem {
-            
-            height: units.gu(8)
-            
-            text: model.city
-            subText: model.country
-            showDivider: false
-            removable: true
-            confirmRemoval: true
-            
-            Label {
-                id: localTimeLabel
-                
-                anchors.centerIn: parent
-                fontSize: "large"
-                text: model.localTime
-            }
-            
-            Label {
-                id: relativeTimeLabel
-                
-                anchors.right: parent.right
-                anchors.verticalCenter: parent.verticalCenter
-                
-                fontSize: "xx-small"
-                horizontalAlignment: Text.AlignRight
-                text: {
-                    var day;
-                    
-                    if(model.daysTo === 0) {
-                        day = i18n.tr("Today")
-                    }
-                    
-                    else if(model.daysTo === 1) {
-                        day = i18n.tr("Tomorrow")
-                    }
-                    
-                    else if(model.daysTo === -1) {
-                        day = i18n.tr("Yesterday")
-                    }
-                    
-                    var isBehind = model.timeTo > 0 ? i18n.tr("behind")
-                                                    : i18n.tr("ahead")
-                    
-                    var timediff = worldCityColumn.getTimeDiff(Math.abs(model.timeTo))
-                    var minute = timediff[1]
-                    var hour = timediff[0]
-                    
-                    if(hour > 0 &&  minute > 0) {
-                        return ("%1\n%2hr%3min %4")
-                        .arg(day)
-                        .arg(hour)
-                        .arg(minute)
-                        .arg(isBehind)
-                    }
-                    
-                    else if(hour > 0 && minute === 0) {
-                        return ("%1\n%2hr %3")
-                        .arg(day)
-                        .arg(hour)
-                        .arg(isBehind)
-                    }
-                    
-                    else if(hour === 0 && minute > 0) {
-                        return ("%1\n%2min %3")
-                        .arg(day)
-                        .arg(minute)
-                        .arg(isBehind)
-                    }
-                    
-                    else {
-                        return i18n.tr("No Time Difference")
-                    }
-                }
-            }
-            
-            onItemRemoved: {
-                /*
-                 NOTE: This causes the document to be deleted twice resulting
-                 in an error. The bug has been reported at
-                 https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1276118
-                */
-                Utils.log("Deleting world location: " + model.city)
-                clockDB.deleteDoc(worldCityQuery.documents[index])
-            }
-        }
-    }
-}

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2014-07-22 14:01:43 +0000
+++ app/worldclock/WorldCityList.qml	2014-07-28 20:36:30 +0000
@@ -69,8 +69,6 @@
             contents: TextField {
                 id: searchField
 
-                inputMethodHints: Qt.ImhNoPredictiveText
-
                 anchors {
                     left: parent ? parent.left : undefined
                     right: parent ? parent.right : undefined
@@ -85,21 +83,9 @@
         }
     ]
 
-    Connections {
-        target: clockApp
-        onApplicationStateChanged: {
-            /*
-              Update world city list immediately when the clock app is brought
-              from suspend instead of waiting for the next minute to update.
-            */
-            if(applicationState)
-                timeZoneModel.update()
-        }
-    }
-
     XmlTimeZoneModel {
         id: timeZoneModel
-        updateInterval: 60000
+        updateInterval: 1000
         source: Qt.resolvedUrl("world-city-list.xml")
     }
 
@@ -113,22 +99,6 @@
     ListView {
         id: cityList
 
-        function addWorldCity(city, country, timezone) {
-            console.log("[LOG]: Adding city to U1db Database")
-            clockDB.putDoc
-                    (
-                        {
-                            "worldlocation":
-                            {
-                                "city": city,
-                                "country": country,
-                                "timezone": timezone
-                            }
-                        },
-                        encodeURIComponent(city + "_" + country)
-                        )
-        }
-
         anchors.fill: parent
 
         model: sortedTimeZoneModel
@@ -166,8 +136,10 @@
             }
 
             onClicked: {
-                cityList.addWorldCity(city, country, timezoneID)
-                mainStack.pop()
+                /*
+                  #TODO: Add support for saving chosen city permanently to disk
+                */
+                console.log("#TODO: Add city to U1DB Model")
             }
         }
     }

=== modified file 'app/worldclock/world-city-list.xml'
--- app/worldclock/world-city-list.xml	2014-07-22 14:50:43 +0000
+++ app/worldclock/world-city-list.xml	2014-07-28 20:36:30 +0000
@@ -21,8 +21,8 @@
 		<countryName>Australia</countryName>
 	</City>
 	<City>
-		<cityName>Albuquerque</cityName>
-		<timezoneID>America/Denver</timezoneID>
+		<cityName>Alaska</cityName>
+		<timezoneID>America/Anchorage</timezoneID>
 		<countryName>United States</countryName>
 	</City>
 	<City>
@@ -56,39 +56,19 @@
 		<countryName>United States</countryName>
 	</City>
 	<City>
-		<cityName>Andorra</cityName>
-		<timezoneID>Europe/Andorra</timezoneID>
-		<countryName>Andorra</countryName>
-	</City>
-	<City>
-		<cityName>Ankara</cityName>
-		<timezoneID>Europe/Istanbul</timezoneID>
-		<countryName>Turkey</countryName>
-	</City>
-	<City>
-		<cityName>Ann Arbor</cityName>
-		<timezoneID>America/Detroit</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
 		<cityName>Antananarivo</cityName>
 		<timezoneID>Indian/Antananarivo</timezoneID>
 		<countryName>Madagascar</countryName>
 	</City>
 	<City>
-		<cityName>Aqtau</cityName>
-		<timezoneID>Asia/Aqtau</timezoneID>
-		<countryName>Kazakhstan</countryName>
+		<cityName>Antigua</cityName>
+		<timezoneID>America/Antigua</timezoneID>
+		<countryName>Spain</countryName>
 	</City>
 	<City>
 		<cityName>Aruba</cityName>
 		<timezoneID>America/Aruba</timezoneID>
-		<countryName>Aruba</countryName>
-	</City>
-	<City>
-		<cityName>Asunción</cityName>
-		<timezoneID>America/Asuncion</timezoneID>
-		<countryName>Paraguay</countryName>
+		<countryName>Indonesia</countryName>
 	</City>
 	<City>
 		<cityName>Athens</cityName>
@@ -96,19 +76,14 @@
 		<countryName>Greece</countryName>
 	</City>
 	<City>
-		<cityName>Atlanta</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
 		<cityName>Auckland</cityName>
 		<timezoneID>Pacific/Auckland</timezoneID>
 		<countryName>New Zealand</countryName>
 	</City>
 	<City>
-		<cityName>Austin</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
+		<cityName>Azores</cityName>
+		<timezoneID>Atlantic/Azores</timezoneID>
+		<countryName>Portugal</countryName>
 	</City>
 	<City>
 		<cityName>Baghdad</cityName>
@@ -116,41 +91,16 @@
 		<countryName>Iraq</countryName>
 	</City>
 	<City>
-		<cityName>Bahrain</cityName>
-		<timezoneID>Asia/Bahrain</timezoneID>
-		<countryName>Bahrain</countryName>
-	</City>
-	<City>
 		<cityName>Baku</cityName>
 		<timezoneID>Asia/Baku</timezoneID>
 		<countryName>Azerbaijan</countryName>
 	</City>
 	<City>
-		<cityName>Baltimore</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Bangalore</cityName>
-		<timezoneID>Asia/Kolkata</timezoneID>
-		<countryName>India</countryName>
-	</City>
-	<City>
 		<cityName>Bangkok</cityName>
 		<timezoneID>Asia/Bangkok</timezoneID>
 		<countryName>Thailand</countryName>
 	</City>
 	<City>
-		<cityName>Barbados</cityName>
-		<timezoneID>America/Barbados</timezoneID>
-		<countryName>Barbados</countryName>
-	</City>
-	<City>
-		<cityName>Barcelona</cityName>
-		<timezoneID>Europe/Madrid</timezoneID>
-		<countryName>Spain</countryName>
-	</City>
-	<City>
 		<cityName>Beijing</cityName>
 		<timezoneID>Asia/Shanghai</timezoneID>
 		<countryName>China</countryName>
@@ -171,61 +121,21 @@
 		<countryName>Serbia</countryName>
 	</City>
 	<City>
-		<cityName>Belize</cityName>
-		<timezoneID>America/Belize</timezoneID>
-		<countryName>Belize</countryName>
-	</City>
-	<City>
-		<cityName>Belo Horizonte</cityName>
-		<timezoneID>America/Sao_Paulo</timezoneID>
-		<countryName>Brazil</countryName>
-	</City>
-	<City>
 		<cityName>Berlin</cityName>
 		<timezoneID>Europe/Berlin</timezoneID>
 		<countryName>Germany</countryName>
 	</City>
 	<City>
-		<cityName>Bermuda</cityName>
-		<timezoneID>Atlantic/Bermuda</timezoneID>
-		<countryName>Bermuda</countryName>
-	</City>
-	<City>
 		<cityName>Beulah</cityName>
 		<timezoneID>America/North_Dakota/Beulah</timezoneID>
 		<countryName>United States</countryName>
 	</City>
 	<City>
-		<cityName>Black Rock City</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
 		<cityName>Blantyre</cityName>
 		<timezoneID>Africa/Blantyre</timezoneID>
 		<countryName>Malawi</countryName>
 	</City>
 	<City>
-		<cityName>Bogotá</cityName>
-		<timezoneID>America/Bogota</timezoneID>
-		<countryName>Colombia</countryName>
-	</City>
-	<City>
-		<cityName>Boston</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Boulder</cityName>
-		<timezoneID>America/Denver</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Brasília</cityName>
-		<timezoneID>America/Sao_Paulo</timezoneID>
-		<countryName>Brazil</countryName>
-	</City>
-	<City>
 		<cityName>Bratislava</cityName>
 		<timezoneID>Europe/Bratislava</timezoneID>
 		<countryName>Slovakia</countryName>
@@ -271,16 +181,6 @@
 		<countryName>India</countryName>
 	</City>
 	<City>
-		<cityName>Calgary</cityName>
-		<timezoneID>America/Edmonton</timezoneID>
-		<countryName>Canada</countryName>
-	</City>
-	<City>
-		<cityName>Cambridge</cityName>
-		<timezoneID>Europe/London</timezoneID>
-		<countryName>United Kingdom</countryName>
-	</City>
-	<City>
 		<cityName>Canary</cityName>
 		<timezoneID>Atlantic/Canary</timezoneID>
 		<countryName>Australia</countryName>
@@ -291,16 +191,6 @@
 		<countryName>Australia</countryName>
 	</City>
 	<City>
-		<cityName>Cancún</cityName>
-		<timezoneID>America/Cancun</timezoneID>
-		<countryName>Mexico</countryName>
-	</City>
-	<City>
-		<cityName>Cape Town</cityName>
-		<timezoneID>Africa/Johannesburg</timezoneID>
-		<countryName>South Africa</countryName>
-	</City>
-	<City>
 		<cityName>Caracas</cityName>
 		<timezoneID>America/Caracas</timezoneID>
 		<countryName>Venezuela</countryName>
@@ -326,31 +216,11 @@
 		<countryName>Mexico</countryName>
 	</City>
 	<City>
-		<cityName>Chişinău</cityName>
-		<timezoneID>Europe/Chisinau</timezoneID>
-		<countryName>Moldova</countryName>
-	</City>
-	<City>
-		<cityName>Cincinnati</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Cleveland</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
 		<cityName>Colombo</cityName>
 		<timezoneID>Asia/Colombo</timezoneID>
 		<countryName>Sri Lanka</countryName>
 	</City>
 	<City>
-		<cityName>Columbus</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
 		<cityName>Conakry</cityName>
 		<timezoneID>Africa/Conakry</timezoneID>
 		<countryName>Guinea</countryName>
@@ -359,16 +229,6 @@
 		<cityName>Copenhagen</cityName>
 		<timezoneID>Europe/Copenhagen</timezoneID>
 		<countryName>Denmark</countryName>
-	</City>
-	<City>
-		<cityName>Costa Rica</cityName>
-		<timezoneID>America/Costa_Rica</timezoneID>
-		<countryName>Costa Rica</countryName>
-	</City>
-	<City>
-		<cityName>Curaçao</cityName>
-		<timezoneID>America/Curacao</timezoneID>
-		<countryName>Curacao</countryName>
 	</City>	
 	<City>
 		<cityName>Dakar</cityName>
@@ -376,11 +236,6 @@
 		<countryName>Senegal</countryName>
 	</City>
 	<City>
-		<cityName>Dallas</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
 		<cityName>Damascus</cityName>
 		<timezoneID>Asia/Damascus</timezoneID>
 		<countryName>Syria</countryName>
@@ -401,11 +256,6 @@
 		<countryName>Canada</countryName>
 	</City>
 	<City>
-		<cityName>Delhi</cityName>
-		<timezoneID>Asia/Kolkata</timezoneID>
-		<countryName>India</countryName>
-	</City>
-	<City>
 		<cityName>Denver</cityName>
 		<timezoneID>America/Denver</timezoneID>
 		<countryName>United States</countryName>
@@ -426,16 +276,6 @@
 		<countryName>Djibouti</countryName>
 	</City>
 	<City>
-		<cityName>Doha</cityName>
-		<timezoneID>Asia/Qatar</timezoneID>
-		<countryName>Qatar</countryName>
-	</City>
-	<City>
-		<cityName>Dominica</cityName>
-		<timezoneID>America/Dominica</timezoneID>
-		<countryName>Dominica</countryName>
-	</City>
-	<City>
 		<cityName>Dubai</cityName>
 		<timezoneID>Asia/Dubai</timezoneID>
 		<countryName>United Arab Emirates</countryName>
@@ -446,41 +286,16 @@
 		<countryName>Ireland</countryName>
 	</City>
 	<City>
-		<cityName>Easter Island</cityName>
-		<timezoneID>Pacific/Easter</timezoneID>
-		<countryName>Chile</countryName>
-	</City>
-	<City>
 		<cityName>Edmonton</cityName>
 		<timezoneID>America/Edmonton</timezoneID>
 		<countryName>Canada</countryName>
 	</City>
 	<City>
-		<cityName>El Salvador</cityName>
-		<timezoneID>America/El_Salvador</timezoneID>
-		<countryName>El Salvador</countryName>
-	</City>
-	<City>
-		<cityName>Fiji</cityName>
-		<timezoneID>Pacific/Fiji</timezoneID>
-		<countryName>Fiji</countryName>
-	</City>
-	<City>
 		<cityName>Fortaleza</cityName>
 		<timezoneID>America/Fortaleza</timezoneID>
 		<countryName>Brazil</countryName>
 	</City>
 	<City>
-		<cityName>Frankfurt</cityName>
-		<timezoneID>Europe/Berlin</timezoneID>
-		<countryName>Germany</countryName>
-	</City>
-	<City>
-		<cityName>Freetown</cityName>
-		<timezoneID>Africa/Freetown</timezoneID>
-		<countryName>Sierra Leone</countryName>
-	</City>
-	<City>
 		<cityName>Gaborone</cityName>
 		<timezoneID>Africa/Gaborone</timezoneID>
 		<countryName>Botswana</countryName>
@@ -489,892 +304,7 @@
 		<cityName>Gaza</cityName>
 		<timezoneID>Asia/Gaza</timezoneID>
 		<countryName>Palestine</countryName>
-	</City>
-	<City>
-		<cityName>Gibraltar</cityName>
-		<timezoneID>Europe/Gibraltar</timezoneID>
-		<countryName>Gibraltar</countryName>
-	</City>
-	<City>
-		<cityName>Grand Turk</cityName>
-		<timezoneID>America/Grand_Turk</timezoneID>
-		<countryName>Turks and Caicos Islands</countryName>
-	</City>
-	<City>
-		<cityName>Grenada</cityName>
-		<timezoneID>America/Grenada</timezoneID>
-		<countryName>Grenada</countryName>
-	</City>
-	<City>
-		<cityName>Guam</cityName>
-		<timezoneID>Pacific/Guam</timezoneID>
-		<countryName>Guam</countryName>
-	</City>
-	<City>
-		<cityName>Guangzhou</cityName>
-		<timezoneID>Asia/Shanghai</timezoneID>
-		<countryName>China</countryName>
-	</City>
-	<City>
-		<cityName>Guatemala</cityName>
-		<timezoneID>America/Guatemala</timezoneID>
-		<countryName>Guatemala</countryName>
-	</City>
-	<City>
-		<cityName>Gurgaon</cityName>
-		<timezoneID>Asia/Kolkata</timezoneID>
-		<countryName>India</countryName>
-	</City>
-	<City>
-		<cityName>Guyana</cityName>
-		<timezoneID>America/Guyana</timezoneID>
-		<countryName>Guyana</countryName>
-	</City>
-	<City>
-		<cityName>Haifa</cityName>
-		<timezoneID>Asia/Jerusalem</timezoneID>
-		<countryName>Israel</countryName>
-	</City>
-	<City>
-		<cityName>Halifax</cityName>
-		<timezoneID>America/Halifax</timezoneID>
-		<countryName>Canada</countryName>
-	</City>
-	<City>
-		<cityName>Hamburg</cityName>
-		<timezoneID>Europe/Berlin</timezoneID>
-		<countryName>Germany</countryName>
-	</City>
-	<City>
-		<cityName>Hanoi</cityName>
-		<timezoneID>Asia/Ho_Chi_Minh</timezoneID>
-		<countryName>Vietnam</countryName>
-	</City>
-	<City>
-		<cityName>Harare</cityName>
-		<timezoneID>Africa/Harare</timezoneID>
-		<countryName>Zimbabwe</countryName>
-	</City>
-	<City>
-		<cityName>Havana</cityName>
-		<timezoneID>America/Havana</timezoneID>
-		<countryName>Cuba</countryName>
-	</City>
-	<City>
-		<cityName>Hebron</cityName>
-		<timezoneID>Asia/Hebron</timezoneID>
-		<countryName>Palestine</countryName>
-	</City>
-	<City>
-		<cityName>Helsinki</cityName>
-		<timezoneID>Europe/Helsinki</timezoneID>
-		<countryName>Finland</countryName>
-	</City>
-	<City>
-		<cityName>Ho Chi Minh City</cityName>
-		<timezoneID>Asia/Ho_Chi_Minh</timezoneID>
-		<countryName>Vietnam</countryName>
-	</City>
-	<City>
-		<cityName>Hong Kong</cityName>
-		<timezoneID>Asia/Hong_Kong</timezoneID>
-		<countryName>Hong Kong</countryName>
-	</City>
-	<City>
-		<cityName>Honolulu</cityName>
-		<timezoneID>Pacific/Honolulu</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Houston</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Hyderabad</cityName>
-		<timezoneID>Asia/Kolkata</timezoneID>
-		<countryName>India</countryName>
-	</City>
-	<City>
-		<cityName>Indianapolis</cityName>
-		<timezoneID>America/Indiana/Indianapolis</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Islamabad</cityName>
-		<timezoneID>Asia/Karachi</timezoneID>
-		<countryName>Pakistan</countryName>
-	</City>
-	<City>
-		<cityName>Isle of Man</cityName>
-		<timezoneID>Europe/Isle_of_Man</timezoneID>
-		<countryName>Isle of Man</countryName>
-	</City>
-	<City>
-		<cityName>Istanbul</cityName>
-		<timezoneID>Europe/Istanbul</timezoneID>
-		<countryName>Turkey</countryName>
-	</City>
-	<City>
-		<cityName>Jacksonville</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Jakarta</cityName>
-		<timezoneID>Asia/Jakarta</timezoneID>
-		<countryName>Indonesia</countryName>
-	</City>
-	<City>
-		<cityName>Jerusalem</cityName>
-		<timezoneID>Asia/Jerusalem</timezoneID>
-		<countryName>Israel</countryName>
-	</City>
-	<City>
-		<cityName>Johannesburg</cityName>
-		<timezoneID>Africa/Johannesburg</timezoneID>
-		<countryName>South Africa</countryName>
-	</City>
-	<City>
-		<cityName>Kabul</cityName>
-		<timezoneID>Asia/Kabul</timezoneID>
-		<countryName>Afghanistan</countryName>
-	</City>
-	<City>
-		<cityName>Kampala</cityName>
-		<timezoneID>Africa/Kampala</timezoneID>
-		<countryName>Uganda</countryName>
-	</City>
-	<City>
-		<cityName>Karachi</cityName>
-		<timezoneID>Asia/Karachi</timezoneID>
-		<countryName>Pakistan</countryName>
-	</City>
-	<City>
-		<cityName>Khartoum</cityName>
-		<timezoneID>Africa/Khartoum</timezoneID>
-		<countryName>Sudan</countryName>
-	</City>
-	<City>
-		<cityName>Kiev</cityName>
-		<timezoneID>Europe/Kiev</timezoneID>
-		<countryName>Ukraine</countryName>
-	</City>
-	<City>
-		<cityName>Kigali</cityName>
-		<timezoneID>Africa/Kigali</timezoneID>
-		<countryName>Rwanda</countryName>
-	</City>
-	<City>
-		<cityName>Kingston</cityName>
-		<timezoneID>America/Toronto</timezoneID>
-		<countryName>Canada</countryName>
-	</City>
-	<City>
-		<cityName>Kinshasa</cityName>
-		<timezoneID>Africa/Kinshasa</timezoneID>
-		<countryName>Democratic Republic of the Congo</countryName>
-	</City>
-	<City>
-		<cityName>Kiritimati</cityName>
-		<timezoneID>Pacific/Kiritimati</timezoneID>
-		<countryName>Kiribati</countryName>
-	</City>
-	<City>
-		<cityName>Kirkland</cityName>
-		<timezoneID>America/Montreal</timezoneID>
-		<countryName>Canada</countryName>
-	</City>
-	<City>
-		<cityName>Knox</cityName>
-		<timezoneID>Australia/Melbourne</timezoneID>
-		<countryName>Australia</countryName>
-	</City>
-	<City>
-		<cityName>Knoxville</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Kraków</cityName>
-		<timezoneID>Europe/Warsaw</timezoneID>
-		<countryName>Poland</countryName>
-	</City>
-	<City>
-		<cityName>Kuala Lumpur</cityName>
-		<timezoneID>Asia/Kuala_Lumpur</timezoneID>
-		<countryName>Malaysia</countryName>
-	</City>
-	<City>
-		<cityName>Kuwait City</cityName>
-		<timezoneID>Asia/Kuwait</timezoneID>
-		<countryName>Kuwait</countryName>
-	</City>
-	<City>
-		<cityName>Kyiv</cityName>
-		<timezoneID>Europe/Kiev</timezoneID>
-		<countryName>Ukraine</countryName>
-	</City>
-	<City>
-		<cityName>Lagos</cityName>
-		<timezoneID>Africa/Lagos</timezoneID>
-		<countryName>Nigeria</countryName>
-	</City>
-	<City>
-		<cityName>Lahore</cityName>
-		<timezoneID>Asia/Karachi</timezoneID>
-		<countryName>Pakistan</countryName>
-	</City>
-	<City>
-		<cityName>Las Vegas</cityName>
-		<timezoneID>America/Los_Angeles</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Lima</cityName>
-		<timezoneID>America/Lima</timezoneID>
-		<countryName>Peru</countryName>
-	</City>
-	<City>
-		<cityName>Lisbon</cityName>
-		<timezoneID>Europe/Lisbon</timezoneID>
-		<countryName>Portugal</countryName>
-	</City>
-	<City>
-		<cityName>London</cityName>
-		<timezoneID>Europe/London</timezoneID>
-		<countryName>United Kingdom</countryName>
-	</City>
-	<City>
-		<cityName>Longyearbyen</cityName>
-		<timezoneID>Arctic/Longyearbyen</timezoneID>
-		<countryName>Svalbard and Jan Mayen</countryName>
-	</City>
-	<City>
-		<cityName>Los Angeles</cityName>
-		<timezoneID>America/Los_Angeles</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Louisville</cityName>
-		<timezoneID>America/Kentucky/Louisville</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Luxembourg</cityName>
-		<timezoneID>Europe/Luxembourg</timezoneID>
-		<countryName>Luxembourg</countryName>
-	</City>
-	<City>
-		<cityName>Macau</cityName>
-		<timezoneID>Asia/Macau</timezoneID>
-		<countryName>Macao</countryName>
-	</City>
-	<City>
-		<cityName>Madison</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Madrid</cityName>
-		<timezoneID>Europe/Madrid</timezoneID>
-		<countryName>Spain</countryName>
-	</City>
-	<City>
-		<cityName>Maldives</cityName>
-		<timezoneID>Indian/Maldives</timezoneID>
-		<countryName>Maldives</countryName>
-	</City>
-	<City>
-		<cityName>Malta</cityName>
-		<timezoneID>Europe/Malta</timezoneID>
-		<countryName>Malta</countryName>
-	</City>
-	<City>
-		<cityName>Managua</cityName>
-		<timezoneID>America/Managua</timezoneID>
-		<countryName>Nicaragua</countryName>
-	</City>
-	<City>
-		<cityName>Manchester</cityName>
-		<timezoneID>Europe/London</timezoneID>
-		<countryName>United Kingdom</countryName>
-	</City>
-	<City>
-		<cityName>Manila</cityName>
-		<timezoneID>Asia/Manila</timezoneID>
-		<countryName>Philippines</countryName>
-	</City>
-	<City>
-		<cityName>Marengo</cityName>
-		<timezoneID>America/Indiana/Marengo</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Martinique</cityName>
-		<timezoneID>America/Martinique</timezoneID>
-		<countryName>Canada</countryName>
-	</City>
-	<City>
-		<cityName>Maseru</cityName>
-		<timezoneID>Africa/Maseru</timezoneID>
-		<countryName>Lesotho</countryName>
-	</City>
-	<City>
-		<cityName>Melbourne</cityName>
-		<timezoneID>Australia/Melbourne</timezoneID>
-		<countryName>Australia</countryName>
-	</City>
-	<City>
-		<cityName>Memphis</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Mendoza</cityName>
-		<timezoneID>America/Argentina/Mendoza</timezoneID>
-		<countryName>Argentina</countryName>
-	</City>
-	<City>
-		<cityName>Metlakatla</cityName>
-		<timezoneID>America/Metlakatla</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Mexico City</cityName>
-		<timezoneID>America/Mexico_City</timezoneID>
-		<countryName>Mexico</countryName>
-	</City>
-	<City>
-		<cityName>Miami</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Milan</cityName>
-		<timezoneID>Europe/Rome</timezoneID>
-		<countryName>Italy</countryName>
-	</City>
-	<City>
-		<cityName>Milwaukee</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Minneapolis</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Minsk</cityName>
-		<timezoneID>Europe/Minsk</timezoneID>
-		<countryName>Belarus</countryName>
-	</City>
-	<City>
-		<cityName>Mogadishu</cityName>
-		<timezoneID>Africa/Mogadishu</timezoneID>
-		<countryName>Somalia</countryName>
-	</City>
-	<City>
-		<cityName>Monrovia</cityName>
-		<timezoneID>Africa/Monrovia</timezoneID>
-		<countryName>Liberia</countryName>
-	</City>
-	<City>
-		<cityName>Monaco</cityName>
-		<timezoneID>Europe/Monaco</timezoneID>
-		<countryName>Monaco</countryName>
-	</City>
-	<City>
-		<cityName>Monterrey</cityName>
-		<timezoneID>America/Monterrey</timezoneID>
-		<countryName>Mexico</countryName>
-	</City>
-	<City>
-		<cityName>Montevideo</cityName>
-		<timezoneID>America/Montevideo</timezoneID>
-		<countryName>Uruguay</countryName>
-	</City>
-	<City>
-		<cityName>Montreal</cityName>
-		<timezoneID>America/Montreal</timezoneID>
-		<countryName>Canada</countryName>
-	</City>
-	<City>
-		<cityName>Moscow</cityName>
-		<timezoneID>Europe/Moscow</timezoneID>
-		<countryName>Russia</countryName>
-	</City>
-	<City>
-		<cityName>Mountain View</cityName>
-		<timezoneID>America/Los_Angeles</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Mumbai</cityName>
-		<timezoneID>Asia/Kolkata</timezoneID>
-		<countryName>India</countryName>
-	</City>
-	<City>
-		<cityName>Munich</cityName>
-		<timezoneID>Europe/Berlin</timezoneID>
-		<countryName>Germany</countryName>
-	</City>
-	<City>
-		<cityName>Muscat</cityName>
-		<timezoneID>Asia/Muscat</timezoneID>
-		<countryName>Oman</countryName>
-	</City>
-	<City>
-		<cityName>Nairobi</cityName>
-		<timezoneID>Africa/Nairobi</timezoneID>
-		<countryName>Kenya</countryName>
-	</City>
-	<City>
-		<cityName>Nashville</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Nassau</cityName>
-		<timezoneID>America/Nassau</timezoneID>
-		<countryName>Bahamas</countryName>
-	</City>
-	<City>
-		<cityName>New Orleans</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>New Salem</cityName>
-		<timezoneID>America/North_Dakota/New_Salem</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>New South Wales</cityName>
-		<timezoneID>Australia/Sydney</timezoneID>	
-		<countryName>Australia</countryName>
-	</City>
-	<City>
-		<cityName>New York</cityName>
-		<timezoneID>America/New_York</timezoneID>	
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Newfoundland</cityName>
-		<timezoneID>America/St_Johns</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Nouméa</cityName>
-		<timezoneID>Pacific/Noumea</timezoneID>
-		<countryName>New Caledonia</countryName>
-	</City>
-	<City>
-		<cityName>Nuestra Señora de La Paz</cityName>
-		<timezoneID>America/Bogota</timezoneID>
-		<countryName>Colombia</countryName>
-	</City>
-	<City>
-		<cityName>Oklahoma City</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Osaka</cityName>
-		<timezoneID>Asia/Tokyo</timezoneID>	
-		<countryName>Japan</countryName>
-	</City>
-	<City>
-		<cityName>Oslo</cityName>
-		<timezoneID>Europe/Oslo</timezoneID>
-		<countryName>Norway</countryName>
-	</City>
-	<City>
-		<cityName>Ottawa</cityName>
-		<timezoneID>America/Toronto</timezoneID>
-		<countryName>Canada</countryName>
-	</City>
-	<City>
-		<cityName>Oulu</cityName>
-		<timezoneID>Europe/Helsinki</timezoneID>
-		<countryName>Finland</countryName>
-	</City>
-	<City>
-		<cityName>Panamá</cityName>
-		<timezoneID>America/Panama</timezoneID>
-		<countryName>Panama</countryName>
-	</City>
-	<City>
-		<cityName>Paramaribo</cityName>
-		<timezoneID>America/Paramaribo</timezoneID>
-		<countryName>Suriname</countryName>
-	</City>
-	<City>
-		<cityName>Paris</cityName>
-		<timezoneID>Europe/Paris</timezoneID>	
-		<countryName>France</countryName>
-	</City>
-	<City>
-		<cityName>Perth</cityName>
-		<timezoneID>Australia/Perth</timezoneID>	
-		<countryName>Australia</countryName>
-	</City>
-	<City>
-		<cityName>Petersburg</cityName>
-		<timezoneID>America/Indiana/Petersburg</timezoneID>
-		<countryName>Russia</countryName>
-	</City>
-	<City>
-		<cityName>Philadelphia</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Phnom Penh</cityName>
-		<timezoneID>Asia/Phnom_Penh</timezoneID>
-		<countryName>Cambodia</countryName>
-	</City>
-	<City>
-		<cityName>Phoenix</cityName>
-		<timezoneID>America/Phoenix</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Pittsburgh</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Port of Spain</cityName>
-		<timezoneID>America/Port_of_Spain</timezoneID>
-		<countryName>Trinidad and Tobago</countryName>
-	</City>
-	<City>
-		<cityName>Port au Prince</cityName>
-		<timezoneID>America/Port-au-Prince</timezoneID>
-		<countryName>Haiti</countryName>
-	</City>
-	<City>
-		<cityName>Portland</cityName>
-		<timezoneID>America/Los_Angeles</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Prague</cityName>
-		<timezoneID>Europe/Prague</timezoneID>	
-		<countryName>Czech</countryName>
-	</City>
-	<City>
-		<cityName>Pyongyang</cityName>
-		<timezoneID>Asia/Pyongyang</timezoneID>
-		<countryName>North Korea</countryName>
-	</City>
-	<City>
-		<cityName>Queensland</cityName>
-		<timezoneID>Australia/Brisbane</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Quito</cityName>
-		<timezoneID>America/Guayaquil</timezoneID>
-		<countryName>Ecuador</countryName>
-	</City>
-	<City>
-		<cityName>Rangoon</cityName>
-		<timezoneID>Asia/Rangoon</timezoneID>
-		<countryName>Myanmar</countryName>
-	</City>
-	<City>
-		<cityName>Reno</cityName>
-		<timezoneID>America/Los_Angeles</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Reston</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Reykjavík</cityName>
-		<timezoneID>Atlantic/Reykjavik</timezoneID>
-		<countryName>Iceland</countryName>
-	</City>
-	<City>
-		<cityName>Riga</cityName>
-		<timezoneID>Europe/Riga</timezoneID>
-		<countryName>Latvia</countryName>
-	</City>
-	<City>
-		<cityName>Rio de Janeiro</cityName>
-		<timezoneID>America/Sao_Paulo</timezoneID>
-		<countryName>Brazil</countryName>
-	</City>	
-	<City>
-		<cityName>Riyadh</cityName>
-		<timezoneID>Asia/Riyadh</timezoneID>
-		<countryName>Saudi Arabia</countryName>
-	</City>
-	<City>
-		<cityName>Rome</cityName>
-		<timezoneID>Europe/Rome</timezoneID>
-		<countryName>Italy</countryName>
-	</City>
-	<City>
-		<cityName>Sacramento</cityName>
-		<timezoneID>America/Los_Angeles</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Salt Lake City</cityName>
-		<timezoneID>America/Denver</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Samoa</cityName>
-		<timezoneID>Pacific/Apia</timezoneID>
-		<countryName>Samoa</countryName>
-	</City>
-	<City>
-		<cityName>San Antonio</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>San Diego</cityName>
-		<timezoneID>America/Los_Angeles</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>San Francisco</cityName>
-		<timezoneID>America/Costa_Rica</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>San José</cityName>
-		<timezoneID>America/Costa_Rica</timezoneID>
-		<countryName>Costa Rica</countryName>
-	</City>
-	<City>
-		<cityName>San Juan</cityName>
-		<timezoneID>America/Puerto_Rico</timezoneID>
-		<countryName>Puerto Rico</countryName>
-	</City>
-	<City>
-		<cityName>San Marino</cityName>
-		<timezoneID>Europe/San_Marino</timezoneID>
-		<countryName>San Marino</countryName>
-	</City>
-	<City>
-		<cityName>San Salvador</cityName>
-		<timezoneID>America/El_Salvador</timezoneID>
-		<countryName>El Salvador</countryName>
-	</City>
-	<City>
-		<cityName>Sanaa</cityName>
-		<timezoneID>Asia/Aden</timezoneID>
-		<countryName>Yemen</countryName>
-	</City>
-	<City>
-		<cityName>Santiago</cityName>
-		<timezoneID>America/Santiago</timezoneID>
-		<countryName>Chile</countryName>
-	</City>
-	<City>
-		<cityName>Santo Domingo</cityName>
-		<timezoneID>America/Santo_Domingo</timezoneID>
-		<countryName>Dominican Republic</countryName>
-	</City>
-	<City>
-		<cityName>São Paulo</cityName>
-		<timezoneID>America/Sao_Paulo</timezoneID>
-		<countryName>Brazil</countryName>
-	</City>
-	<City>
-		<cityName>São Tomé</cityName>
-		<timezoneID>Africa/Sao_Tome</timezoneID>
-		<countryName>São Tomé and Príncipe</countryName>
-	</City>
-	<City>
-		<cityName>Sarajevo</cityName>
-		<timezoneID>Europe/Sarajevo</timezoneID>
-		<countryName>Bosnia and Herzegovina</countryName>
-	</City>
-	<City>
-		<cityName>Saskatchewan</cityName>
-		<timezoneID>America/Regina</timezoneID>
-		<countryName>Canada</countryName>
-	</City>
-	<City>
-		<cityName>Seattle</cityName>
-		<timezoneID>America/Los_Angeles</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Seoul</cityName>
-		<timezoneID>Asia/Seoul</timezoneID>	
-		<countryName>South Korea</countryName>
-	</City>
-	<City>
-		<cityName>Shanghai</cityName>
-		<timezoneID>Asia/Shanghai</timezoneID>	
-		<countryName>China</countryName>
-	</City>
-	<City>
-		<cityName>Singapore</cityName>
-		<timezoneID>Asia/Singapore</timezoneID>	
-		<countryName>Singapore</countryName>
-	</City>
-	<City>
-		<cityName>Simferopol’</cityName>
-		<timezoneID>Europe/Simferopol</timezoneID>
-		<countryName>Ukraine</countryName>
-	</City>
-	<City>
-		<cityName>Skopje</cityName>
-		<timezoneID>Europe/Skopje</timezoneID>
-		<countryName>Macedonia</countryName>
-	</City>
-	<City>
-		<cityName>Sofia</cityName>
-		<timezoneID>Europe/Sofia</timezoneID>
-		<countryName>Bulgaria</countryName>
-	</City>
-	<City>
-		<cityName>St.Johns</cityName>
-		<timezoneID>America/St_Johns</timezoneID>
-		<countryName>Canada</countryName>
-	</City>
-	<City>
-		<cityName>St.Kitts</cityName>
-		<timezoneID>America/St_Kitts</timezoneID>
-		<countryName>Saint Kitts and Nevis</countryName>
-	</City>
-	<City>
-		<cityName>St.Louis</cityName>
-		<timezoneID>America/Chicago</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Stanley</cityName>
-		<timezoneID>Atlantic/Stanley</timezoneID>
-		<countryName>Falkland Islands</countryName>
-	</City>
-	<City>
-		<cityName>Stockholm</cityName>
-		<timezoneID>Europe/Stockholm</timezoneID>
-		<countryName>Sweden</countryName>
-	</City>
-	<City>
-		<cityName>Suva</cityName>
-		<timezoneID>Pacific/Fiji</timezoneID>
-		<countryName>Fiji</countryName>
-	</City>
-	<City>
-		<cityName>Sydney</cityName>
-		<timezoneID>Australia/Sydney</timezoneID>
-		<countryName>Australia</countryName>
-	</City>
-	<City>
-		<cityName>Taipei</cityName>
-		<timezoneID>Asia/Taipei</timezoneID>
-		<countryName>Taiwan</countryName>
-	</City>
-	<City>
-		<cityName>Tallinn</cityName>
-		<timezoneID>Europe/Tallinn</timezoneID>
-		<countryName>Estonia</countryName>
-	</City>
-	<City>
-		<cityName>Tehran</cityName>
-		<timezoneID>Asia/Tehran</timezoneID>
-		<countryName>Iran</countryName>
-	</City>
-	<City>
-		<cityName>Tokyo</cityName>
-		<timezoneID>Asia/Tokyo</timezoneID>
-		<countryName>Japan</countryName>
-	</City>
-	<City>
-		<cityName>Toronto</cityName>
-		<timezoneID>America/Toronto</timezoneID>
-		<countryName>Canada</countryName>
-	</City>
-	<City>
-		<cityName>Tripoli</cityName>
-		<timezoneID>Africa/Tripoli</timezoneID>
-		<countryName>Libyra</countryName>
-	</City>
-	<City>
-		<cityName>Tunis</cityName>
-		<timezoneID>Africa/Tunis</timezoneID>
-		<countryName>Tunisia</countryName>
-	</City>
-	<City>
-		<cityName>Ulan Bator</cityName>
-		<timezoneID>Asia/Ulan_Bator</timezoneID>
-		<countryName>Mongolia</countryName>
-	</City>
-	<City>
-		<cityName>Vancouver</cityName>
-		<timezoneID>America/Vancouver</timezoneID>
-		<countryName>Canada</countryName>
-	</City>
-	<City>
-		<cityName>Vatican City</cityName>
-		<timezoneID>Europe/Vatican</timezoneID>
-		<countryName>Vatican City</countryName>
-	</City>
-	<City>
-		<cityName>Vevay</cityName>
-		<timezoneID>America/Indiana/Vevay</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Vienna</cityName>
-		<timezoneID>Europe/Vienna</timezoneID>
-		<countryName>Austria</countryName>
-	</City>	
-	<City>
-		<cityName>Vilnius</cityName>
-		<timezoneID>Europe/Vilnius</timezoneID>
-		<countryName>Lithuania</countryName>
-	</City>
-	<City>
-		<cityName>Vincennes</cityName>
-		<timezoneID>America/Indiana/Vincennes</timezoneID>
-		<countryName>France</countryName>
-	</City>
-	<City>
-		<cityName>Warsaw</cityName>
-		<timezoneID>Europe/Warsaw</timezoneID>
-		<countryName>Poland</countryName>
-	</City>
-	<City>
-		<cityName>Washington D.C</cityName>
-		<timezoneID>America/New_York</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Winamac</cityName>
-		<timezoneID>America/Indiana/Winamac</timezoneID>
-		<countryName>United States</countryName>
-	</City>
-	<City>
-		<cityName>Winnipeg</cityName>
-		<timezoneID>America/Winnipeg</timezoneID>
-		<countryName>Canada</countryName>
-	</City>
-	<City>
-		<cityName>Wrocław</cityName>
-		<timezoneID>Europe/Warsaw</timezoneID>
-		<countryName>Poland</countryName>
-	</City>
-	<City>
-		<cityName>Zagreb</cityName>
-		<timezoneID>Europe/Zagreb</timezoneID>
-		<countryName>Croatia</countryName>
-	</City>
+	</City>	
 	<City>
 		<cityName>Zürich</cityName>
 		<timezoneID>Europe/Zurich</timezoneID>

=== modified file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt	2014-07-22 12:51:38 +0000
+++ backend/CMakeLists.txt	2014-07-28 20:36:30 +0000
@@ -7,7 +7,6 @@
     modules/Timezone/backend.cpp
     modules/Timezone/timezonemodel.cpp
     modules/Timezone/xmltimezonemodel.cpp
-    modules/Timezone/generictimezonemodel.cpp
 )
 
 set(

=== modified file 'backend/modules/Timezone/backend.cpp'
--- backend/modules/Timezone/backend.cpp	2014-07-22 12:51:38 +0000
+++ backend/modules/Timezone/backend.cpp	2014-07-28 20:36:30 +0000
@@ -21,14 +21,12 @@
 #include "backend.h"
 #include "timezonemodel.h"
 #include "xmltimezonemodel.h"
-#include "generictimezonemodel.h"
 
 void BackendPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Timezone"));
 
     qmlRegisterType<XmlTimeZoneModel>(uri, 1, 0, "XmlTimeZoneModel");
-    qmlRegisterType<GenericTimeZoneModel>(uri, 1, 0, "GenericTimeZoneModel");
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== removed file 'backend/modules/Timezone/generictimezonemodel.cpp'
--- backend/modules/Timezone/generictimezonemodel.cpp	2014-07-22 13:02:03 +0000
+++ backend/modules/Timezone/generictimezonemodel.cpp	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-/*
- * 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/>.
- */
-
-#include "generictimezonemodel.h"
-
-#include <QDebug>
-
-GenericTimeZoneModel::GenericTimeZoneModel(QObject *parent) :
-    TimeZoneModel(parent)
-{
-}
-
-QList<QVariant> GenericTimeZoneModel::results() const
-{
-    return m_results;
-}
-
-void GenericTimeZoneModel::setResults(const QList<QVariant> &results)
-{
-    if(m_results == results) {
-        // Don't parse the results again if it is the same results being set again
-        return;
-    }
-
-    // Change the results and emit the changed signal to let QML know
-    m_results = results;
-    emit resultsChanged();
-
-    // Parse through results
-    loadTimeZonesFromVariantList();
-}
-
-void GenericTimeZoneModel::loadTimeZonesFromVariantList()
-{
-    if(m_results.isEmpty()) {
-        // Don't parse an empty results
-        return;
-    }
-
-    // Let QML know model is being reset and rebuilt
-    beginResetModel();
-
-    m_timeZones.clear();
-
-    TimeZone tz;
-
-    /*
-     Cycle through the u1db query model results and transfer them to the
-     TimeZone list.
-    */
-    for (int i=0; i < m_results.size(); i++) {
-        // Map query model results to timezone tz
-        tz.cityName = m_results.value(i).toMap().value("city").toString();
-        tz.country = m_results.value(i).toMap().value("country").toString();
-        tz.timeZoneId = m_results.value(i).toMap().value("timezone").toString();
-
-        m_timeZones.append(tz);
-
-        // Clear tz before next iteration
-        tz = TimeZone();
-    }
-
-
-    // Let QML know model is reusable again
-   endResetModel();
-}

=== removed file 'backend/modules/Timezone/generictimezonemodel.h'
--- backend/modules/Timezone/generictimezonemodel.h	2014-07-22 13:10:43 +0000
+++ backend/modules/Timezone/generictimezonemodel.h	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/*
- * 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/>.
- */
-
-#ifndef GENERICTIMEZONEMODEL_H
-#define GENERICTIMEZONEMODEL_H
-
-#include <QList>
-#include <QVariant>
-
-#include "timezonemodel.h"
-
-class GenericTimeZoneModel : public TimeZoneModel
-{
-    Q_OBJECT
-
-    // Property to store the u1db query model results
-    Q_PROPERTY(QList<QVariant> results
-               READ results
-               WRITE setResults
-               NOTIFY resultsChanged)
-
-public:
-    GenericTimeZoneModel(QObject *parent = 0);
-
-    // Function to read the model
-    QList<QVariant> results() const;
-
-    // Function to set the model
-    void setResults(const QList<QVariant> &results);
-
-signals:
-    // Signal to notify the change of the model to QML
-    void resultsChanged();
-
-private:
-    // Function to do the QList parsing
-    void loadTimeZonesFromVariantList();
-
-    // Private copy of the model received from QML
-    QList<QVariant> m_results;
-};
-
-#endif // GENERICTIMEZONEMODEL_H

=== modified file 'backend/modules/Timezone/timezonemodel.cpp'
--- backend/modules/Timezone/timezonemodel.cpp	2014-07-22 12:52:39 +0000
+++ backend/modules/Timezone/timezonemodel.cpp	2014-07-28 20:36:30 +0000
@@ -64,10 +64,6 @@
      We have defined Roles in our .h file. Lets use them here.
     */
 
-    QTimeZone zone(m_timeZones.at(row).timeZoneId.toLatin1());
-    QDateTime worldCityTime(QDateTime::currentDateTime().toTimeZone(zone));
-    QDateTime localCityTime(QDateTime::currentDateTime());
-
     switch (role) {
     case RoleCityName:
         return m_timeZones.at(row).cityName;
@@ -76,19 +72,10 @@
     case RoleTimeZoneId:
         return m_timeZones.at(row).timeZoneId;
     case RoleTimeString:
-        /*
-         FIXME: Until https://bugreports.qt-project.org/browse/QTBUG-40275
-         is fixed, we will have to return a string.
-        */
-        return worldCityTime.toString("hh:mm");
-    case RoleDaysTo:
-        return localCityTime.daysTo(worldCityTime);
-    case RoleTimeTo:
-        /*
-         FIXME: Workaround for localCityTime.secsTo(worldCityTime) which returns
-         0 indicating that the datetime object is invalid.
-        */
-        return localCityTime.offsetFromUtc() - worldCityTime.offsetFromUtc();
+        QTimeZone zone(m_timeZones.at(row).timeZoneId.toLatin1());
+        // TODO: pass formatting options as parameter to toString().
+        // see: http://qt-project.org/doc/qt-5/qdate.html#toString
+        return QDateTime::currentDateTime().toTimeZone(zone).toString("hh:mm");
     }
 
     /*
@@ -105,8 +92,6 @@
     roles.insert(RoleCountryName, "country");
     roles.insert(RoleTimeZoneId, "timezoneID");
     roles.insert(RoleTimeString, "localTime");
-    roles.insert(RoleDaysTo, "daysTo");
-    roles.insert(RoleTimeTo, "timeTo");
     return roles;
 }
 

=== modified file 'backend/modules/Timezone/timezonemodel.h'
--- backend/modules/Timezone/timezonemodel.h	2014-07-22 12:55:56 +0000
+++ backend/modules/Timezone/timezonemodel.h	2014-07-28 20:36:30 +0000
@@ -33,19 +33,14 @@
     /*
       Property to determine the interval before updating the time (default is 0)
     */
-    Q_PROPERTY(int updateInterval
-               READ updateInterval
-               WRITE setUpdateInterval
-               NOTIFY updateIntervalChanged)
+    Q_PROPERTY(int updateInterval READ updateInterval WRITE setUpdateInterval NOTIFY updateIntervalChanged)
 
 public:
     enum Roles {
         RoleCityName,
         RoleCountryName,
         RoleTimeZoneId,
-        RoleTimeString,
-        RoleDaysTo,
-        RoleTimeTo,
+        RoleTimeString
     };
 
     /*
@@ -77,16 +72,8 @@
     // Signal to notify the updateInterval change to QML
     void updateIntervalChanged();
 
-public slots:
-    /*
-     Public slot called internally by m_updateTimer and also from QML to
-     explicitly refresh the model when required.
-
-     Use Case: The world city list is updated every minute to improve
-     performance. However when the clock app is brought from the background
-     (due to user switching between apps) the world city list must be updated
-     immediately rather than waiting for a minute before updating.
-    */
+private slots:
+    // Private slot that gets called by the updateTimer
     void update();
 
 private:

=== modified file 'backend/modules/Timezone/xmltimezonemodel.cpp'
--- backend/modules/Timezone/xmltimezonemodel.cpp	2014-07-20 22:33:13 +0000
+++ backend/modules/Timezone/xmltimezonemodel.cpp	2014-07-28 20:36:30 +0000
@@ -121,6 +121,7 @@
             if (reader.name() == "City") {
                 // A time zone has ended. insert it into list
                 m_timeZones.append(tz);
+                qDebug() << "appended tz:" << tz.cityName << tz.country << tz.timeZoneId;
             }
             if (reader.name() == "cityName") {
                 isCityName = false;

=== modified file 'manifest.json'
--- manifest.json	2014-07-08 10:52:02 +0000
+++ manifest.json	2014-07-28 20:36:30 +0000
@@ -11,5 +11,8 @@
         }
     },
     "version": "0.1",
-    "maintainer": "Ubuntu App Cats <[e-mail]>"
-}
\ No newline at end of file
+    "maintainer": "Ubuntu App Cats <[e-mail]>",
+    "x-test": {
+        "autopilot": "ubuntu_clock_app"
+    }
+}

=== added directory 'tests'
=== added directory 'tests/autopilot'
=== added file 'tests/autopilot/run'
--- tests/autopilot/run	1970-01-01 00:00:00 +0000
+++ tests/autopilot/run	2014-07-28 20:36:30 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [[ -z `which autopilot` ]]; then
+  echo "Autopilot is not installed. Skip"
+  exit
+fi
+
+SCRIPTPATH=`dirname $0`
+pushd ${SCRIPTPATH}
+autopilot run ubuntu-clock-app
+popd

=== added directory 'tests/autopilot/ubuntu_clock_app'
=== added file 'tests/autopilot/ubuntu_clock_app/__init__.py'
--- tests/autopilot/ubuntu_clock_app/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_clock_app/__init__.py	2014-07-28 20:36:30 +0000
@@ -0,0 +1,19 @@
+# -#- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -#-
+#
+# 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
+# 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: Renato Araujo Oliveira Filho <[e-mail]>
+
+"""clock-app autopilot tests and emulators - top level package."""

=== added file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-07-28 20:36:30 +0000
@@ -0,0 +1,406 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# 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
+# the Free Software Foundation; version 3.
+#
+# 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 Lesser General Public License for more details.
+#
+# 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]>
+
+import logging
+
+from autopilot import logging as autopilot_logging
+
+from ubuntuuitoolkit import emulators as toolkit_emulators, pickers
+
+logger = logging.getLogger(__name__)
+
+
+class ClockEmulatorException(toolkit_emulators.ToolkitEmulatorException):
+
+    """Exception raised when there is an error with the emulator."""
+
+
+class MainView(toolkit_emulators.MainView):
+
+    @autopilot_logging.log_action(logger.info)
+    def open_clock(self):
+        """Open the Clock Page.
+
+        :return the Clock Page
+
+        """
+        return self.wait_select_single(ClockPage)
+
+    @autopilot_logging.log_action(logger.info)
+    def open_alarm(self):
+        """Open the Alarm Page.
+
+        :return: the Alarm Page.
+
+        """
+        clockPage = self.wait_select_single(ClockPage)
+        clockPage.drag_bottomEdge_up()
+        self.get_header().visible.wait_for(True)
+        return self.wait_select_single(Page11)
+
+    def get_AlarmList(self):
+        """ Get the AlarmList object. """
+        return AlarmList.select(self)
+
+
+class Page(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    """Autopilot helper for Pages."""
+
+    def __init__(self, *args):
+        super(Page, self).__init__(*args)
+        # XXX we need a better way to keep reference to the main view.
+        # --elopio - 2014-01-31
+        self.main_view = self.get_root_instance().select_single(MainView)
+
+
+class ClockPage(Page):
+
+    """Autopilot helper for the Clock page."""
+
+    @autopilot_logging.log_action(logger.info)
+    def drag_bottomEdge_up(self):
+        """Function to drag the bottom edge up."""
+        self._click_bottomEdge()
+
+        x, y, w, h = self.globalRect
+        start_x = stop_x = x + (w / 2)
+        start_y = y + (h - 1)
+
+        stop_y = start_y - h
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+
+        self._wait_for_ClockPage_to_close()
+
+    def _click_bottomEdge(self):
+        """Function to click on the bottom edge."""
+        bottomEdge = self.wait_select_single(
+            'QQuickItem', objectName='bottomEdgeTip')
+        self.pointing_device.click_object(bottomEdge)
+
+    def _wait_for_ClockPage_to_close(self):
+        self.isCollapsed.wait_for(False)
+
+
+class Page11(Page):
+
+    """Autopilot helper for the Alarm page."""
+
+    @autopilot_logging.log_action(logger.info)
+    def add_single_alarm(self, name, day, time_to_set, test_sound_name):
+        """Add a single type alarm
+
+        :param name: name of alarm
+        :param day: day on which the alarm should be triggered
+        :param time_to_set: time to set alarm to
+        :param test_sound_name: sound to set in alarm
+
+        """
+        alarmListPage = AlarmList.select(self.main_view)
+        old_alarm_count = alarmListPage.get_num_of_alarms()
+
+        edit_alarm_page = self._click_add_alarm_button()
+        edit_alarm_page.set_alarm_time(time_to_set)
+
+        alarm_repeat_page = edit_alarm_page.open_alarmRepeat_page()
+        alarm_repeat_page.set_single_alarm_day(day)
+        self._click_header_backButton()
+
+        alarm_label_page = edit_alarm_page.open_alarmLabel_page()
+        alarm_label_page.set_alarm_label(name)
+        self._click_header_customBackButton()
+
+        # TODO
+        # alarm_sound_page = edit_alarm_page.open_alarmSound_page()
+        # alarm_sound_page.set_alarm_sound(test_sound_name)
+        # self._click_header_backButton()
+
+        self._click_save()
+        self._confirm_alarm_creation(old_alarm_count)
+
+    def _click_add_alarm_button(self):
+        """Click the add alarm header button."""
+        header = self.main_view.get_header()
+        header.click_action_button('addAlarmAction')
+        return self.main_view.wait_select_single(EditAlarmPage)
+
+    def _click_header_customBackButton(self):
+        """Click the  header button:  'customBackButton' """
+        header = self.main_view.get_header()
+        header.click_custom_back_button()
+
+    def _click_header_backButton(self):
+        """Click the  header button:  'backButton' """
+        header = self.main_view.get_header()
+        header.click_back_button()
+
+    def _click_save(self):
+        """Click the save timer header button"""
+        header = self.main_view.get_header()
+        header.click_action_button('saveAlarmAction')
+
+    def _confirm_alarm_creation(self, count):
+        """Confirm creation of alarm
+
+        :param count: alarm count before alarm creation
+
+        """
+        try:
+            AlarmList.select(self.main_view)._get_saved_alarms_list().\
+                count.wait_for(count + 1)
+        except AssertionError:
+            raise ClockEmulatorException('Error creating alarm.')
+
+
+class EditAlarmPage(Page):
+
+    """Autopilot helper for the Add Alarm page."""
+
+    @autopilot_logging.log_action(logger.info)
+    def set_alarm_time(self, time_to_set):
+        """Set alarm time on datepicker.
+
+        :param time_to_set: time to set on datepicker
+
+        """
+        PickerRow_HoursPicker = self.wait_select_single(
+            "Picker", objectName="PickerRow_HoursPicker")
+        self._set_picker(PickerRow_HoursPicker, 'time', time_to_set)
+
+    def _set_picker(self, field, mode, value):
+        # open picker
+        self.pointing_device.click_object(field)
+        # valid options are date or time; assume date if invalid/no option
+        if mode == 'time':
+            mode_value = 'Hours|Minutes'
+        else:
+            mode_value = 'Years|Months|Days'
+        picker = self.wait_select_single(
+            pickers.DatePicker, mode=mode_value, visible=True)
+        if mode_value == 'Hours|Minutes':
+            picker.pick_time(value)
+        else:
+            picker.pick_date(value)
+        # close picker
+        self.pointing_device.click_object(field)
+
+    @autopilot_logging.log_action(logger.info)
+    def open_alarmRepeat_page(self):
+        """ Open the alarmRepeat page """
+
+        alarmRepeatItem = self.wait_select_single(
+            "SubtitledListItem", objectName="alarmRepeat")
+        self.pointing_device.click_object(alarmRepeatItem)
+        return self.main_view.wait_select_single(AlarmRepeat)
+
+    @autopilot_logging.log_action(logger.info)
+    def open_alarmLabel_page(self):
+        """ Open the alarmLabel page """
+
+        alarmLabelItem = self.wait_select_single(
+            "SubtitledListItem", objectName="alarmLabel")
+        self.pointing_device.click_object(alarmLabelItem)
+        return AlarmLable.select(self.main_view)
+
+    @autopilot_logging.log_action(logger.info)
+    def open_alarmSound_page(self):
+        """ Open the alarmSound page """
+
+        alarmSoundItem = self.wait_select_single(
+            "SubtitledListItem", objectName="alarmSound")
+        self.pointing_device.click_object(alarmSoundItem)
+        return self.main_view.wait_select_single(AlarmSound)
+
+
+class AlarmRepeat(Page):
+
+    """Autopilot helper for the  AlarmRepeat page."""
+
+    @autopilot_logging.log_action(logger.info)
+    def set_single_alarm_day(self, day):
+        """Set the alarm day of a single type alarm.
+
+        :param day: single day on which alarm is triggered
+
+        """
+        self.unselect_selected_days()
+        for index in range(self._get_num_of_days()):
+            if self.wait_select_single(
+                    'Label', objectName='alarmDay{}'.format(index)).\
+                    text == day:
+                self._select_single_alarm_day(index)
+
+    def _get_num_of_days(self):
+        return int(self.wait_select_single(
+            'QQuickRepeater', objectName='alarmDays').count)
+
+    def _select_single_alarm_day(self, index):
+        """ function for selecting the day passed to the function.
+
+        :param index: the day to be selected
+
+        """
+        dayCheckbox = self.wait_select_single(
+            'CheckBox', objectName='daySwitch{}'.format(index))
+        if dayCheckbox.checked is False:
+            self.pointing_device.click_object(dayCheckbox)
+
+    @autopilot_logging.log_action(logger.info)
+    def unselect_selected_days(self):
+        """ function for unselecting already selected days.   """
+        for index in range(self._get_num_of_days()):
+            if self.wait_select_single(
+                    'CheckBox', objectName='daySwitch{}'.format(index)).\
+                    checked:
+                self.pointing_device.click_object(self.wait_select_single(
+                    'CheckBox', objectName='daySwitch{}'.format(index)))
+
+
+class AlarmSound(Page):
+
+    """Autopilot helper for the  AlarmSound page."""
+
+    @autopilot_logging.log_action(logger.info)
+    def set_alarm_sound(self, test_sound_name):
+        """Set alarm sound.
+
+        :param test_sound_name: sound to set for alarm
+
+        """
+        self.unselect_selected_sound()
+        for index in range(self._get_num_of_sounds()):
+            if self.wait_select_single(
+                    'Label', objectName='soundName{}'.format(index)).\
+                    text == test_sound_name:
+                self._select_alarm_sound(index)
+
+    def _get_num_of_sounds(self):
+        return int(self.wait_select_single(
+            'QQuickRepeater', objectName='alarmSounds').count)
+
+    def _select_alarm_sound(self, index):
+        """ function for selecting the sound passed to the function.
+
+        :param index: the sound to be selected
+
+        """
+        soundCheckbox = self.wait_select_single(
+            'CheckBox', objectName='soundStatus{}'.format(index))
+        if soundCheckbox.checked is False:
+            self.pointing_device.click_object(soundCheckbox)
+
+    @autopilot_logging.log_action(logger.info)
+    def unselect_selected_sound(self):
+        """ function for unselecting already selected days.   """
+        for index in range(self._get_num_of_sounds()):
+            if self.wait_select_single(
+                    'CheckBox', objectName='soundStatus{}'.format(index)).\
+                    checked:
+                self.pointing_device.click_object(self.wait_select_single(
+                    'CheckBox', objectName='soundStatus{}'.format(index)))
+
+
+class AlarmLable(object):
+
+    """Autopilot helper for the  AlarmLabel page."""
+
+    def __init__(self, proxy_object):
+        super(AlarmLable, self).__init__()
+        self.proxy_object = proxy_object
+
+    @classmethod
+    def select(cls, main_view):
+        proxy_object = main_view.wait_select_single(
+            objectName='alarmLabelPage')
+        proxy_object.visible.wait_for(True)
+        return cls(proxy_object)
+
+    @autopilot_logging.log_action(logger.info)
+    def set_alarm_label(self, name):
+        """Set alarm label.
+
+        :param name: label for alarm to set
+
+        """
+        alarmTextfield = self.proxy_object.wait_select_single(
+            "TextField", objectName='labelEntry')
+        # TODO: This wait to ensure that the textfield is visible before
+        # entering text should be part of the SDK emulator. Until then, it has
+        # been added here. http://pad.lv/1289616  --nik90 2014-03-06
+        alarmTextfield.visible.wait_for(True)
+        alarmTextfield.write(name)
+
+
+class AlarmList(object):
+
+    """Autopilot helper for the  AlarmList."""
+
+    def __init__(self, proxy_object):
+        super(AlarmList, self).__init__()
+        self.proxy_object = proxy_object
+
+    @classmethod
+    def select(cls, main_view):
+        proxy_object = main_view.wait_select_single(
+            objectName='alarmListFlickable')
+        proxy_object.visible.wait_for(True)
+        return cls(proxy_object)
+
+    def get_num_of_alarms(self):
+        """Return the number of saved alarms."""
+        return int(self._get_saved_alarms_list().count)
+
+    def _get_saved_alarms_list(self):
+        """Return the saved alarm list"""
+        return self.proxy_object.wait_select_single(
+            'QQuickRepeater', objectName='alarmListRepeater')
+
+    def get_saved_alarms(self):
+        """Return a list with the information of the saved alarms.
+
+        Each item of the returned list is a tuple of
+        (name, recurrence, time, enabled).
+
+        """
+        alarms = []
+        for index in range(self.get_num_of_alarms()):
+            name = self.proxy_object.wait_select_single(
+                'Label', objectName='listAlarmLabel{}'.format(index)).text
+            recurrence = self.proxy_object.wait_select_single(
+                'Label', objectName='listAlarmSubtitle{}'.format(index)).text
+            time = self.proxy_object.wait_select_single(
+                'Label', objectName='listAlarmTime{}'.format(index)).text
+            enabled = self.proxy_object.wait_select_single(
+                toolkit_emulators.CheckBox,
+                objectName='listAlarmStatus{}'.format(index)).checked
+            alarms.append((name, recurrence, enabled, time))
+        return alarms
+
+    @autopilot_logging.log_action(logger.info)
+    def delete_alarm(self, index):
+        """Delete an alarm at the specified index."""
+        old_alarm_count = self.get_num_of_alarms()
+        alarm = self.proxy_object.wait_select_single(
+            toolkit_emulators.Base, objectName='alarm{}'.format(index))
+        alarm.swipe_to_delete()
+        alarm.confirm_removal()
+        try:
+            self._get_saved_alarms_list().count.wait_for(old_alarm_count - 1)
+        except AssertionError:
+            raise ClockEmulatorException('Error deleting alarm.')

=== added directory 'tests/autopilot/ubuntu_clock_app/tests'
=== added file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
--- tests/autopilot/ubuntu_clock_app/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py	2014-07-28 20:36:30 +0000
@@ -0,0 +1,121 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# 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
+# 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: Renato Araujo Oliveira Filho <[e-mail]>
+
+
+"""clock-app autopilot tests."""
+
+import os.path
+import os
+import shutil
+import logging
+
+from autopilot import input
+from autopilot.platform import model
+from ubuntuuitoolkit import (
+    base,
+    emulators as toolkit_emulators
+)
+
+from ubuntu_clock_app import emulators
+
+logger = logging.getLogger(__name__)
+
+
+class ClockAppTestCase(base.UbuntuUIToolkitAppTestCase):
+
+    """A common test case class that provides several useful methods for
+    calendar-app tests.
+
+    """
+    local_location = "../../app/ubuntu-clock-app.qml"
+    installed_location = "/usr/share/ubuntu-clock-app/app/ubuntu-clock-app.qml"
+    sqlite_dir = os.path.expanduser(
+        "~/.local/share/com.ubuntu.clock")
+    backup_dir = sqlite_dir + ".backup"
+
+    def setUp(self):
+        super(ClockAppTestCase, self).setUp()
+        self.pointing_device = input.Pointer(self.input_device_class.create())
+
+        # backup and wipe db's before testing
+        self.temp_move_sqlite_db()
+        self.addCleanup(self.restore_sqlite_db)
+
+        # turn off the OSK so it doesn't block screen elements
+        if model() != 'Desktop':
+            os.system("stop maliit-server")
+            self.addCleanup(os.system, "start maliit-server")
+
+        if os.path.exists(self.local_location):
+            self.launch_test_local()
+        elif os.path.exists(self.installed_location):
+            self.launch_test_installed()
+        else:
+            self.launch_test_click()
+
+    def launch_test_local(self):
+        self.app = self.launch_test_application(
+            base.get_qmlscene_launch_command(),
+            self.local_location,
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
+    def launch_test_installed(self):
+        self.app = self.launch_test_application(
+            base.get_qmlscene_launch_command(),
+            self.installed_location,
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
+    def launch_test_click(self):
+        self.app = self.launch_click_package(
+            "com.ubuntu.clock.devel",
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
+    def temp_move_sqlite_db(self):
+        try:
+            shutil.rmtree(self.backup_dir)
+        except:
+            pass
+        else:
+            logger.warning("Prexisting backup database found and removed")
+
+        try:
+            shutil.move(self.sqlite_dir, self.backup_dir)
+        except:
+            logger.warning("No current database found")
+        else:
+            logger.debug("Backed up database")
+
+    def restore_sqlite_db(self):
+        if os.path.exists(self.backup_dir):
+            if os.path.exists(self.sqlite_dir):
+                try:
+                    shutil.rmtree(self.sqlite_dir)
+                except:
+                    logger.error("Failed to remove test database and restore" /
+                                 "database")
+                    return
+            try:
+                shutil.move(self.backup_dir, self.sqlite_dir)
+            except:
+                logger.error("Failed to restore database")
+
+    @property
+    def main_view(self):
+        return self.app.wait_select_single(emulators.MainView)

=== added file 'tests/autopilot/ubuntu_clock_app/tests/test_alarm.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_alarm.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_alarm.py	2014-07-28 20:36:30 +0000
@@ -0,0 +1,79 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# 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
+# 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: Nicholas Skaggs <[e-mail]>
+#              Nekhelesh Ramananthan <[e-mail]>
+
+"""Tests for the Clock App - Alarm"""
+
+from __future__ import absolute_import
+
+import datetime
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+from ubuntu_clock_app.tests import ClockAppTestCase
+
+
+class TestAlarm(ClockAppTestCase):
+
+    """Tests the alarm page features"""
+
+    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)))
+
+        self.page = self.main_view.open_alarm()
+
+    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.
+
+        """
+        tomorrow = datetime.datetime.now() + datetime.timedelta(days=1)
+        time_to_set = datetime.time(6, 10, 0)
+        test_alarm_name = 'Single Test'
+        # TODO this will be affected by the locale. --elopio - 2014-02-27
+        expected_alarm_name = unicode(test_alarm_name)
+        expected_recurrence = unicode(tomorrow.strftime('%A'))
+        expected_enabled_value = True
+        expected_time = unicode("6:10 AM")
+        expected_sound = "Ubuntu"
+        expected_alarm_info = (
+            expected_alarm_name, expected_recurrence, expected_enabled_value,
+            expected_time, expected_sound)
+
+        tomorrow_day = tomorrow.strftime('%A')
+        self.page.add_single_alarm(
+            test_alarm_name, tomorrow_day, time_to_set, expected_sound)
+
+        alarmlistPage = self.main_view.get_AlarmList()
+        saved_alarms = alarmlistPage.get_saved_alarms()
+        self.assertIn(expected_alarm_info, saved_alarms)
+
+        # TODO: Remove this statement once proper support for cleaning the
+        # test alarm environment is added. Until then remove the alarm
+        # created during the test at the end of the test.
+        # -- nik90 - 2014-03-03
+        alarmlistPage.delete_alarm(index=0)

=== added file 'tests/autopilot/ubuntu_clock_app/tests/test_clock.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_clock.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2014-07-28 20:36:30 +0000
@@ -0,0 +1,47 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# 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
+# 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: Renato Araujo Oliveira Filho <[e-mail]>
+#              Nekhelesh Ramananthan <[e-mail]>
+
+"""
+Tests for the Clock App, main window.
+"""
+
+from __future__ import absolute_import
+
+from testtools.matchers import Equals
+from autopilot.matchers import Eventually
+
+from ubuntu_clock_app.tests import ClockAppTestCase
+
+
+class TestClock(ClockAppTestCase):
+
+    """Test the clock page features."""
+
+    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(TestClock, self).setUp()
+        self.assertThat(
+            self.main_view.visible, Eventually(Equals(True)))
+
+        self.page = self.main_view.open_clock()

=== added directory 'tests/unit'
=== added file 'tests/unit/tst_hellocomponent.qml'
--- tests/unit/tst_hellocomponent.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_hellocomponent.qml	2014-07-28 20:36:30 +0000
@@ -0,0 +1,49 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Components 0.1
+import "../../components"
+
+// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
+
+// Execute tests with:
+//   qmltestrunner
+
+Item {
+    // The objects
+    HelloComponent {
+        id: objectUnderTest
+    }
+
+    TestCase {
+        name: "HelloComponent"
+
+        function init() {
+            console.debug(">> init");
+            compare("",objectUnderTest.text,"text was not empty on init");
+            console.debug("<< init");
+        }
+
+        function cleanup() {
+            console.debug(">> cleanup");
+            console.debug("<< cleanup");
+        }
+
+        function initTestCase() {
+            console.debug(">> initTestCase");
+            console.debug("<< initTestCase");
+        }
+
+        function cleanupTestCase() {
+            console.debug(">> cleanupTestCase");
+            console.debug("<< cleanupTestCase");
+        }
+
+        function test_canReadAndWriteText() {
+            var expected = "Hello World";
+
+            objectUnderTest.text = expected;
+
+            compare(expected,objectUnderTest.text,"expected did not equal result");
+        }
+    }
+}