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

[Martin Borho]

integrated toolkit emulator from SDK, updated test data

- Integrated toolkit emulator from SDK
- Updated test data with new internal format version

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

PASSED: Continuous integration, rev:88
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/28/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/20
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/27
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/27
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/20

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Well, I'm getting some failures off the cuff on my box, going to try on the device if I can.

[lp:~martin-borho/ubuntu-weather-app/sdk_emulator]

89. By Martin Borho on 2013-08-07

added more assertions to improve test stability

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

PASSED: Continuous integration, rev:89
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/29/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/21
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/28
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/28
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/21

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

review: Approve (continuous-integration)

[lp:~martin-borho/ubuntu-weather-app/sdk_emulator]

90. By Martin Borho on 2013-08-07

cleaned some test code, removed obsolete test

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

PASSED: Continuous integration, rev:90
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/30/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/22
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/29
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/29
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/22

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Excellent Martin. Thanks for adding the extra asserts and cleanup!

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-05-14 20:38:57 +0000
+++ debian/control	2013-08-07 17:39:25 +0000
@@ -26,5 +26,6 @@
          libautopilot-qt,
          libqt5test5,
          libqt5widgets5,
+         ubuntu-ui-toolkit-autopilot,
 Description: Test package for the weather app
  Autopilot tests for the weather app package
 
=== removed directory 'tests/autopilot/ubuntu_weather_app/emulators'
=== added file 'tests/autopilot/ubuntu_weather_app/emulators.py'
--- tests/autopilot/ubuntu_weather_app/emulators.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_weather_app/emulators.py	2013-08-07 17:39:25 +0000
@@ -0,0 +1,40 @@
+# -*- 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.
+#
+# Authored by: Martin Borho <[e-mail]>
+
+"""weather app autopilot tests and emulators - top level package."""
+
+from ubuntuuitoolkit import emulators as toolkit_emulators
+
+
+class MainView(toolkit_emulators.MainView):
+
+    def get_object(self, typeName, name):
+        """Get a specific object"""
+        return self.select_single(typeName, objectName=name)
+
+    def get_objects(self, typeName, name):
+        """Get more than one object"""
+        return self.select_many(typeName, objectName=name)
+
+    def get_tabs(self):
+        """Return the LocationTabs emulator of the MainView."""
+        tabs = self.select_single(Tabs)
+        assert tabs is not None, toolkit_emulators._NO_TABS_ERROR
+        return tabs
+
+class Tabs(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+    """LocationTabs Autopilot emulator."""
+
+    def get_current_tab(self): 
+        """Return the currently selected tab.""" 
+        return self.select_many('LocationTab')[self.selectedTabIndex]
+
+    def get_number_of_tabs(self): 
+        """Return the number of tabs.""" 
+        return len(self.select_many('LocationTab'))
 
=== removed file 'tests/autopilot/ubuntu_weather_app/emulators/__init__.py'
--- tests/autopilot/ubuntu_weather_app/emulators/__init__.py	2013-06-20 16:10:06 +0000
+++ tests/autopilot/ubuntu_weather_app/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2013 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Authored by: Nicholas Skaggs <[e-mail]>
 
=== removed file 'tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py'
--- tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py	2013-07-11 22:04:11 +0000
+++ tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2013 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Authored by: Nicholas Skaggs <[e-mail]>
-
-from testtools.matchers import Equals, NotEquals, Not, Is
-from autopilot.matchers import Eventually
-
-class ubuntusdk(object):
-    """An emulator class that makes it easy to interact with the ubuntu sdk applications."""
-
-    def __init__(self, autopilot, app):
-        self.app = app
-        self.autopilot = autopilot
-
-    def get_qml_view(self):
-        """Get the main QML view"""
-        return self.app.select_single("QQuickView")
-
-    def get_object(self, typeName, name):
-        """Get a specific object"""
-        return self.app.select_single(typeName, objectName=name)
-
-    def get_objects(self, typeName, name):
-        """Get more than one object"""
-        return self.app.select_many(typeName, objectName=name)
-
-    def get_tabs(self):
-        """Return all tabs"""
-        return self.app.select_single("Tabs")
-
-    def switch_to_tab(self, tab):
-        """Switch to the specified tab number"""
-        tabs = self.get_tabs()
-        currentTab = tabs.selectedTabIndex
-
-        #perform operations until tab == currentTab
-        while tab != currentTab:
-            if tab > currentTab:
-                self._next_tab()
-            if tab < currentTab:
-                self._previous_tab()
-            currentTab = tabs.selectedTabIndex
-
-    def _previous_tab(self):
-        """Switch to the previous tab"""
-        qmlView = self.get_qml_view()
-
-        startX = int(qmlView.x + qmlView.width * 0.10)
-        stopX = int(qmlView.x + qmlView.width * 0.45)
-        lineY = int(qmlView.y + qmlView.height * 0.05)
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.move(startX, lineY)
-        self.autopilot.pointing_device.click()
-        self.autopilot.pointing_device.click()
-
-    def _next_tab(self):
-        """Switch to the next tab"""
-        qmlView = self.get_qml_view()
-
-        startX = int(qmlView.x + qmlView.width * 0.45)
-        stopX = int(qmlView.x + qmlView.width * 0.10)
-        lineY = int(qmlView.y + qmlView.height * 0.05)
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.move(startX, lineY)
-        self.autopilot.pointing_device.click()
-        self.autopilot.pointing_device.click()
-
-    def toggle_toolbar(self):
-        """Toggle the toolbar between revealed and hidden"""
-        #check and see if the toolbar is open or not
-        if self.get_toolbar().opened:
-            self.hide_toolbar()
-        else:
-            self.open_toolbar()
-
-    def get_toolbar(self):
-        """Returns the toolbar in the main events view."""
-        return self.app.select_single("Toolbar")
-
-    def get_toolbar_button(self, buttonObject):
-        """Returns the toolbar button with objectName buttonObject"""
-        toolbar = self.get_toolbar()
-        if not toolbar.opened:
-            self.open_toolbar()
-        buttonList = toolbar.select_many("ActionItem")
-        #old version is ToolbarButton
-        if not buttonList:
-            buttonList = toolbar.select_many("ToolbarButton")
-        for button in buttonList:
-            if button.objectName == buttonObject:
-                return button
-
-    def click_toolbar_button(self, buttonObject):
-        """Clicks the toolbar button with objectName buttonObject"""
-        #The toolbar button is assumed to be the following format
-        #Toolbar {
-        #         ...
-        #           ActionItem {
-        #               objectName: "name"
-        button = self.get_toolbar_button(buttonObject)
-        self.autopilot.pointing_device.click_object(button)
-        return button
-
-    def open_toolbar(self):
-        """Open the toolbar"""
-        qmlView = self.get_qml_view()
-
-        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)
-
-    def hide_toolbar(self):
-        """Hide the toolbar"""
-        qmlView = self.get_qml_view()
-
-        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)
-
-    def set_popup_value(self, popover, button, value):
-        """Changes the given popover selector to the request value
-        At the moment this only works for values that are currently visible. To
-        access the remaining items, a help method to drag and recheck is needed."""
-        #The popover is assumed to be the following format
-        #Component {
-        #    id: actionSelectionPopover
-        #
-        #ActionSelectionPopover {
-        #                actions: ActionList {
-        #                    Action {
-
-        popList = self.get_object("ActionSelectionPopover", popover)
-        itemList = popList.select_many("Label")
-        for item in itemList:
-            if item.text == value:
-                self.autopilot.pointing_device.click_object(item)
-                return item
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-07-19 11:39:31 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-08-07 17:39:25 +0000
@@ -4,6 +4,8 @@
 # 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.
+#
+# Authored by: Martin Borho <[e-mail]>
 
 """weather-app autopilot tests."""
 
@@ -16,7 +18,8 @@
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
 
-from ubuntu_weather_app.emulators.ubuntusdk import ubuntusdk
+from ubuntuuitoolkit import emulators as toolkit_emulators
+from ubuntu_weather_app.emulators import MainView
 
 class WeatherTestCase(AutopilotTestCase):
 
@@ -51,18 +54,20 @@
         self.app = self.launch_test_application(
             self.qmlscene(),
             self.local_location,
-            app_type='qt')
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             self.qmlscene(),
             "/usr/share/ubuntu-weather-app/ubuntu-weather-app.qml",
             "--desktop_file_hint=/usr/share/applications/ubuntu-weather-app.desktop",
-            app_type='qt')
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_and_quit_app(self):
         self.launch_app()
-        self.main_window.get_qml_view().visible.wait_for(True)
+        self.get_qml_view().visible.wait_for(True)
 
         # When calling launch_app an instance of the spawned process
         # control object will be stored in self.app.process, and a cleanup
@@ -72,19 +77,22 @@
         # the process during regular test setup.
         self.doCleanups()
 
+    def get_qml_view(self):
+        return self.app.select_single("QQuickView")
+
     @property
     def main_window(self):
-        return ubuntusdk(self, self.app)#MainWindow(self, self.app)
+        return self.app.select_single(MainView)
 
 class SheetMixin(object):
     """A mixin to to give access to common sheet elements"""
     def _click_sheet_confirm(self):
         """Clicks the confirm button"""
-        self.pointing_device.click_object(self.main_window.app.select_many('Button')[1])
+        self.pointing_device.click_object(self.main_window.select_many('Button')[1])
 
     def _click_sheet_cancel(self):
         """Clicks the cancel button"""
-        self.pointing_device.click_object(self.main_window.app.select_many('Button')[0])
+        self.pointing_device.click_object(self.main_window.select_many('Button')[0])
 
 class DatabaseMixin(object):
 
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-08-04 02:26:07 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-08-07 17:39:25 +0000
@@ -23,13 +23,14 @@
         self.clean_db()
         super(TestLocationManager, self).setUp()
         self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
+            self.get_qml_view().visible, Eventually(Equals(True)))
 
     def _open_add_location_page(self):
         """Opens the AddLocationPage"""
         # click on listitem to open AddLocationPage
         locationList = self.main_window.get_object('QQuickListView', 'LocationList')
         addCityItem = locationList.get_children()[0]
+        self.assertThat(lambda: addCityItem, Eventually(NotEquals(None)))
         self.pointing_device.move_to_object(addCityItem)
         self.pointing_device.click()
 
@@ -54,8 +55,9 @@
 
         # 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.assertThat(lambda: searchField, Eventually(NotEquals(None)))
+        self.pointing_device.click_object(searchField)
+        self.assertThat(searchField.focus, Eventually(Equals(True)))
         self.keyboard.type("London")
         self.assertThat(searchField.text, Eventually(Equals("London")))
         self.keyboard.press_and_release('Enter')
@@ -63,14 +65,16 @@
         # 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]
+        firstResult = self.main_window.get_object('Standard', 'searchResult0')
+        self.assertThat(lambda: firstResult, Eventually(NotEquals(None)))
         self.pointing_device.move_to_object(firstResult)
         self.pointing_device.click()
 
         # 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")))
+        addedItem = self.main_window.get_object('Standard', "existingLocation0")
+        self.assertThat(lambda: addedItem, Eventually(NotEquals(None)))
+        self.assertThat(addedItem.text, Eventually(Equals("London")))
         self._click_sheet_confirm()
 
         # back to locations, wait till data is loaded
@@ -83,18 +87,15 @@
         tabObjects = self.main_window.get_objects('LocationTab','LocationTab')
         self.assertEqual(1, len(tabObjects))
 
-    def test_toolbar_hidden_when_no_location_is_defined(self):
-        """Toolbar is not visible when there's no location is defined"""
-        toolbar = self.main_window.get_toolbar()
-        self.assertThat(toolbar.opened, Eventually(Equals(False)))
-
     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.assertThat(lambda: searchField, Eventually(NotEquals(None)))
         self.pointing_device.click_object(searchField)
+        self.assertThat(searchField.focus, Eventually(Equals(True)))
         self.keyboard.type("London")
         self.assertThat(searchField.text, Eventually(Equals("London")))
         self.keyboard.press_and_release('Enter')
@@ -103,10 +104,12 @@
         resultsList = self.main_window.get_object('QQuickListView', 'SearchResultList')
         self.assertThat(resultsList.visible, Eventually(Equals(True), timeout=30))
         firstResult = self.select_single_retry("Standard", objectName="searchResult0")
+        self.assertThat(lambda: firstResult, Eventually(NotEquals(None)))
         self.assertThat(firstResult.text, Eventually(Equals("London, GB")))
 
         # clear search field and do another search
         clear_button = searchField.select_single("AbstractButton")
+        self.assertThat(lambda: clear_button, Eventually(NotEquals(None)))
         self.pointing_device.click_object(clear_button)
         self.assertThat(searchField.text, Eventually(Equals("")))
 
@@ -115,6 +118,7 @@
         self.keyboard.press_and_release('Enter')
         self.assertThat(resultsList.visible, Eventually(Equals(True), timeout=30))
         firstResult = self.select_single_retry("Standard", objectName="searchResult0")
+        self.assertThat(lambda: firstResult, Eventually(NotEquals(None)))
         self.assertThat(firstResult.text, Eventually(Equals("Hamburg, DE")))
 
     def test_cancel_adding_location(self):
@@ -130,8 +134,9 @@
 
         # 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.assertThat(lambda: searchField, Eventually(NotEquals(None)))
+        self.pointing_device.click_object(searchField)
+        self.assertThat(searchField.focus, Eventually(Equals(True)))
         self.keyboard.type("UbuntuCity") # Unfortunately, no UbuntuCity in the world
         self.assertThat(searchField.text, Eventually(Equals("UbuntuCity")))
         self.keyboard.press_and_release('Enter')
@@ -146,27 +151,20 @@
         self.clean_db()
         self.launch_and_quit_app()
         # add one location to storage
-        #self.save_locations_to_storage([locations_data[0]])
         self.save_locations_to_storage(locations_data)
         super(TestLocationManagerWithLocation, self).setUp()
         self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
+            self.get_qml_view().visible, Eventually(Equals(True)))
 
     def _open_location_manager(self):
         """Opens the location manager"""
-        toolbar = self.main_window.get_toolbar()
-        self.main_window.open_toolbar()
-        self.assertThat(toolbar.animating, Eventually(Equals(False)))
-        self.assertThat(toolbar.state, Eventually(Equals("spread")))
-        self.main_window.click_toolbar_button("EditButton")
-        location_manager_sheet = self.main_window.get_object(
-            "ComposerSheet", "LocationManagerSheet")
-        self.assertThat(location_manager_sheet.opacity, Eventually(Equals(1)))
+        self.main_window.open_toolbar().click_button("EditButton")
 
     def _swipe_location_to_remove(self):
         """Swipe right to delete the first location"""
         number_of_locations = self._get_number_of_locations()
         firstLocation = self.app.select_single("Standard", objectName="existingLocation0")
+        self.assertThat(lambda: firstLocation, Eventually(NotEquals(None)))
         
         x, y, w, h = firstLocation.globalRect
         tx = x + (w / 8)
@@ -223,8 +221,3 @@
         tabObjects = self.main_window.get_objects('LocationTab','LocationTab')
         self.assertEqual(tabsSumStart, len(tabObjects))
 
-    def test_toolbar_opened_when_location_is_defined(self):
-        """Toolbar is visible since there's a location defined"""
-        self._open_location_manager()
-        toolbar = self.main_window.get_toolbar()
-        self.assertThat(toolbar.opened, Eventually(Equals(True)))
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_mainview.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-07-27 16:31:15 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-08-07 17:39:25 +0000
@@ -4,6 +4,8 @@
 # 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.
+#
+# Authored by: Martin Borho <[e-mail]>
 
 """Tests for Weather app"""
 
@@ -26,7 +28,7 @@
         self.save_locations_to_storage(locations_data)
         super(TestMainView, self).setUp()
         self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
+            self.get_qml_view().visible, Eventually(Equals(True)))
 
     def tearDown(self):
         super(TestMainView, self).tearDown()
@@ -42,7 +44,7 @@
         self.assertThat(tabObjects[1].visible, Eventually(Equals(False)))
         self.assertThat(tabObjects[0].title, Eventually(Equals("London")))
         # switch to next tab
-        self.main_window.switch_to_tab(1)
+        self.main_window.switch_to_tab_by_index(1)
         self.assertThat(tabs.selectedTabIndex, Eventually(Equals(1)))
         self.assertThat(tabObjects[0].visible, Eventually(Equals(False)))
         self.assertThat(tabObjects[1].visible, Eventually(Equals(True)))
@@ -55,7 +57,7 @@
         tab2_curr_date = curr_dates[2].text
 
         # refresh and wait till loading has finished
-        self.main_window.click_toolbar_button("RefreshButton")
+        self.main_window.open_toolbar().click_button("RefreshButton")
         load_indicator = self.main_window.get_object('ActivityIndicator', 'LoadingSpinner')
         self.assertThat(load_indicator.running, Eventually(Equals(False)))
 
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-07-27 16:31:15 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings.py	2013-08-07 17:39:25 +0000
@@ -9,7 +9,7 @@
 
 from __future__ import absolute_import
 
-from testtools.matchers import Equals
+from testtools.matchers import Equals, NotEquals
 from autopilot.matchers import Eventually
 
 from ubuntu_weather_app.tests import WeatherTestCase, DatabaseMixin, SheetMixin
@@ -22,28 +22,27 @@
         self.save_locations_to_storage(locations_data)
         super(TestSettings, self).setUp()
         self.assertThat(
-            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
+            self.get_qml_view().visible, Eventually(Equals(True)))
 
     def _open_settings_sheet(self):
         """Opens the settings sheet"""
-        self.main_window.open_toolbar()
-        self.assertThat(self.main_window.get_toolbar().opened, Eventually(Equals(True)))
-        self.main_window.click_toolbar_button("SettingsButton")
+        self.main_window.open_toolbar().click_button("SettingsButton")
 
     def _move_pointer_around(self):
         """Helper method to move the pointer around, to assure selector is opened"""
         sheet = self.main_window.get_object('ComposerSheet', 'SettingsSheet')
+        self.assertThat(lambda: sheet, Eventually(NotEquals(None)))
         self.pointing_device.move_to_object(sheet)
 
     def _check_units(self, units):
         """Checks selected units by values from the first location tab"""
         current_temps = self.main_window.get_objects('QQuickText', 'CurrentTempText')
         if units == "imperial":
-            self.assertThat(current_temps[0].text, Eventually(Equals(u'76°F')))
-            self.assertThat(current_temps[2].text, Eventually(Equals(u'78°F')))
+            self.assertThat(current_temps[0].text, Eventually(Equals(u'70°F')))
+            self.assertThat(current_temps[2].text, Eventually(Equals(u'72°F')))
         else:
-            self.assertThat(current_temps[0].text, Eventually(Equals(u'25°C')))
-            self.assertThat(current_temps[2].text, Eventually(Equals(u'25°C')))
+            self.assertThat(current_temps[0].text, Eventually(Equals(u'21°C')))
+            self.assertThat(current_temps[2].text, Eventually(Equals(u'22°C')))
 
     def test_switch_scale(self):
         """Tests switching the scale in the settings"""
@@ -59,6 +58,7 @@
         # choose second option, fahrenheit
         self._move_pointer_around()
         imperial_option = units_selector.get_children()[3]
+        self.assertThat(lambda: imperial_option, Eventually(NotEquals(None)))
         self.pointing_device.click_object(imperial_option)
         self.assertThat(units_selector.selectedIndex, Eventually(Equals(1)))
         self._click_sheet_confirm()
@@ -71,6 +71,7 @@
         # switch back to metric values again
         self._open_settings_sheet()
         units_selector = self.main_window.get_object('ValueSelector', "UnitsSelector")
+        self.assertThat(lambda: units_selector, Eventually(NotEquals(None)))
         self.assertThat(units_selector.selectedIndex, Eventually(Equals(1)))
         self.pointing_device.click_object(units_selector)
         self.assertThat(units_selector.expanded, Eventually(Equals(True)))
@@ -78,6 +79,7 @@
         # click celsius option
         self._move_pointer_around()
         metric_option = units_selector.get_children()[4]
+        self.assertThat(lambda: metric_option, Eventually(NotEquals(None)))
         self.pointing_device.click_object(metric_option)
 
         # confirm
@@ -96,12 +98,14 @@
         self._open_settings_sheet()
 
         units_selector = self.main_window.get_object('ValueSelector', "UnitsSelector")
+        self.assertThat(lambda: units_selector, Eventually(NotEquals(None)))
         self.assertThat(units_selector.selectedIndex, Eventually(Equals(0)))
         self.pointing_device.click_object(units_selector)
 
         # choose second option, fahrenheit
         self._move_pointer_around()
         imperial_option = units_selector.get_children()[3]
+        self.assertThat(lambda: imperial_option, Eventually(NotEquals(None)))
         self.pointing_device.click_object(imperial_option)
         self.assertThat(units_selector.selectedIndex, Eventually(Equals(1)))
 
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/weatherdata.py'
--- tests/autopilot/ubuntu_weather_app/tests/weatherdata.py	2013-07-27 16:31:15 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/weatherdata.py	2013-08-07 17:39:25 +0000
@@ -6,8 +6,7 @@
 # by the Free Software Foundation.
 locations_data = []
 
-locations_data.append("""{"location":{"service_id":2643743,"name":"London","country":"GB","service":"openweathermap"},"db":{"updated":"2013-07-27T16:06:14.606Z","id":1},"format":20130727,"data":[{"date":"2013-07-27","timestamp":1374926400,"metric":{"tempMin":15.55,"tempMax":24.5},"imperial":{"tempMin":59.99,"tempMax":76.1},"pressure":1009.81,"humidity":63,"condition":{"id":502,"main":"Rain","description":"heavy intensity rain","icon":"10d"},"wind_speed":3.3,"wind_deg":101,"hourly":[],"current":{"timestamp":1374940874,"date":"2013-07-27 18:01","metric":{"temp":24.5},"imperial":{"temp":76.1},"humidity":64,"pressure":1004,"wind_speed_kmh":6.2,"wind_speed_mph":3.852494,"wind_deg":110,"condition":{"id":520,"main":"Rain","description":"light intensity shower rain","icon":"09d"},"service":"openweathermap","service_id":2643743}},{"date":"2013-07-28","timestamp":1375012800,"metric":{"tempMin":14.7,"tempMax":19.86},"imperial":{"tempMin":58.46,"tempMax":67.74799999999999},"pressure":1013.76,"humidity":91,"condition":{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"},"wind_speed":4.46,"wind_deg":213,"hourly":[]},{"date":"2013-07-29","timestamp":1375099200,"metric":{"tempMin":14.67,"tempMax":17.63},"imperial":{"tempMin":58.406,"tempMax":63.733999999999995},"pressure":1016.16,"humidity":95,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":4.73,"wind_deg":213,"hourly":[]},{"date":"2013-07-30","timestamp":1375185600,"metric":{"tempMin":14.29,"tempMax":19.79},"imperial":{"tempMin":57.721999999999994,"tempMax":67.622},"pressure":1023.8,"humidity":70,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":3.98,"wind_deg":252,"hourly":[]},{"date":"2013-07-31","timestamp":1375272000,"metric":{"tempMin":15.19,"tempMax":24.08},"imperial":{"tempMin":59.342,"tempMax":75.344},"pressure":1021.26,"humidity":69,"condition":{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"},"wind_speed":4.3,"wind_deg":217,"hourly":[]},{"date":"2013-08-01","timestamp":1375358400,"metric":{"tempMin":19.05,"tempMax":28.47},"imperial":{"tempMin":66.28999999999999,"tempMax":83.24600000000001},"pressure":1018.91,"humidity":59,"condition":{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"},"wind_speed":3.45,"wind_deg":176,"hourly":[]},{"date":"2013-08-02","timestamp":1375444800,"metric":{"tempMin":14.26,"tempMax":18.83},"imperial":{"tempMin":57.668,"tempMax":65.894},"pressure":1016.86,"humidity":0,"condition":{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"},"wind_speed":7.11,"wind_deg":207,"hourly":[]},{"date":"2013-08-03","timestamp":1375531200,"metric":{"tempMin":13.28,"tempMax":20.37},"imperial":{"tempMin":55.903999999999996,"tempMax":68.666},"pressure":1024.05,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":3.05,"wind_deg":249,"hourly":[]},{"date":"2013-08-04","timestamp":1375617600,"metric":{"tempMin":14.07,"tempMax":21.59},"imperial":{"tempMin":57.326,"tempMax":70.862},"pressure":1020.85,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":3.55,"wind_deg":165,"hourly":[]},{"date":"2013-08-05","timestamp":1375704000,"metric":{"tempMin":13.76,"tempMax":19.47},"imperial":{"tempMin":56.768,"tempMax":67.04599999999999},"pressure":1014.62,"humidity":0,"condition":{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"},"wind_speed":5.38,"wind_deg":196,"hourly":[]}],"save":true}""")
-
-locations_data.append( """{"location":{"coord":{"lon":10,"lat":53.549999},"service_id":2911298,"name":"Hamburg","country":"DE","service":"openweathermap"},"db":{"updated":"2013-07-27T16:06:14.628Z","id":2},"format":20130727,"data":[{"date":"2013-07-27","timestamp":1374922800,"metric":{"tempMin":16.77,"tempMax":25.3},"imperial":{"tempMin":62.186,"tempMax":77.53999999999999},"pressure":1018.72,"humidity":66,"condition":{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"},"wind_speed":2.15,"wind_deg":102,"hourly":[],"current":{"timestamp":1374940200,"date":"2013-07-27 17:50","metric":{"temp":25.3},"imperial":{"temp":77.53999999999999},"humidity":94,"pressure":1009,"wind_speed_kmh":6.2,"wind_speed_mph":3.852494,"wind_deg":240,"condition":{"id":200,"main":"Thunderstorm","description":"thunderstorm with light rain","icon":"11d"},"service":"openweathermap","service_id":2911298}},{"date":"2013-07-28","timestamp":1375009200,"metric":{"tempMin":17.73,"tempMax":22.74},"imperial":{"tempMin":63.914,"tempMax":72.93199999999999},"pressure":1020.48,"humidity":87,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"wind_speed":6.21,"wind_deg":249,"hourly":[]},{"date":"2013-07-29","timestamp":1375095600,"metric":{"tempMin":15.53,"tempMax":23.35},"imperial":{"tempMin":59.954,"tempMax":74.03},"pressure":1024.02,"humidity":82,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":2.05,"wind_deg":172,"hourly":[]},{"date":"2013-07-30","timestamp":1375182000,"metric":{"tempMin":15.57,"tempMax":18.14},"imperial":{"tempMin":60.025999999999996,"tempMax":64.652},"pressure":1022.58,"humidity":95,"condition":{"id":501,"main":"Rain","description":"moderate rain","icon":"10d"},"wind_speed":7.5,"wind_deg":267,"hourly":[]},{"date":"2013-07-31","timestamp":1375268400,"metric":{"tempMin":15.09,"tempMax":23.08},"imperial":{"tempMin":59.162,"tempMax":73.544},"pressure":1028.48,"humidity":78,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"wind_speed":5,"wind_deg":258,"hourly":[]},{"date":"2013-08-01","timestamp":1375354800,"metric":{"tempMin":19.15,"tempMax":27.67},"imperial":{"tempMin":66.47,"tempMax":81.80600000000001},"pressure":1030.67,"humidity":73,"condition":{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"},"wind_speed":0.85,"wind_deg":99,"hourly":[]},{"date":"2013-08-02","timestamp":1375441200,"metric":{"tempMin":13.19,"tempMax":18.78},"imperial":{"tempMin":55.742000000000004,"tempMax":65.804},"pressure":1022.53,"humidity":0,"condition":{"id":502,"main":"Rain","description":"heavy intensity rain","icon":"10d"},"wind_speed":6.02,"wind_deg":253,"hourly":[]},{"date":"2013-08-03","timestamp":1375527600,"metric":{"tempMin":14.58,"tempMax":21.82},"imperial":{"tempMin":58.244,"tempMax":71.27600000000001},"pressure":1027.5,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":3.21,"wind_deg":261,"hourly":[]},{"date":"2013-08-04","timestamp":1375614000,"metric":{"tempMin":12.47,"tempMax":19.72},"imperial":{"tempMin":54.446,"tempMax":67.49600000000001},"pressure":1027.54,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"wind_speed":2.71,"wind_deg":1,"hourly":[]},{"date":"2013-08-05","timestamp":1375700400,"metric":{"tempMin":13.23,"tempMax":21.94},"imperial":{"tempMin":55.814,"tempMax":71.492},"pressure":1023.33,"humidity":0,"condition":{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"},"wind_speed":2.09,"wind_deg":94,"hourly":[]}],"save":true}""")
-
+locations_data.append("""{"location":{"service_id":2643743,"name":"London","country":"GB","service":"openweathermap"},"db":{"updated":"2013-08-06T18:31:16.155Z","id":1},"format":20130801,"data":[{"date":"2013-08-06","timestamp":1375738207,"metric":{"tempMin":17.38,"tempMax":21.29,"windSpeed":5.22},"imperial":{"tempMin":63.284,"tempMax":70.322,"windSpeed":3.248,"rain":null},"pressure":1020.63,"humidity":58,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"windDeg":272,"hourly":[],"current":{"timestamp":1375813805,"date":"2013-08-06 20:30","metric":{"temp":21.29,"windSpeed":null},"imperial":{"temp":70.322,"windSpeed":null,"rain":null},"humidity":56,"pressure":1013,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"service":"openweathermap","service_id":2643743}},{"date":"2013-08-07","timestamp":1375876800,"metric":{"tempMin":14.25,"tempMax":22.14,"windSpeed":9.54},"imperial":{"tempMin":57.650000000000006,"tempMax":71.852,"windSpeed":5.936,"rain":null},"pressure":1019.36,"humidity":58,"condition":{"id":803,"main":"Clouds","description":"broken clouds","icon":"04d"},"windDeg":66,"hourly":[]},{"date":"2013-08-08","timestamp":1375963200,"metric":{"tempMin":13.13,"tempMax":22.86,"windSpeed":5.796},"imperial":{"tempMin":55.634,"tempMax":73.148,"windSpeed":3.6064000000000007,"rain":null},"pressure":1026.02,"humidity":58,"condition":{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"},"windDeg":357,"hourly":[]},{"date":"2013-08-09","timestamp":1376049600,"metric":{"tempMin":14.09,"tempMax":23.71,"windSpeed":12.276000000000002},"imperial":{"tempMin":57.362,"tempMax":74.678,"windSpeed":7.638400000000001,"rain":null},"pressure":1025.05,"humidity":56,"condition":{"id":800,"main":"Clear","description":"sky is clear","icon":"01d"},"windDeg":260,"hourly":[]},{"date":"2013-08-10","timestamp":1376136000,"metric":{"tempMin":11.82,"tempMax":21.31,"windSpeed":9.395999999999999,"rain":1},"imperial":{"tempMin":53.275999999999996,"tempMax":70.358,"windSpeed":5.8464,"rain":0.03937007874015748},"pressure":1026.7,"humidity":69,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":224,"hourly":[]},{"date":"2013-08-11","timestamp":1376222400,"metric":{"tempMin":15.38,"tempMax":22.5,"windSpeed":11.916},"imperial":{"tempMin":59.684,"tempMax":72.5,"windSpeed":7.4144000000000005,"rain":null},"pressure":1021.58,"humidity":61,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"windDeg":255,"hourly":[]},{"date":"2013-08-12","timestamp":1376308800,"metric":{"tempMin":12.79,"tempMax":20.71,"windSpeed":14.148000000000001,"rain":1.14},"imperial":{"tempMin":55.022,"tempMax":69.278,"windSpeed":8.8032,"rain":0.04488188976377953},"pressure":1025.21,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":40,"hourly":[]},{"date":"2013-08-13","timestamp":1376395200,"metric":{"tempMin":11.61,"tempMax":22.22,"windSpeed":11.448,"rain":0.73},"imperial":{"tempMin":52.897999999999996,"tempMax":71.99600000000001,"windSpeed":7.123200000000001,"rain":0.02874015748031496},"pressure":1025.5,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":201,"hourly":[]},{"date":"2013-08-14","timestamp":1376481600,"metric":{"tempMin":16.09,"tempMax":22.97,"windSpeed":28.08,"rain":0.21},"imperial":{"tempMin":60.962,"tempMax":73.346,"windSpeed":17.472,"rain":0.00826771653543307},"pressure":1023.75,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":252,"hourly":[]},{"date":"2013-08-15","timestamp":1376568000,"metric":{"tempMin":14.36,"tempMax":22.61,"windSpeed":16.02,"rain":1.08},"imperial":{"tempMin":57.848,"tempMax":72.69800000000001,"windSpeed":9.968000000000002,"rain":0.042519685039370085},"pressure":1023.89,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":229,"hourly":[]}],"save":true}""")
+
+locations_data.append("""{"location":{"coord":{"lon":10,"lat":53.549999},"service_id":2911298,"name":"Hamburg","country":"DE","service":"openweathermap"},"db":{"updated":"2013-08-06T18:35:14.332Z","id":2},"format":20130801,"data":[{"date":"2013-08-06","timestamp":1375738207,"metric":{"tempMin":13.37,"tempMax":20,"windSpeed":18.18},"imperial":{"tempMin":56.066,"tempMax":68,"windSpeed":11.312000000000001,"rain":null},"pressure":1024.52,"humidity":55,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"windDeg":302,"hourly":[],"current":{"timestamp":1375813203,"date":"2013-08-06 20:20","metric":{"temp":20,"windSpeed":null},"imperial":{"temp":68,"windSpeed":null,"rain":null},"humidity":64,"pressure":1015,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"service":"openweathermap","service_id":2911298}},{"date":"2013-08-07","timestamp":1375873200,"metric":{"tempMin":11.38,"tempMax":16.98,"windSpeed":13.860000000000001,"rain":22},"imperial":{"tempMin":52.484,"tempMax":62.564,"windSpeed":8.624,"rain":0.8661417322834646},"pressure":1025.03,"humidity":100,"condition":{"id":502,"main":"Rain","description":"heavy intensity rain","icon":"10d"},"windDeg":7,"hourly":[]},{"date":"2013-08-08","timestamp":1375959600,"metric":{"tempMin":13.56,"tempMax":15.36,"windSpeed":15.515999999999998,"rain":13},"imperial":{"tempMin":56.408,"tempMax":59.647999999999996,"windSpeed":9.6544,"rain":0.5118110236220472},"pressure":1026.42,"humidity":100,"condition":{"id":502,"main":"Rain","description":"heavy intensity rain","icon":"10d"},"windDeg":31,"hourly":[]},{"date":"2013-08-09","timestamp":1376046000,"metric":{"tempMin":11.19,"tempMax":20.06,"windSpeed":14.436},"imperial":{"tempMin":52.141999999999996,"tempMax":68.108,"windSpeed":8.9824,"rain":null},"pressure":1030.49,"humidity":91,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"windDeg":304,"hourly":[]},{"date":"2013-08-10","timestamp":1376132400,"metric":{"tempMin":13.81,"tempMax":21.32,"windSpeed":17.136},"imperial":{"tempMin":56.858000000000004,"tempMax":70.376,"windSpeed":10.6624,"rain":null},"pressure":1030.51,"humidity":80,"condition":{"id":802,"main":"Clouds","description":"scattered clouds","icon":"03d"},"windDeg":250,"hourly":[]},{"date":"2013-08-11","timestamp":1376218800,"metric":{"tempMin":16.51,"tempMax":23.68,"windSpeed":22.715999999999998,"rain":3},"imperial":{"tempMin":61.718,"tempMax":74.624,"windSpeed":14.134400000000001,"rain":0.11811023622047245},"pressure":1024.9,"humidity":68,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":238,"hourly":[]},{"date":"2013-08-12","timestamp":1376305200,"metric":{"tempMin":14.79,"tempMax":20.61,"windSpeed":10.044,"rain":0.59},"imperial":{"tempMin":58.622,"tempMax":69.098,"windSpeed":6.249600000000001,"rain":0.023228346456692913},"pressure":1028.45,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":275,"hourly":[]},{"date":"2013-08-13","timestamp":1376391600,"metric":{"tempMin":13.23,"tempMax":21.47,"windSpeed":5.184},"imperial":{"tempMin":55.814,"tempMax":70.646,"windSpeed":3.2256,"rain":null},"pressure":1029.35,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":48,"hourly":[]},{"date":"2013-08-14","timestamp":1376478000,"metric":{"tempMin":15.49,"tempMax":22.37,"windSpeed":7.704000000000001,"rain":0.33},"imperial":{"tempMin":59.882000000000005,"tempMax":72.266,"windSpeed":4.7936000000000005,"rain":0.01299212598425197},"pressure":1027.6,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":226,"hourly":[]},{"date":"2013-08-15","timestamp":1376564400,"metric":{"tempMin":15.3,"tempMax":23.26,"windSpeed":26.316},"imperial":{"tempMin":59.540000000000006,"tempMax":73.868,"windSpeed":16.3744,"rain":null},"pressure":1027.33,"humidity":0,"condition":{"id":500,"main":"Rain","description":"light rain","icon":"10d"},"windDeg":253,"hourly":[]}],"save":true}""")