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

[Martin Borho]

Autopilot tests added for adding, removing and switching of locations..

Autopilot tests added for adding, removing and switching of locations. Bug #1188342, Bug #1188729 and Bug #1188728

$ cd tests/autopilot/
$ autopilot run ubuntu-weather-app

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

47. By Martin Borho on 2013-06-18

fixed add_location test

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

FAILED: Continuous integration, rev:47
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/25/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/ubuntu-weather-app-quantal-amd64-ci/22/console
    FAILURE: http://91.189.93.125:8080/job/ubuntu-weather-app-raring-amd64-ci/25/console

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

review: Needs Fixing (continuous-integration)

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

48. By Martin Borho on 2013-06-18

merged from trunk

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

PASSED: Continuous integration, rev:48
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/26/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-quantal-amd64-ci/23
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-raring-amd64-ci/26

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

review: Approve (continuous-integration)

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

49. By Martin Borho on 2013-06-20

added test for switching locations

50. By Martin Borho on 2013-06-20

splitted location manager tests into smaller parts

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

PASSED: Continuous integration, rev:50
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/27/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-quantal-amd64-ci/24
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-raring-amd64-ci/27

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Martin, thanks for this. I'll try and review it a bit more in a few hours, but at the moment could you make sure you are using the emulator for this?

https://code.launchpad.net/~nskaggs/+junk/ubuntusdk_autopilot_emulator

It's going to keep expanding and has many of the common functions your using. It will be easier to standardize and keep best practices if everyone adopts this. See http://www.theorangenotebook.com/2013/06/writing-emulator-for-autopilot.html for more info if needed :-)

review: Needs Fixing

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

51. By Martin Borho on 2013-06-20

autopiloit tests modified to run with ubuntusdk.py

52. By Martin Borho on 2013-06-20

commit files missed

53. By Martin Borho on 2013-06-20

ubuntusdk.py added from https://code.launchpad.net/~nskaggs/+junk/ubuntusdk_autopilot_emulator

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

PASSED: Continuous integration, rev:53
http://91.189.93.125:8080/job/ubuntu-weather-app-ci/28/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-quantal-amd64-ci/25
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-weather-app-raring-amd64-ci/28

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Since I've already copied the very helpful methods from ubuntusdk.py to main_window.py, I had only to instanciate the TestCase property "main_window" with a ubuntusdk instance. Works so far (main_window.py now obsolete?)

The database related stuff I've copied over from https://code.launchpad.net/~phablet-team/notes-app/. Would be cool, if the ubuntusdk would give somehow similar access to the storage (LocalStorage and/or u1db later on)

Cheers
Martin

[Nicholas Skaggs (nskaggs)]

Looks excellent Martin -- your no stranger to python :-)

So the localstorage stuff is basically your DatabaseMixin class right? I wonder if I could integrate that generically somehow. Worth thinking about. Thanks!

review: Approve

=== modified file 'components/AddLocationPage.qml'
--- components/AddLocationPage.qml	2013-06-17 15:23:41 +0000
+++ components/AddLocationPage.qml	2013-06-20 16:20:34 +0000
@@ -4,7 +4,7 @@
 
 Page {
     id: addLocationPage
-    objectName: "AddLocationrPage"
+    objectName: "AddLocationPage"
     title: i18n.tr("Add city")
     visible: false
     tools: ToolbarActions{
@@ -17,6 +17,7 @@
         source: "./WeatherApi.js"
         onMessage: {
             if(!messageObject.error) {
+                listView.visible = true
                 messageObject.result.locations.forEach(function(loc) {
                     citiesModel.append(loc);
                 });
@@ -27,8 +28,9 @@
     }
 
     function clear() {
-        locationString.text = ''
-        citiesModel.clear()
+        locationString.text = '';
+        citiesModel.clear();
+        listView.visible = true;
     }
 
     Rectangle {
@@ -38,6 +40,7 @@
         color: "transparent"
         TextField {
             id: locationString
+            objectName: "SearchField"
             width: parent.width-units.gu(2)
             height:units.gu(5)
             anchors.centerIn: parent
@@ -65,6 +68,8 @@
         color: "transparent"
         ListView {
             id: listView;
+            objectName: "SearchResultList"
+            visible: false
             clip: true;
             anchors.fill: parent;
             model:  citiesModel;

=== modified file 'components/LocationManagerPage.qml'
--- components/LocationManagerPage.qml	2013-06-17 15:23:41 +0000
+++ components/LocationManagerPage.qml	2013-06-20 16:20:34 +0000
@@ -146,7 +146,7 @@
             color:"transparent"
             height: units.gu(40)
             ListView {
-                objectName: "locationList"
+                objectName: "LocationList"
                 anchors.fill: parent
                 model: locationModel
                 delegate: ListItem.Standard {
@@ -164,6 +164,7 @@
                     }
                 }
                 footer: ListItem.Standard {
+                    objectName: "AddCityListItem"
                     text: i18n.tr("Add city")
                     progression: true
                     onClicked: pageStack.push(addLocationPage)

=== modified file 'components/LocationTab.qml'
--- components/LocationTab.qml	2013-06-17 19:22:19 +0000
+++ components/LocationTab.qml	2013-06-20 16:20:34 +0000
@@ -4,6 +4,7 @@
 
 Tab {
     id: locationTab
+    objectName: "LocationTab"
     property int locationIndex: 0
     property var locationData: {}
 

=== modified file 'tests/autopilot/ubuntu_weather_app/emulators/__init__.py'
--- tests/autopilot/ubuntu_weather_app/emulators/__init__.py	2013-04-05 08:12:09 +0000
+++ tests/autopilot/ubuntu_weather_app/emulators/__init__.py	2013-06-20 16:20:34 +0000
@@ -1,6 +1,17 @@
 # -*- 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.
+#
+# 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]>

=== modified file 'tests/autopilot/ubuntu_weather_app/emulators/main_window.py'
--- tests/autopilot/ubuntu_weather_app/emulators/main_window.py	2013-04-08 07:59:44 +0000
+++ tests/autopilot/ubuntu_weather_app/emulators/main_window.py	2013-06-20 16:20:34 +0000
@@ -9,11 +9,17 @@
 class MainWindow(object):
     """An emulator class that makes it easy to interact with the weather app"""
 
-    def __init__(self, app):
+    def __init__(self, autopilot, app):
         self.app = app
+        self.autopilot= autopilot
 
     def get_qml_view(self):
         return self.app.select_single("QQuickView")
 
-    def get_tabs(self):
-        return self.app.select_single("Tabs", objectName="Tabs")
+    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)

=== added file 'tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py'
--- tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py	2013-06-20 16:20:34 +0000
@@ -0,0 +1,154 @@
+# -*- 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 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._previous_tab()
+            if tab < currentTab:
+                self._next_tab()
+            currentTab = tabs.selectedTabIndex
+
+    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, buttonLabel):
+        """Returns the toolbar button at position index"""
+        toolbar = self.get_toolbar()
+        if not toolbar.opened:
+            self.open_toolbar()
+        row = toolbar.select_single("QQuickRow")
+        loaderList = row.select_many("QQuickLoader")
+        for loader in loaderList:
+            buttonList = loader.select_many("Button")
+            for button in buttonList:
+                if button.text == buttonLabel:
+                    return button
+
+    def click_toolbar_button(self, buttonLabel):
+        """Clicks the toolbar button with buttonLabel"""
+        #The toolbar button is assumed to be the following format
+        #ToolbarActions {
+        #           Action {
+        #               objectName: "name"
+        #                text: value
+        button = self.get_toolbar_button(buttonLabel)
+        self.autopilot.pointing_device.click_object(button)
+
+    def open_toolbar(self):
+        """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
+
+        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
+
+    def hide_toolbar(self):
+        """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
+
+        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
+        #    Popover {
+        #        Column {
+        #            ListView {
+        #                delegate: Standard {
+        #                    objectName: "name"
+        #                    text: value
+
+        self.autopilot.pointing_device.click_object(button)
+        #we'll get all matching objects, incase the popover is reused between buttons
+        itemList = lambda: self.get_objects("Standard", popover)
+
+        for item in itemList():
+            if item.get_properties()['text'] == value:
+                self.autopilot.pointing_device.click_object(item)
+
+    def get_tabs(self):
+        """Return all tabs"""
+        return self.get_object("Tabs", "rootTabs")
+
+    def _previous_tab(self):
+        """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
+
+        self.autopilot.pointing_device.drag(startX, lineY, stopX, 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 = qmlView.x + qmlView.width * 0.50
+        stopX = qmlView.x + qmlView.width * 0.35
+        lineY = qmlView.y + qmlView.height * 0.05
+
+        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
+        self.autopilot.pointing_device.click()

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-05-31 13:21:10 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-06-20 16:20:34 +0000
@@ -9,13 +9,15 @@
 
 import os.path
 import glob
+import sqlite3
+import time
 
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
 
 from ubuntu_weather_app.emulators.main_window import MainWindow
-
+from ubuntu_weather_app.emulators.ubuntusdk import ubuntusdk
 
 class WeatherTestCase(AutopilotTestCase):
 
@@ -32,10 +34,7 @@
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
         super(WeatherTestCase, self).setUp()
-        if os.path.exists(self.local_location):
-            self.launch_test_local()
-        else:
-            self.launch_test_installed()
+        self.launch_app()
 
     """Workaround to find the qmlscene binary via shell globbing.
        This is needed since we can't rely on qt5-default being installed on
@@ -43,6 +42,12 @@
     def qmlscene(self):
         return glob.glob("/usr/lib/*/qt5/bin/qmlscene")[0]
 
+    def launch_app(self):
+        if os.path.exists(self.local_location):
+            self.launch_test_local()
+        else:
+            self.launch_test_installed()
+
     def launch_test_local(self):
         self.app = self.launch_test_application(
             self.qmlscene(),
@@ -56,6 +61,67 @@
             "--desktop_file_hint=/usr/share/applications/ubuntu-weather-app.desktop",
             app_type='qt')
 
+    def launch_and_quit_app(self):
+        self.launch_app()
+        self.main_window.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
+        # handler will be registered that essentially kills the process.
+        # Therefore, by triggering the cleanup handler here we're killing the
+        # process and removing the handler, which allows a clean launch of
+        # the process during regular test setup.
+        self.doCleanups()
+
     @property
     def main_window(self):
-        return MainWindow(self.app)
+        return ubuntusdk(self, self.app)#MainWindow(self, self.app)
+        
+
+class DatabaseMixin(object):
+
+    """
+    Helper functions for dealing with sqlite databases
+    """
+
+    def find_db(self):
+        dbs_path = os.path.expanduser("~/.local/share/Qt Project/QtQmlViewer/QML/OfflineStorage/Databases/")
+        if not os.path.exists(dbs_path):
+            return None
+
+        files = [ f for f in os.listdir(dbs_path) if os.path.splitext(f)[1] == ".ini" ]
+        for f in files:
+            ini_path = os.path.join(dbs_path, f)
+            with open(ini_path) as ini:
+                for line in ini:
+                    if "=" in line:
+                        key, val = line.strip().split("=")
+                        if key == "Name" and val == "ubuntu-weather-app":
+                            try:
+                                return ini_path.replace(".ini", ".sqlite")
+                            except OSError:
+                                pass
+        return None
+
+    def clean_db(self):
+        path = self.find_db()
+        if path is None:
+            self.launch_and_quit_app()
+            path = self.find_db()
+            if path is None:
+                self.assertNotEquals(path, None)
+
+        try:
+            os.remove(path)
+        except OSError:
+            pass
+
+    def save_locations_to_storage(self, locations):
+        path = self.find_db()
+        conn = sqlite3.connect(path)
+        cursor = conn.cursor()
+        for loc_data in locations:
+            cursor.execute("INSERT INTO Locations(date, data) VALUES('{}', '{}')".format(int(time.time()*1000), loc_data))
+            conn.commit()
+        conn.close()
+

=== added file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-06-20 16:20:34 +0000
@@ -0,0 +1,118 @@
+# -*- 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 TestLocationManager(WeatherTestCase, DatabaseMixin):
+    def setUp(self):
+        self.clean_db()
+        super(TestLocationManager, self).setUp()
+        self.assertThat(
+            self.main_window.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.pointing_device.move_to_object(addCityItem)
+        self.pointing_device.click()
+
+        addLocPage = self.main_window.get_object("AddLocationPage", "AddLocationPage")
+        self.assertThat(addLocPage.visible, Eventually(Equals(True)))
+
+    def test_add_location(self):        
+        """Adds a location"""
+        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')
+        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 
+        locationList = self.main_window.get_object('QQuickListView', 'LocationList')
+        addedItem = locationList.get_children()[0]
+        self.assertThat(addedItem.get_children()[1].text, Eventually(Equals("London")))
+
+        # a location is defined, so toolbar should be visible
+        toolbar = self.main_window.get_toolbar()
+        self.assertThat(toolbar.opened, Eventually(Equals(True)))
+
+    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)))
+
+    """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)))
+ 
+class TestLocationManagerWithLocation(WeatherTestCase, DatabaseMixin):
+    def setUp(self):
+        self.clean_db()
+        self.launch_and_quit_app()
+        # add one location to storage
+        self.save_locations_to_storage([locations_data[0]])
+        super(TestLocationManagerWithLocation, self).setUp()
+        self.assertThat(
+            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
+
+    def _open_location_manager(self):
+        """Opens the location manager"""
+        self.main_window.open_toolbar()
+        self.assertThat(self.main_window.get_toolbar().opened, Eventually(Equals(True)))
+        self.main_window.click_toolbar_button("Edit")
+
+    def test_remove_location(self):
+        """Removes location"""
+        # check loading screen diappears
+        loadingPage = self.main_window.get_object("Tabs", "LoadingTabs")
+        self.assertThat(loadingPage.visible, Eventually(Equals(False)))
+
+        # go to the location manegr
+        self._open_location_manager()         
+
+        # swipe right to delete the first location
+        locationList = self.main_window.get_object('QQuickListView', 'LocationList')
+        locItem = locationList.get_children()[0]
+        loc_x, loc_y, loc_w, loc_h = locItem.globalRect
+        self.pointing_device.move(loc_x + 10, loc_y + loc_h / 2)
+        self.pointing_device.press()
+        self.pointing_device.move(loc_x + loc_w - 10, loc_y + loc_h / 2)
+        self.pointing_device.release()
+
+        # toolbar disappears since no locations defined
+        self.assertThat(self.main_window.get_toolbar().opened, Eventually(Equals(False)))
+
+    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-05-31 13:21:10 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-06-20 16:20:34 +0000
@@ -12,15 +12,18 @@
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
-from ubuntu_weather_app.tests import WeatherTestCase
-
-
-class TestMainView(WeatherTestCase):
+from ubuntu_weather_app.tests import WeatherTestCase, DatabaseMixin
+from ubuntu_weather_app.tests.weatherdata import locations_data
+
+class TestMainView(WeatherTestCase, DatabaseMixin):
     """Tests creating weather"""
 
     """ This is needed to wait for the application to start.
         In the testfarm, the application may take some time to show up."""
     def setUp(self):
+        self.clean_db()
+        self.launch_and_quit_app()
+        self.save_locations_to_storage(locations_data)
         super(TestMainView, self).setUp()
         self.assertThat(
             self.main_window.get_qml_view().visible, Eventually(Equals(True)))
@@ -28,6 +31,20 @@
     def tearDown(self):
         super(TestMainView, self).tearDown()
 
-    def test_tabs(self):
-        tabs = self.main_window.get_tabs()
+    def test_switch_tabs(self):
+        """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()
+        tabObjects = self.main_window.get_objects('LocationTab','LocationTab')
         self.assertThat(tabs.selectedTabIndex, Eventually(Equals(0)))
+        self.assertThat(tabObjects[0].visible, Eventually(Equals(True)))
+        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.assertThat(tabs.selectedTabIndex, Eventually(Equals(1)))
+        self.assertThat(tabObjects[0].visible, Eventually(Equals(False)))
+        self.assertThat(tabObjects[1].visible, Eventually(Equals(True)))
+        self.assertThat(tabObjects[1].title, Eventually(Equals("Hamburg")))
+

=== added file 'tests/autopilot/ubuntu_weather_app/tests/weatherdata.py'
--- tests/autopilot/ubuntu_weather_app/tests/weatherdata.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/weatherdata.py	2013-06-20 16:20:34 +0000
@@ -0,0 +1,10 @@
+# -*- 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.
+locations_data = []
+locations_data.append( """{"daily":{"request":{"type":"daily","url":"http://api.openweathermap.org/data/2.5/forecast/daily?id=2643743&cnt=10&units=metric"},"results":[{"timestamp":1371556800,"pressure":1018.07,"metric":{"eve":18.45,"morn":20.61,"night":12.92,"max":20.61,"day":20.61,"min":12.92},"wind_speed":1.77,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":99,"humidity":77,"imperial":{"eve":65.21000000000001,"morn":69.098,"night":55.256,"max":69.098,"day":69.098,"min":55.256}},{"timestamp":1371643200,"pressure":1018.59,"metric":{"eve":19.63,"morn":14.05,"night":15.99,"max":20.92,"day":18.54,"min":14.05},"wind_speed":1.63,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":31,"humidity":97,"imperial":{"eve":67.334,"morn":57.290000000000006,"night":60.782,"max":69.656,"day":65.372,"min":57.290000000000006}},{"timestamp":1371729600,"pressure":1016.49,"metric":{"eve":18.31,"morn":16.07,"night":14.48,"max":19.64,"day":16.82,"min":14.48},"wind_speed":1.76,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":211,"humidity":92,"imperial":{"eve":64.958,"morn":60.926,"night":58.064,"max":67.352,"day":62.275999999999996,"min":58.064}},{"timestamp":1371816000,"pressure":1015.82,"metric":{"eve":18.09,"morn":13.73,"night":14.89,"max":18.65,"day":17.55,"min":13.73},"wind_speed":3.27,"condition":{"icon":"03d","description":"scattered clouds","id":802,"main":"Clouds"},"wind_deg":257,"humidity":78,"imperial":{"eve":64.562,"morn":56.714,"night":58.80200000000001,"max":65.57,"day":63.59,"min":56.714}},{"timestamp":1371902400,"pressure":1003.45,"metric":{"eve":13.5,"morn":12.02,"night":13.04,"max":13.98,"day":13.98,"min":12.02},"wind_speed":6.11,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":215,"humidity":84,"imperial":{"eve":56.3,"morn":53.635999999999996,"night":55.471999999999994,"max":57.164,"day":57.164,"min":53.635999999999996}},{"timestamp":1371988800,"pressure":1011.26,"metric":{"eve":13.66,"morn":12.54,"night":12.4,"max":15.18,"day":15.18,"min":12.4},"wind_speed":4.46,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":290,"humidity":82,"imperial":{"eve":56.588,"morn":54.572,"night":54.32,"max":59.324,"day":59.324,"min":54.32}},{"timestamp":1372075200,"pressure":1018.06,"metric":{"eve":14.96,"morn":11.73,"night":12.42,"max":14.96,"day":14.62,"min":11.73},"wind_speed":6.44,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":292,"humidity":0,"imperial":{"eve":58.928,"morn":53.114000000000004,"night":54.356,"max":58.928,"day":58.316,"min":53.114000000000004}},{"timestamp":1372161600,"pressure":1023.37,"metric":{"eve":15.08,"morn":12.04,"night":11.13,"max":15.8,"day":15.8,"min":11.13},"wind_speed":5.25,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":294,"humidity":0,"imperial":{"eve":59.144000000000005,"morn":53.672,"night":52.034000000000006,"max":60.44,"day":60.44,"min":52.034000000000006}},{"timestamp":1372248000,"pressure":1023.86,"metric":{"eve":14.99,"morn":11.59,"night":11.29,"max":15.91,"day":15.91,"min":11.29},"wind_speed":4.64,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":247,"humidity":0,"imperial":{"eve":58.982,"morn":52.862,"night":52.322,"max":60.638000000000005,"day":60.638000000000005,"min":52.322}},{"timestamp":1372334400,"pressure":1022.68,"metric":{"eve":14.6,"morn":11.33,"night":10.22,"max":15.73,"day":15.73,"min":10.22},"wind_speed":4.34,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":294,"humidity":0,"imperial":{"eve":58.28,"morn":52.394000000000005,"night":50.396,"max":60.314,"day":60.314,"min":50.396}}]},"format":1,"current":{"request":{"type":"current","url":"http://api.openweathermap.org/data/2.5/weather?id=2643743&units=metric"},"results":{"timestamp":1371568737,"pressure":1013,"service_id":2643743,"metric":{"temp_min":19,"temp":20.61,"temp_max":22.22},"date":null,"condition":{"icon":"03d","description":"scattered clouds","id":802,"main":"Clouds"},"wind_deg":98.5007,"humidity":80,"wind_speed_mph":1.0998249,"imperial":{"temp_min":66.2,"temp":69.098,"temp_max":71.99600000000001},"service":"openweathermap","wind_speed_kmh":1.77}},"location":{"service_id":2643743,"name":"London","country":"GB","service":"openweathermap"}}""")
+
+locations_data.append("""{"daily":{"request":{"type":"daily","url":"http://api.openweathermap.org/data/2.5/forecast/daily?id=2911298&cnt=10&units=metric"},"results":[{"timestamp":1371553200,"pressure":1026.02,"metric":{"eve":24.71,"morn":25.5,"night":18.12,"max":25.5,"day":25.5,"min":18.12},"wind_speed":2.52,"condition":{"icon":"01d","description":"sky is clear","id":800,"main":"Clear"},"wind_deg":89,"humidity":70,"imperial":{"eve":76.47800000000001,"morn":77.9,"night":64.616,"max":77.9,"day":77.9,"min":64.616}},{"timestamp":1371639600,"pressure":1023.37,"metric":{"eve":29.17,"morn":20.41,"night":22.73,"max":30.39,"day":29.24,"min":20.41},"wind_speed":5.28,"condition":{"icon":"02d","description":"few clouds","id":801,"main":"Clouds"},"wind_deg":147,"humidity":69,"imperial":{"eve":84.506,"morn":68.738,"night":72.914,"max":86.702,"day":84.632,"min":68.738}},{"timestamp":1371726000,"pressure":1015.84,"metric":{"eve":25.49,"morn":24.61,"night":19.26,"max":29.68,"day":26.55,"min":19.26},"wind_speed":4.91,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":197,"humidity":84,"imperial":{"eve":77.882,"morn":76.298,"night":66.668,"max":85.424,"day":79.78999999999999,"min":66.668}},{"timestamp":1371812400,"pressure":1016.63,"metric":{"eve":17.09,"morn":16.63,"night":14.89,"max":19.75,"day":19.75,"min":14.89},"wind_speed":6.37,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":217,"humidity":91,"imperial":{"eve":62.762,"morn":61.934,"night":58.80200000000001,"max":67.55000000000001,"day":67.55000000000001,"min":58.80200000000001}},{"timestamp":1371898800,"pressure":1017.64,"metric":{"eve":18.15,"morn":16.27,"night":14.89,"max":19.34,"day":18.23,"min":14.89},"wind_speed":5.96,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":197,"humidity":83,"imperial":{"eve":64.67,"morn":61.286,"night":58.80200000000001,"max":66.812,"day":64.814,"min":58.80200000000001}},{"timestamp":1371985200,"pressure":1011.58,"metric":{"eve":15.16,"morn":14.29,"night":14.3,"max":15.93,"day":15.43,"min":14.29},"wind_speed":7.46,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":211,"humidity":86,"imperial":{"eve":59.288,"morn":57.721999999999994,"night":57.74,"max":60.674,"day":59.774,"min":57.721999999999994}},{"timestamp":1372071600,"pressure":1021.31,"metric":{"eve":17.86,"morn":14.88,"night":13.72,"max":17.97,"day":17.97,"min":13.72},"wind_speed":4.75,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":205,"humidity":0,"imperial":{"eve":64.148,"morn":58.784000000000006,"night":56.696,"max":64.346,"day":64.346,"min":56.696}},{"timestamp":1372158000,"pressure":1026.21,"metric":{"eve":16.23,"morn":13.89,"night":12.53,"max":16.75,"day":16.75,"min":12.53},"wind_speed":3.7,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":277,"humidity":0,"imperial":{"eve":61.214,"morn":57.002,"night":54.554,"max":62.150000000000006,"day":62.150000000000006,"min":54.554}},{"timestamp":1372244400,"pressure":1028.72,"metric":{"eve":16.24,"morn":13.84,"night":12.09,"max":16.71,"day":16.71,"min":12.09},"wind_speed":5.86,"condition":{"icon":"10d","description":"moderate rain","id":501,"main":"Rain"},"wind_deg":249,"humidity":0,"imperial":{"eve":61.232,"morn":56.912,"night":53.762,"max":62.078,"day":62.078,"min":53.762}},{"timestamp":1372330800,"pressure":1024.91,"metric":{"eve":16.15,"morn":12.93,"night":10.44,"max":16.33,"day":16.33,"min":10.44},"wind_speed":3.21,"condition":{"icon":"10d","description":"light rain","id":500,"main":"Rain"},"wind_deg":271,"humidity":0,"imperial":{"eve":61.06999999999999,"morn":55.274,"night":50.792,"max":61.394,"day":61.394,"min":50.792}}]},"db":{"updated":"2013-06-18T16:03:34.203Z","id":2},"format":1,"current":{"request":{"type":"current","url":"http://api.openweathermap.org/data/2.5/weather?id=2911298&units=metric"},"results":{"timestamp":1371568800,"pressure":1016,"service_id":2911298,"metric":{"temp_min":25,"temp":25.5,"temp_max":26},"date":null,"condition":{"icon":"01d","description":"Sky is Clear","id":800,"main":"Clear"},"wind_deg":100,"humidity":53,"wind_speed_mph":2.8583019999999997,"imperial":{"temp_min":77,"temp":77.9,"temp_max":78.80000000000001},"service":"openweathermap","wind_speed_kmh":4.6}},"location":{"service_id":2911298,"name":"Hamburg","country":"DE","service":"openweathermap"}}""")

=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-06-17 19:22:19 +0000
+++ ubuntu-weather-app.qml	2013-06-20 16:20:34 +0000
@@ -54,15 +54,17 @@
             tabsObject.destroy()
         }
         var tabsString = "import QtQuick 2.0; import Ubuntu.Components 0.1; import Ubuntu.Components.Popups 0.1; import \"components\" as Components; "
-                   + "Tabs {id: tabs; anchors.fill: parent;"
+                + "Tabs {id: tabs; objectName: 'rootTabs'; anchors.fill: parent;"
         if(locLength > 0) {
             for(var x=0;x<locLength;x++) {
                 tabsString += "Components.LocationTab {title: '"+locations[x].location.name+"'; locationIndex: "+x+"} "
             };
         }
         tabsString += "}"; // END Tabs componen
-        if(bigLoading !== null)
+        if(bigLoading !== null) {
             bigLoading.destroy();
+            tabs.visible = false;
+        }
         loading.running = false;
         tabsObject = Qt.createQmlObject(tabsString, tabPage, "tabs")
         if(focusToLast)
@@ -107,10 +109,6 @@
         })
     }
 
-    Components.AddLocationPage {
-        id: addLocationDialog
-    }
-
     Components.SettingsPage {
         id: settingsPage
     }
@@ -133,12 +131,11 @@
 
         Page {
             id: tabPage
-            title: "Simple page"
             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)}}
             Tabs {
                 id: tabs
-                objectName: "Tabs"
+                objectName: "LoadingTabs"
                 anchors.fill: parent
                 Tab {
                     title: "Loading..."