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

[Martin Borho]

Updated ubuntusdk emulator for autopilot, fixed Bug #1195241 as by-product.

* Updated ubuntusdk emulator for autopilot
* Removed LoadingTabs to get updated ubuntusdk fully supported, Fixed as a by-product Bug #1195241.
* Removed old main_window.py emulator
* test_search_city made more reliable

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

PASSED: Continuous integration, rev:64
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/10/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/2
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/9
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/2

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

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

Instead of looping through all buttons, here
102 + for button in buttonList:
you could use:
button = toolbar.select_single("ActionItem", objectName=buttonObject)

Otherwise looks good to me.

review: Approve

[Nicholas Skaggs (nskaggs)]

Martin, am I crazy or does this seem to have the weird back button misclicking issue? Otherwise this looks great.

review: Approve

[Martin Borho (martin-borho)]

Yes, it has..

Anyways, will merge...

=== removed file 'tests/autopilot/ubuntu_weather_app/emulators/main_window.py'
--- tests/autopilot/ubuntu_weather_app/emulators/main_window.py	2013-06-20 16:10:06 +0000
+++ tests/autopilot/ubuntu_weather_app/emulators/main_window.py	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-# -*- 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.
-
-
-class MainWindow(object):
-    """An emulator class that makes it easy to interact with the weather 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_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)
 
=== modified file 'tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py'
--- tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py	2013-07-03 19:57:03 +0000
+++ tests/autopilot/ubuntu_weather_app/emulators/ubuntusdk.py	2013-07-12 09:37:30 +0000
@@ -38,6 +38,10 @@
         """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()
@@ -46,11 +50,37 @@
         #perform operations until tab == currentTab
         while tab != currentTab:
             if tab > currentTab:
+                self._next_tab()
+            if tab < currentTab:
                 self._previous_tab()
-            if tab < currentTab:
-                self._next_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
@@ -63,23 +93,29 @@
         """Returns the toolbar in the main events view."""
         return self.app.select_single("Toolbar")
 
-    def get_toolbar_button(self, buttonName):
-        """Returns the toolbar button at position index"""
+    def get_toolbar_button(self, buttonObject):
+        """Returns the toolbar button with objectName buttonObject"""
         toolbar = self.get_toolbar()
         if not toolbar.opened:
             self.open_toolbar()
-        button = self.get_object('ActionItem', buttonName)
-        return button
+        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, buttonName):
-        """Clicks the toolbar button with buttonLabel"""
+    def click_toolbar_button(self, buttonObject):
+        """Clicks the toolbar button with objectName buttonObject"""
         #The toolbar button is assumed to be the following format
-        #ToolbarItems {
-        #           ToolbarButton {
+        #Toolbar {
+        #         ...
+        #           ActionItem {
         #               objectName: "name"
-        #                text: value
-        button = self.get_toolbar_button(buttonName)
+        button = self.get_toolbar_button(buttonObject)
         self.autopilot.pointing_device.click_object(button)
+        return button
 
     def open_toolbar(self):
         """Open the toolbar"""
@@ -106,44 +142,16 @@
         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:
+        #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)
-
-    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 = 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()
-        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.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()
 \ No newline at end of file
+                return item
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-06-20 16:10:56 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-07-12 09:37:30 +0000
@@ -16,7 +16,6 @@
 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):
@@ -76,7 +75,7 @@
     @property
     def main_window(self):
         return ubuntusdk(self, self.app)#MainWindow(self, self.app)
-        
+
 
 class DatabaseMixin(object):
 
 
=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-07-03 19:41:03 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-07-12 09:37:30 +0000
@@ -88,11 +88,11 @@
         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.type("Hamburg")
         self.keyboard.press_and_release('Enter')
+        # move the cursor to gain some time
+        self.pointing_device.move_to_object(resultsList)
+        self.pointing_device.move_to_object(searchField)
         firstResult = resultsList.get_children()[0].get_children()[0]
         self.assertThat(firstResult.text, Eventually(Equals("Hamburg, DE")))
 
@@ -122,8 +122,8 @@
     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)))
+        loadingPage = self.main_window.get_object("Page", "MainPage")
+        self.assertThat(loadingPage.visible, Eventually(Equals(True)))
 
         # go to the location manegr
         self._open_location_manager()
 
=== modified file 'ubuntu-weather-app.qml'
--- ubuntu-weather-app.qml	2013-06-26 10:43:49 +0000
+++ ubuntu-weather-app.qml	2013-07-12 09:37:30 +0000
@@ -63,7 +63,6 @@
         tabsString += "}"; // END Tabs componen
         if(bigLoading !== null) {
             bigLoading.destroy();
-            tabs.visible = false;
         }
         loading.running = false;
         tabsObject = Qt.createQmlObject(tabsString, tabPage, "tabs")
@@ -131,6 +130,7 @@
 
         Page {
             id: tabPage
+            objectName: "MainPage"
             visible: false
             ActivityIndicator{
                 id:loading
@@ -144,14 +144,12 @@
                     rightMargin: units.gu(1)
                 }
             }
-            Tabs {
-                id: tabs
-                objectName: "LoadingTabs"
-                anchors.fill: parent
-                Tab {
-                    title: "Loading..."
-                    Components.LoadingComponent{id:bigLoading; anchors.fill: parent; z: 2;}
-                }
+            ActivityIndicator{
+                id:bigLoading
+                objectName: "LoadingSpinner"
+                running: true
+                z: 1
+                anchors.centerIn: parent
             }
         }
     }