Merge lp:~martin-borho/ubuntu-weather-app/more_tests into lp:ubuntu-weather-app/obsolete.trunk

[Martin Borho]

Added more autopilot tests

Added more autopilot tests:

* Test city search
* Test cancel add location
* Test refresh data
* Test switching temperature scale

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

PASSED: Continuous integration, rev:55
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/1/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/1
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/1

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Looks good Marting, keep on chugging along!

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-autolanding/49/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-autolanding/49/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-autolanding/49/console

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'components/CurrentWeather.qml'
--- components/CurrentWeather.qml	2013-06-09 15:42:41 +0000
+++ components/CurrentWeather.qml	2013-06-26 11:36:31 +0000
@@ -74,6 +74,7 @@
             width: units.gu(17)
             height: units.gu(10)
             id: tempCurrent
+            objectName: "CurrentTempText"
             text: currentTemp+String("°")+currentWeather.scale
             style: Text.Normal
             font.bold: false

=== modified file 'components/DateComponent.qml'
--- components/DateComponent.qml	2013-04-20 16:17:57 +0000
+++ components/DateComponent.qml	2013-06-26 11:36:31 +0000
@@ -41,6 +41,7 @@
 
         Label {
             id: dayText
+            objectName: "DayDateLabel"
             height: parent.height
             verticalAlignment: Text.AlignVCenter
         }

=== modified file 'components/SettingsPage.qml'
--- components/SettingsPage.qml	2013-06-17 19:22:19 +0000
+++ components/SettingsPage.qml	2013-06-26 11:36:31 +0000
@@ -25,7 +25,7 @@
                     for(var settingName in storedSettings) {
                         settings[settingName] = storedSettings[settingName];
                     }
-                    refreshData();
+                    refreshData(true);
                 });
                 settingsChanged = false;
             }
@@ -53,6 +53,7 @@
         }
         Switch {
             id: imperialSwitch
+            objectName: "ImperialSwitch"
             anchors {
                 verticalCenter: parent.verticalCenter
                 right: parent.right

=== modified file 'tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py'
--- tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py	2013-06-20 16:14:45 +0000
+++ tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py	2013-06-26 11:36:31 +0000
@@ -68,7 +68,7 @@
         toolbar = self.get_toolbar()
         if not toolbar.opened:
             self.open_toolbar()
-        row = toolbar.select_single("QQuickRow")
+        row = toolbar.select_single("ToolbarActions")
         loaderList = row.select_many("QQuickLoader")
         for loader in loaderList:
             buttonList = loader.select_many("Button")
@@ -90,9 +90,9 @@
         """Open the toolbar"""
         qmlView = self.get_qml_view()
 
-        lineX = qmlView.x + qmlView.width * 0.50
-        startY = qmlView.y + qmlView.height - 1
-        stopY = qmlView.y + qmlView.height * 0.95
+        lineX = int(qmlView.x + qmlView.width * 0.50)
+        startY = int(qmlView.y + qmlView.height - 1)
+        stopY = int(qmlView.y + qmlView.height * 0.95)
 
         self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
 
@@ -100,9 +100,9 @@
         """Hide the toolbar"""
         qmlView = self.get_qml_view()
 
-        lineX = qmlView.x + qmlView.width * 0.50
-        startY = qmlView.y + qmlView.height * 0.95
-        stopY = qmlView.y + qmlView.height - 1
+        lineX = int(qmlView.x + qmlView.width * 0.50)
+        startY = int(qmlView.y + qmlView.height * 0.95)
+        stopY = int(qmlView.y + qmlView.height - 1)
 
         self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
 
@@ -134,9 +134,9 @@
         """Switch to the previous tab"""
         qmlView = self.get_qml_view()
 
-        startX = qmlView.x + qmlView.width * 0.35
-        stopX = qmlView.x + qmlView.width * 0.50
-        lineY = qmlView.y + qmlView.height * 0.05
+        startX = int(qmlView.x + qmlView.width * 0.35)
+        stopX = int(qmlView.x + qmlView.width * 0.50)
+        lineY = int(qmlView.y + qmlView.height * 0.05)
 
         self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
         self.autopilot.pointing_device.click()
@@ -146,9 +146,9 @@
         """Switch to the next tab"""
         qmlView = self.get_qml_view()
 
-        startX = qmlView.x + qmlView.width * 0.50
-        stopX = qmlView.x + qmlView.width * 0.35
-        lineY = qmlView.y + qmlView.height * 0.05
+        startX = int(qmlView.x + qmlView.width * 0.50)
+        stopX = int(qmlView.x + qmlView.width * 0.35)
+        lineY = int(qmlView.y + qmlView.height * 0.05)
 
         self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.click()
+        self.autopilot.pointing_device.click()
\ No newline at end of file

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-06-20 11:35:52 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-06-26 11:36:31 +0000
@@ -33,7 +33,7 @@
         addLocPage = self.main_window.get_object("AddLocationPage", "AddLocationPage")
         self.assertThat(addLocPage.visible, Eventually(Equals(True)))
 
-    def test_add_location(self):        
+    def test_add_location(self):
         """Adds a location"""
         self._open_add_location_page()
 
@@ -47,13 +47,12 @@
 
         # wait for results and click on the first item
         resultsList = self.main_window.get_object('QQuickListView', 'SearchResultList')
-        resultsModel = self.main_window.get_object('QQuickListModel', 'CitiesModel')
         self.assertThat(resultsList.visible, Eventually(Equals(True), timeout=30))
         firstResult = resultsList.get_children()[0].get_children()[0]
         self.pointing_device.move_to_object(firstResult)
         self.pointing_device.click()
 
-        # LocationManagerPage should be visible and "London" added 
+        # LocationManagerPage should be visible and "London" added
         locationList = self.main_window.get_object('QQuickListView', 'LocationList')
         addedItem = locationList.get_children()[0]
         self.assertThat(addedItem.get_children()[1].text, Eventually(Equals("London")))
@@ -67,13 +66,43 @@
         toolbar = self.main_window.get_toolbar()
         self.assertThat(toolbar.opened, Eventually(Equals(False)))
 
-    """no way found to click the back button"""
-    #def test_cancel_adding_location(self):
-    #    self.open_add_location_page()
-    #    self.main_window.click_toolbar_button("Back")
-    #    locationList = self.main_window.get_object('QQuickListView', 'LocationList')
-    #    self.assertThat(locationList, Eventually(Equals(True)))
- 
+    def test_search_city(self):
+        """Search for cities"""
+        self._open_add_location_page()
+
+        # insert city name to search for
+        searchField = self.main_window.get_object("TextField", "SearchField")
+        self.pointing_device.move_to_object(searchField)
+        self.pointing_device.click()
+        self.keyboard.type("London")
+        self.assertThat(searchField.text, Eventually(Equals("London")))
+        self.keyboard.press_and_release('Enter')
+
+        # wait for results and click on the first item
+        resultsList = self.main_window.get_object('QQuickListView', 'SearchResultList')
+        self.assertThat(resultsList.visible, Eventually(Equals(True), timeout=30))
+        firstResult = resultsList.get_children()[0].get_children()[0]
+        self.assertThat(firstResult.text, Eventually(Equals("London, GB")))
+
+        # clear search field and do another search
+        for x in range(6):
+            self.keyboard.press_and_release('BackSpace')
+        self.assertThat(searchField.text, Eventually(Equals("")))
+        self.keyboard.type("Hanbu")
+        for x in range(3):
+            self.keyboard.press_and_release('BackSpace')
+        self.keyboard.type("mburg")
+        self.keyboard.press_and_release('Enter')
+        firstResult = resultsList.get_children()[0].get_children()[0]
+        self.assertThat(firstResult.text, Eventually(Equals("Hamburg, DE")))
+
+    def test_cancel_adding_location(self):
+        """Cancel the cities search"""
+        self._open_add_location_page()
+        self.main_window.click_toolbar_button("Back")
+        locationList = self.main_window.get_object('QQuickListView', 'LocationList')
+        self.assertThat(locationList.visible, Eventually(Equals(True)))
+
 class TestLocationManagerWithLocation(WeatherTestCase, DatabaseMixin):
     def setUp(self):
         self.clean_db()
@@ -97,7 +126,7 @@
         self.assertThat(loadingPage.visible, Eventually(Equals(False)))
 
         # go to the location manegr
-        self._open_location_manager()         
+        self._open_location_manager()
 
         # swipe right to delete the first location
         locationList = self.main_window.get_object('QQuickListView', 'LocationList')

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_mainview.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-06-20 11:18:17 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-06-26 11:36:31 +0000
@@ -32,7 +32,7 @@
         super(TestMainView, self).tearDown()
 
     def test_switch_tabs(self):
-        """Test start of app with two locations and switch from first to 
+        """Test start of app with two locations and switch from first to
         second tab"""
         # first tab should be visible after start
         tabs =  self.main_window.get_tabs()
@@ -48,3 +48,18 @@
         self.assertThat(tabObjects[1].visible, Eventually(Equals(True)))
         self.assertThat(tabObjects[1].title, Eventually(Equals("Hamburg")))
 
+    def test_refresh_tabs(self):
+        # get the dates from the test data
+        curr_dates = self.main_window.get_objects('Label','DayDateLabel')
+        tab1_curr_date = curr_dates[0].text
+        tab2_curr_date = curr_dates[1].text
+
+        # refresh and wait till loading has finished
+        self.main_window.click_toolbar_button("Refresh")
+        load_indicator = self.main_window.get_object('ActivityIndicator', 'LoadingSpinner')
+        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+
+        # get the data from the refreshed tabs, have to be new
+        refreshed_dates = self.main_window.get_objects('Label','DayDateLabel')
+        self.assertNotEqual(tab1_curr_date, refreshed_dates[0].text)
+        self.assertNotEqual(tab2_curr_date, refreshed_dates[1].text)

=== added file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-06-26 11:36:31 +0000
@@ -0,0 +1,70 @@
+# -*- 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.
+
+"""Tests for managing locations in Weather app"""
+
+from __future__ import absolute_import
+
+from testtools.matchers import Equals
+from autopilot.matchers import Eventually
+
+from ubuntu_weather_app.tests import WeatherTestCase, DatabaseMixin
+from ubuntu_weather_app.tests.weatherdata import locations_data
+
+class TestSettings(WeatherTestCase, DatabaseMixin):
+    def setUp(self):
+        self.clean_db()
+        self.launch_and_quit_app()
+        self.save_locations_to_storage(locations_data)
+        super(TestSettings, self).setUp()
+        self.assertThat(
+            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
+
+    def _open_settings_page(self):
+        """Opens the settings page"""
+        self.main_window.open_toolbar()
+        self.assertThat(self.main_window.get_toolbar().opened, Eventually(Equals(True)))
+        self.main_window.click_toolbar_button("Settings")
+
+    def test_switch_scale(self):
+        """Tests switching the scale in the settings"""
+        # first check metric values
+        current_temps = self.main_window.get_objects('QQuickText', 'CurrentTempText')
+        self.assertThat(current_temps[0].text, Eventually(Equals(u'21°C')))
+        self.assertThat(current_temps[1].text, Eventually(Equals(u'26°C')))
+
+        # open the settings and switch to imperial
+        self._open_settings_page()
+        switch = self.main_window.get_object('CheckBox', 'ImperialSwitch')
+        self.assertThat(switch.visible, Eventually(Equals(True)))
+        self.assertThat(switch.checked, Eventually(Equals(False)))
+        self.pointing_device.click_object(switch)
+        self.assertThat(switch.checked, Eventually(Equals(True)))
+        self.main_window.click_toolbar_button("Back")
+
+        # wait for reload and check the imperial values
+        load_indicator = self.main_window.get_object('ActivityIndicator', 'LoadingSpinner')
+        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        current_temps = self.main_window.get_objects('QQuickText', 'CurrentTempText')
+        self.assertThat(current_temps[0].text, Eventually(Equals(u'69°F')))
+        self.assertThat(current_temps[1].text, Eventually(Equals(u'78°F')))
+
+        # switch back to metric values again
+        self._open_settings_page()
+        switch = self.main_window.get_object('CheckBox', 'ImperialSwitch')
+        self.assertThat(switch.visible, Eventually(Equals(True)))
+        self.assertThat(switch.checked, Eventually(Equals(True)))
+        self.pointing_device.click_object(switch)
+        self.assertThat(switch.checked, Eventually(Equals(False)))
+        self.main_window.click_toolbar_button("Back")
+
+        # wait for reload and check the metric values again
+        load_indicator = self.main_window.get_object('ActivityIndicator', 'LoadingSpinner')
+        self.assertThat(load_indicator.running, Eventually(Equals(False)))
+        current_temps = self.main_window.get_objects('QQuickText', 'CurrentTempText')
+        self.assertThat(current_temps[0].text, Eventually(Equals(u'21°C')))
+        self.assertThat(current_temps[1].text, Eventually(Equals(u'26°C')))
\ No newline at end of file

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-06-20 16:10:56 +0000
+++ ubuntu-weather-app.qml	2013-06-26 11:36:31 +0000
@@ -132,7 +132,18 @@
         Page {
             id: tabPage
             visible: false
-            ActivityIndicator{id:loading; running: false; z: 1; anchors{top: parent.top; topMargin: units.gu(0.5); right: parent.right; rightMargin: units.gu(1)}}
+            ActivityIndicator{
+                id:loading
+                objectName: "LoadingSpinner"
+                running: false
+                z: 1
+                anchors{
+                    top: parent.top
+                    topMargin: units.gu(0.5)
+                    right: parent.right
+                    rightMargin: units.gu(1)
+                }
+            }
             Tabs {
                 id: tabs
                 objectName: "LoadingTabs"