Merge lp:~laney/ubuntu-system-settings/autopilot-datetime into lp:ubuntu-system-settings

[Iain Lane]

Add some initial tests for the datetime panel

Add some initial tests for the datetime panel

Some are skipped currently because they need the timedated mock to emit PropertiesChanged

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:530
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/624/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/128
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/128/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/127

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/624/rebuild

review: Approve (continuous-integration)

[lp:~laney/ubuntu-system-settings/autopilot-datetime]

531. By Iain Lane on 2014-01-30

Enable all tests; bump dbusmock version; don't use scroll_to_and_click where it's not necessary

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:531
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/625/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/128

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/625/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Looks good and run without issues on both desktop and phone configs!

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-01-30 11:32:47 +0000
+++ debian/control	2014-01-30 16:43:15 +0000
@@ -90,7 +90,7 @@
 Architecture: all
 Depends: ubuntu-system-settings,
          python-autopilot,
-         python-dbusmock (>= 0.9.2),
+         python-dbusmock (>= 0.10.1),
          libautopilot-qt,
          ubuntu-ui-toolkit-autopilot,
          dpkg-dev,

=== modified file 'plugins/time-date/ChooseTimeZone.qml'
--- plugins/time-date/ChooseTimeZone.qml	2014-01-27 17:09:51 +0000
+++ plugins/time-date/ChooseTimeZone.qml	2014-01-30 16:43:15 +0000
@@ -65,6 +65,7 @@
             margins: units.gu(2)
         }
         id: filterCities
+        objectName: "selectTimeZoneField"
         onTextChanged: timeDatePanel.filter = text
         visible: setTimeZoneSelector.selectedIndex == 1 // Manually
         Component.onCompleted: forceActiveFocus()
@@ -80,6 +81,7 @@
 
     ListView {
         id: locationsListView
+        objectName: "locationsListView"
         clip: true
         anchors {
             top: filterCities.bottom
@@ -108,6 +110,7 @@
     }
 
     Label {
+        objectName: "nothingLabel"
         anchors.centerIn: parent
         visible: setTimeZoneSelector.selectedIndex ==1 &&
                  locationsListView.count == 0

=== modified file 'plugins/time-date/PageComponent.qml'
--- plugins/time-date/PageComponent.qml	2013-09-25 16:39:54 +0000
+++ plugins/time-date/PageComponent.qml	2014-01-30 16:43:15 +0000
@@ -27,6 +27,7 @@
 
 ItemPage {
     title: i18n.tr("Time & Date")
+    objectName: "timeDatePage"
 
     function getUTCOffset() {
         // We get the difference in minutes between UTC and our TZ (UTC - TZ)
@@ -52,6 +53,7 @@
         ListItem.Standard { text: i18n.tr ("Time zone:") }
 
         ListItem.SingleValue {
+            objectName: "timeZone"
             id: timeZone
             //e.g. America/New_York -> America/New York
             text: timeDatePanel.timeZone.replace("_", " ")
@@ -62,6 +64,7 @@
 
         ListItem.ItemSelector {
             id: setTimeAutomatically
+            objectName: "timeItemSelector"
             text: i18n.tr ("Set the time and date:")
             model: [ i18n.tr("Automatically") , i18n.tr("Manually")]
             expanded: true
@@ -93,6 +96,7 @@
 
         ListItem.Standard {
             id: currentTime
+            objectName: "currentTime"
             progression: setTimeAutomatically.selectedIndex === 1 // Manually
             enabled: progression
             onClicked: {

=== modified file 'plugins/time-date/timedate.cpp'
--- plugins/time-date/timedate.cpp	2013-10-07 11:08:09 +0000
+++ plugins/time-date/timedate.cpp	2014-01-30 16:43:15 +0000
@@ -106,8 +106,11 @@
     Q_UNUSED (changed_properties);
 
     if (invalidated_properties.contains("Timezone")) {
-        m_currentTimeZone = getTimeZone();
-        Q_EMIT timeZoneChanged();
+        QString tz(getTimeZone());
+        if (tz != m_currentTimeZone) {
+            m_currentTimeZone = tz;
+            Q_EMIT timeZoneChanged();
+        }
     }
 
     if (invalidated_properties.contains("NTP")) {

=== added file 'tests/autopilot/ubuntu_system_settings/tests/test_datetime.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_datetime.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_datetime.py	2014-01-30 16:43:15 +0000
@@ -0,0 +1,102 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2013 Canonical
+#
+# 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.
+
+import dbus
+import dbusmock
+import subprocess
+from time import sleep
+
+from autopilot.platform import model
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals, NotEquals, GreaterThan
+
+from ubuntu_system_settings.tests import UbuntuSystemSettingsTestCase
+from ubuntu_system_settings.utils.i18n import ugettext as _
+
+from ubuntuuitoolkit import emulators as toolkit_emulators
+
+class TimeDateTestCase(UbuntuSystemSettingsTestCase,
+                       dbusmock.DBusTestCase):
+    """ Tests for the Time & Date Page """
+
+    @classmethod
+    def setUpClass(klass):
+        klass.start_system_bus()
+        klass.dbus_con = klass.get_dbus(True)
+        (klass.p_mock,klass.obj_timedate1) = klass.spawn_server_template(
+            'timedated', {}, stdout=subprocess.PIPE)
+
+    def setUp(self):
+        """ Go to Time & Date page """
+        self.obj_timedate1.Reset()
+        super(TimeDateTestCase, self).setUp("time-date")
+
+    @property
+    def time_date_page(self):
+        return self.main_view.select_single(objectName='timeDatePage')
+
+    @property
+    def tz_page(self):
+        return self.main_view.select_single(objectName='timeZone')
+
+    def click_tz_search_field(self):
+        self.scroll_to_and_click(self.tz_page)
+        text_field = self.main_view.select_single(objectName='selectTimeZoneField')
+        self.pointer.move_to_object(text_field)
+
+    def test_time_date_page(self):
+        """ Checks whether Time & Date page is available """
+        self.assertThat(self.time_date_page, NotEquals(None))
+        self.assertThat(self.time_date_page.title, Equals(_('Time & Date')))
+
+    def test_tz_list_initially_empty(self):
+        """ Checks that no list is displayed initially """
+        self.scroll_to_and_click(self.tz_page)
+        labelVisible = self.main_view.select_single(objectName='nothingLabel').visible
+        self.assertThat(labelVisible, Equals(True))
+
+    def test_searching_tz(self):
+        """ Check that searching for a valid location shows something """
+        self.click_tz_search_field()
+        self.keyboard.type('London, United Kingdom')
+        listview = self.main_view.select_single(objectName='locationsListView')
+        self.assertThat(listview.count, GreaterThan(0))
+
+    def test_searching_tz_not_found(self):
+        """ Check that searching for an invalid location shows nothing """
+        self.click_tz_search_field()
+        self.keyboard.type('Oh no you don\'t!')
+        listview = self.main_view.select_single(objectName='locationsListView')
+        self.assertThat(listview.count, Equals(0))
+        labelVisible = self.main_view.select_single(objectName='nothingLabel').visible
+        self.assertThat(labelVisible, Equals(True))
+
+    def test_manual_tz_selection(self):
+        """ Check that manually selecting a timezone sets it properly """
+        self.click_tz_search_field()
+        self.keyboard.type('London, United Kingdom')
+        listview = self.main_view.select_single(objectName='locationsListView')
+        london = listview.select_many(toolkit_emulators.Standard)[0]
+        self.pointer.click_object(london)
+        header = self.main_view.select_single(objectName='MainView_Header')
+        self.assertThat(header.title, Eventually(Equals(_('Time & Date'))))
+        self.assertThat(self.tz_page.text, Equals('Europe/London'))
+
+    def test_same_tz_selection(self):
+        """ Check that manually setting a timezone then setting the same one doesn't
+            take you back to the index """
+        self.test_manual_tz_selection()
+        self.click_tz_search_field()
+        # This is also in Europe/London
+        self.keyboard.type('Preston, United Kingdom')
+        listview = self.main_view.select_single(objectName='locationsListView')
+        preston = listview.select_many(toolkit_emulators.Standard)[0]
+        self.pointer.click_object(preston)
+        # The timer is 1 second, wait and see that we haven't moved pages
+        sleep(2)
+        header = self.main_view.select_single(objectName='MainView_Header')
+        self.assertThat(header.title, Eventually(Equals(_('Time zone'))))