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

[Martin Borho]

fixes Bug #1230297: Removing a location add adding a new one fails

fixes Bug #1230297: Removing a location add adding a new one fails

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

FAILED: Continuous integration, rev:137
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/57/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/627
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/55
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/55
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/55
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/55

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:137
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/59/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/637
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/57
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/57
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/57
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/57

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:137
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/61/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests/658/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/59
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/59
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/59
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/59

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:139
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/64/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/682
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/62
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/62
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/62
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/62

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

review: Approve (continuous-integration)

[Raúl Yeguas (neokore)]

Well done, Martin!

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-autolanding/38/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/689
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-autolanding/38
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-autolanding/38
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-autolanding/38
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-autolanding/38

review: Needs Fixing (continuous-integration)

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

140. By Martin Borho on 2013-10-04

removed get_object(s) methods from autopilot tests

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

FAILED: Continuous integration, rev:140
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/66/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/693
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/64
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/64
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/64
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/64

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

review: Needs Fixing (continuous-integration)

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

141. By Martin Borho on 2013-10-05

trying again

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

FAILED: Continuous integration, rev:141
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/67/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/712
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/65
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/65
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/65
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/65

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

review: Needs Fixing (continuous-integration)

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

142. By Martin Borho on 2013-10-07

trigger jenkins

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

PASSED: Continuous integration, rev:142
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/78/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/766
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-ci/76
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-ci/76
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/76
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/76

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

review: Approve (continuous-integration)

=== modified file 'components/AddLocationSheet.qml'
--- components/AddLocationSheet.qml	2013-09-28 10:27:32 +0000
+++ components/AddLocationSheet.qml	2013-10-07 07:26:44 +0000
@@ -34,11 +34,10 @@
         doneButton: false
 
         Component.onCompleted: {
-            locationsRemoved.clear()
             Cities.preList.forEach(function(loc) {
                 citiesModel.append(loc)
             })
-            Theme.palette.selected.backgroundText = "#656565" //color: Theme.palette.normal.baseText
+            Theme.palette.normal.backgroundText = "#656565" //color: Theme.palette.normal.baseText
         }
 
         WorkerScript {
@@ -176,9 +175,12 @@
                 Label {
                     id: noCityError
                     objectName: "noCityError"
+                    width: parent.width-units.gu(6)
                     visible: false
                     anchors.centerIn: parent
-                    fontSize: "small"
+                    fontSize: "medium"
+                    wrapMode: Text.WordWrap
+                    horizontalAlignment: Text.AlignHCenter
                 }
                 Component {
                     id: sectionHeading
@@ -209,6 +211,8 @@
                             id: searchResultName
                             objectName: "searchResult" + index
                             text: name
+                            width: parent.width-units.gu(3)
+                            elide: Text.ElideRight
                             anchors {
                                 top: parent.top
                                 topMargin: units.gu(0.5)
@@ -219,6 +223,8 @@
                         }
                         Label {
                             text: areaLabel
+                            width: parent.width-units.gu(3)
+                            elide: Text.ElideRight
                             anchors {
                                 top: searchResultName.bottom
                                 bottom: parent.bottom

=== modified file 'components/LocationManagerSheet.qml'
--- components/LocationManagerSheet.qml	2013-10-01 20:57:27 +0000
+++ components/LocationManagerSheet.qml	2013-10-07 07:26:44 +0000
@@ -155,6 +155,8 @@
                     id: currentLocationLabel
                     objectName: "CurrentLocationLabel"
                     text: ""
+                    width: parent.width-lookupItemAddButton.width-units.gu(5.5)
+                    elide: Text.ElideRight
                     anchors {
                         top: parent.top
                         topMargin: units.gu(0.5)
@@ -166,6 +168,8 @@
                 Label {
                     id: currentLocationAreaLabel
                     text: ""
+                    width: parent.width-lookupItemAddButton.width-units.gu(5.5)
+                    elide: Text.ElideRight
                     anchors {
                         top: currentLocationLabel.bottom
                         bottom: parent.bottom
@@ -226,6 +230,8 @@
                             id: searchResultName
                             objectName: "existingLocation" + index
                             text: name
+                            width: parent.width-units.gu(3)
+                            elide: Text.ElideRight
                             anchors {
                                 top: parent.top
                                 topMargin: units.gu(0.5)
@@ -236,6 +242,8 @@
                         }
                         Label {
                             text: adminName1.replace(/ Region$/,'')+", "+((Countries.codes[country]) ? i18n.tr(Countries.codes[country]): country)
+                            width: parent.width-units.gu(3)
+                            elide: Text.ElideRight
                             anchors {
                                 top: searchResultName.bottom
                                 bottom: parent.bottom

=== modified file 'tests/autopilot/ubuntu_weather_app/emulators.py'
--- tests/autopilot/ubuntu_weather_app/emulators.py	2013-08-04 11:09:32 +0000
+++ tests/autopilot/ubuntu_weather_app/emulators.py	2013-10-07 07:26:44 +0000
@@ -14,14 +14,6 @@
 
 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)
@@ -31,10 +23,10 @@
 class Tabs(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
     """LocationTabs Autopilot emulator."""
 
-    def get_current_tab(self): 
-        """Return the currently selected tab.""" 
+    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.""" 
+    def get_number_of_tabs(self):
+        """Return the number of tabs."""
         return len(self.select_many('LocationTab'))

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-10-01 20:57:27 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-10-07 07:26:44 +0000
@@ -17,6 +17,8 @@
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
+from testtools.matchers import Equals, NotEquals, Is, Not
+from autopilot.matchers import Eventually
 
 from ubuntuuitoolkit import emulators as toolkit_emulators
 from ubuntu_weather_app.emulators import MainView
@@ -100,6 +102,20 @@
         """Clicks the cancel button"""
         self.pointing_device.click_object(self.main_window.select_many('Button')[0])
 
+class LocationManagerMixin(object):
+    """Mixin for LocationManager related methods"""
+    def _open_add_location_page(self):
+        """Opens the AddLocationPage"""
+        # click on listitem to open AddLocationPage
+        self.assertThat(lambda: self.main_window.select_single('Standard', objectName='AddCityListItem'), Eventually(Not(Is(None))))
+        addCityItem = self.main_window.select_single('Standard', objectName='AddCityListItem')
+        self.assertThat(lambda: addCityItem.visible, Eventually(Equals(True)))
+        self.pointing_device.move_to_object(addCityItem)
+        self.pointing_device.click()
+
+        addLocPage = self.main_window.select_single("DefaultSheet", objectName="AddLocationSheet")
+        self.assertThat(addLocPage.visible, Eventually(Equals(True)))
+
 class DatabaseMixin(object):
 
     """

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-10-01 22:45:27 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-10-07 07:26:44 +0000
@@ -12,13 +12,13 @@
 from testtools.matchers import Equals, NotEquals, Is, Not
 from autopilot.matchers import Eventually
 
-from ubuntu_weather_app.tests import WeatherTestCase, DatabaseMixin, SheetMixin
+from ubuntu_weather_app.tests import WeatherTestCase, DatabaseMixin, SheetMixin, LocationManagerMixin
 from ubuntu_weather_app.tests.weatherdata import locations_data
 
 from time import sleep
 
+class TestLocationManager(WeatherTestCase, DatabaseMixin, SheetMixin, LocationManagerMixin):
 
-class TestLocationManager(WeatherTestCase, DatabaseMixin, SheetMixin):
     def setUp(self):
         self.clean_db()
         super(TestLocationManager, self).setUp()
@@ -26,8 +26,9 @@
             self.get_qml_view().visible, Eventually(Equals(True)))
 
     def search_for_city(self, city):
-        self.assertThat(lambda: self.main_window.get_object('TextField', 'SearchField'), Eventually(Not(Is(None))))
-        searchField = self.main_window.get_object("TextField", "SearchField")
+        self.assertThat(lambda: self.main_window.select_single('TextField', objectName='SearchField'), 
+                                   Eventually(Not(Is(None))))
+        searchField = self.main_window.select_single("TextField", objectName="SearchField")
         #poll clicking for focus for lack of better method, due to screen switching animation
         #is there a property we can use instead?
         timeout = 0
@@ -40,19 +41,6 @@
         self.keyboard.press_and_release('Enter')
         return searchField
 
-    def _open_add_location_page(self):
-        """Opens the AddLocationPage"""
-        # click on listitem to open AddLocationPage
-        self.assertThat(lambda: self.main_window.get_object('QQuickListView', 'LocationList'), Eventually(Not(Is(None))))
-        locationList = self.main_window.get_object('QQuickListView', 'LocationList')
-        addCityItem = locationList.get_children()[0]
-        self.assertThat(lambda: addCityItem.visible, Eventually(Equals(True)))
-        self.pointing_device.move_to_object(addCityItem)
-        self.pointing_device.click()
-
-        addLocPage = self.main_window.get_object("DefaultSheet", "AddLocationSheet")
-        self.assertThat(addLocPage.visible, Eventually(Equals(True)))
-
     def select_single_retry(self, object_type, **kwargs):
         """Returns the item that is searched for with app.select_single
         In case of the item was not found (not created yet) a second attempt is
@@ -73,62 +61,68 @@
         self.search_for_city("London")
 
         # wait for results and click on the first item
-        # http_failed = lambda: self.main_window.get_object('SplashComponent', 'HTTPFailedSplash').visible
+        # http_failed = lambda: self.main_window.select_single('SplashComponent',  objectName='HTTPFailedSplash').visible
         # self.assertThat(http_failed, Eventually(NotEquals(True)))
-        load_indicator = self.main_window.get_object('ActivityIndicator', 'SearchingSpinner')
+        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='SearchingSpinner')
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
-        resultsList = self.main_window.get_object('QQuickListView', 'SearchResultList')
+        resultsList = self.main_window.select_single('QQuickListView', objectName='SearchResultList')
         self.assertThat(resultsList.visible, Eventually(Equals(True)))
-        self.assertThat(lambda: self.main_window.get_object('Label', 'searchResult0'), Eventually(Not(Is(None))))
-        firstResult = self.main_window.get_object('Label', 'searchResult0')
+        self.assertThat(lambda: self.main_window.select_single('Label', objectName='searchResult0'), 
+                           Eventually(Not(Is(None))))
+        firstResult = self.main_window.select_single('Label', objectName='searchResult0')
         self.pointing_device.move_to_object(firstResult)
         self.pointing_device.click()
 
         # LocationManagerPage should be visible and "London" added
-        self.assertThat(lambda: self.main_window.get_object('QQuickListView', 'LocationList'), Eventually(Not(Is(None))))
-        locationList = self.main_window.get_object('QQuickListView', 'LocationList')
-        self.assertThat(lambda: self.main_window.get_object('Label', 'existingLocation0'), Eventually(Not(Is(None))))
-        addedItem = self.main_window.get_object('Label', "existingLocation0")
+        self.assertThat(lambda: self.main_window.select_single('QQuickListView', objectName='LocationList'), 
+                            Eventually(Not(Is(None))))
+        locationList = self.main_window.select_single('QQuickListView', objectName='LocationList')
+        self.assertThat(lambda: self.main_window.select_single('Label', objectName='existingLocation0'), 
+                            Eventually(Not(Is(None))))
+        addedItem = self.main_window.select_single('Label', objectName="existingLocation0")
         self.assertThat(addedItem.text, Eventually(Equals("London")))
         self._click_sheet_confirm()
 
         # back to locations, wait till data is loaded
-        load_indicator = self.main_window.get_object('ActivityIndicator', 'LoadingSpinner')
+        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
 
         # only location is there
-        loadingPage = self.main_window.get_object("Tabs", "rootTabs")
+        loadingPage = self.main_window.select_single("Tabs", objectName="rootTabs")
         self.assertThat(loadingPage.visible, Eventually(Equals(True)))
-        tabObjects = self.main_window.get_objects('LocationTab','LocationTab')
+        tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
         self.assertEqual(1, len(tabObjects))
 
     def test_add_predefined_location(self):
         """Adds a location"""
         self._open_add_location_page()
 
-        resultsList = self.main_window.get_object('QQuickListView', 'SearchResultList')
+        resultsList = self.main_window.select_single('QQuickListView', objectName='SearchResultList')
         self.assertThat(resultsList.visible, Eventually(Equals(True)))
-        self.assertThat(lambda: self.main_window.get_object('Label', 'searchResult4'), Eventually(Not(Is(None))))
-        testResult = self.main_window.get_object('Label', 'searchResult4')
+        self.assertThat(lambda: self.main_window.select_single('Label', objectName='searchResult4'), 
+                            Eventually(Not(Is(None))))
+        testResult = self.main_window.select_single('Label', objectName='searchResult4')
         self.pointing_device.move_to_object(testResult)
         self.pointing_device.click()
 
-        # LocationManagerPage should be visible and "London" added
-        self.assertThat(lambda: self.main_window.get_object('QQuickListView', 'LocationList'), Eventually(Not(Is(None))))
-        locationList = self.main_window.get_object('QQuickListView', 'LocationList')
-        self.assertThat(lambda: self.main_window.get_object('Label', 'existingLocation0'), Eventually(Not(Is(None))))
-        addedItem = self.main_window.get_object('Label', "existingLocation0")
+        # LocationManagerPage should be visible and location added
+        self.assertThat(lambda: self.main_window.select_single('QQuickListView', objectName='LocationList'), 
+                            Eventually(Not(Is(None))))
+        locationList = self.main_window.select_single('QQuickListView', objectName='LocationList')
+        self.assertThat(lambda: self.main_window.select_single('Label', objectName='existingLocation0'), 
+                            Eventually(Not(Is(None))))
+        addedItem = self.main_window.select_single('Label', objectName="existingLocation0")
         self.assertThat(addedItem.text, Eventually(Equals("Cairo")))
         self._click_sheet_confirm()
 
         # back to locations, wait till data is loaded
-        load_indicator = self.main_window.get_object('ActivityIndicator', 'LoadingSpinner')
+        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
 
         # only location is there
-        loadingPage = self.main_window.get_object("Tabs", "rootTabs")
+        loadingPage = self.main_window.select_single("Tabs", objectName="rootTabs")
         self.assertThat(loadingPage.visible, Eventually(Equals(True)))
-        tabObjects = self.main_window.get_objects('LocationTab','LocationTab')
+        tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
         self.assertEqual(1, len(tabObjects))
 
     def test_search_city(self):
@@ -139,19 +133,21 @@
         searchField = self.search_for_city("London")
 
         # wait for results and click on the first item
-        #http_failed = lambda: self.main_window.get_object('SplashComponent', 'HTTPFailedSplash').visible
+        #http_failed = lambda: self.main_window.select_single('SplashComponent', objectName='HTTPFailedSplash').visible
         #self.assertThat(http_failed, Eventually(NotEquals(True)))
-        load_indicator = self.main_window.get_object('ActivityIndicator', 'SearchingSpinner')
+        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='SearchingSpinner')
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
-        resultsList = self.main_window.get_object('QQuickListView', 'SearchResultList')
+        resultsList = self.main_window.select_single('QQuickListView', objectName='SearchResultList')
         self.assertThat(resultsList.visible, Eventually(Equals(True)))
-        self.assertThat(lambda: self.main_window.get_object('Label', 'searchResult0'), Eventually(Not(Is(None))))
+        self.assertThat(lambda: self.main_window.select_single('Label', objectName='searchResult0'), 
+                            Eventually(Not(Is(None))))
         firstResult = self.select_single_retry("Label", objectName="searchResult0")
         self.assertThat(firstResult.text, Eventually(Equals("London")))
 
         # regain focus, clear search field and do another search
-        self.assertThat(lambda: self.main_window.get_object('TextField', 'SearchField'), Eventually(Not(Is(None))))
-        searchField = self.main_window.get_object("TextField", "SearchField")
+        self.assertThat(lambda: self.main_window.select_single('TextField', objectName='SearchField'), 
+                            Eventually(Not(Is(None))))
+        searchField = self.main_window.select_single("TextField", objectName="SearchField")
         self.pointing_device.click_object(searchField)
         self.assertThat(lambda: self.main_window.select_single('AbstractButton'), Eventually(Not(Is(None))))
         clear_button = searchField.select_single("AbstractButton")
@@ -161,10 +157,11 @@
         self.pointing_device.click_object(searchField)
         self.keyboard.type("Hamburg")
         self.keyboard.press_and_release('Enter')
-        load_indicator = self.main_window.get_object('ActivityIndicator', 'SearchingSpinner')
+        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='SearchingSpinner')
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         self.assertThat(resultsList.visible, Eventually(Equals(True)))
-        self.assertThat(lambda: self.main_window.get_object('Label', 'searchResult0'), Eventually(Not(Is(None))))
+        self.assertThat(lambda: self.main_window.select_single('Label', objectName='searchResult0'), 
+                            Eventually(Not(Is(None))))
         firstResult = self.select_single_retry("Label", objectName="searchResult0")
         self.assertThat(firstResult.text, Eventually(Equals("Hamburg")))
 
@@ -172,8 +169,9 @@
         """Cancel the cities search"""
         self._open_add_location_page()
         self._click_sheet_cancel()
-        self.assertThat(lambda: self.main_window.get_object('QQuickListView', 'LocationList'), Eventually(Not(Is(None))))
-        locationList = self.main_window.get_object('QQuickListView', 'LocationList')
+        self.assertThat(lambda: self.main_window.select_single('QQuickListView', objectName='LocationList'), 
+                            Eventually(Not(Is(None))))
+        locationList = self.main_window.select_single('QQuickListView', objectName='LocationList')
         self.assertThat(locationList.visible, Eventually(Equals(True)))
 
     def test_no_location_found(self):
@@ -184,56 +182,61 @@
         self.search_for_city("UbuntuCity")
 
         # wait for result and look if label is shown
-        # http_failed = lambda: self.main_window.get_object('SplashComponent', 'HTTPFailedSearch').visible
+        # http_failed = lambda: self.main_window.select_single('SplashComponent', objectName='HTTPFailedSearch').visible
         # self.assertThat(http_failed, Eventually(NotEquals(True)))
-        load_indicator = self.main_window.get_object('ActivityIndicator', 'SearchingSpinner')
+        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='SearchingSpinner')
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
-        errorLabel = self.main_window.get_object('Label', 'noCityError')
+        errorLabel = self.main_window.select_single('Label', objectName='noCityError')
         self.assertThat(errorLabel.visible, Eventually(Equals(True)))
 
     def test_location_lookup(self):
         """Tests the location lookup"""
         # start lookup
-        self.assertThat(lambda: self.main_window.get_object('Standard', 'LocationLookupItem'), Eventually(Not(Is(None))))
-        lookupItem = self.main_window.get_object('Standard', 'LocationLookupItem')
+        self.assertThat(lambda: self.main_window.select_single('Standard', objectName='LocationLookupItem'), 
+                            Eventually(Not(Is(None))))
+        lookupItem = self.main_window.select_single('Standard', objectName='LocationLookupItem')
         self.pointing_device.click_object(lookupItem)
 
         # wait for result
-        load_indicator = self.main_window.get_object('ActivityIndicator', 'LookupIndicator')
+        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LookupIndicator')
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
 
         # check a location was found
-        self.assertThat(lambda: self.main_window.get_object('Label', 'CurrentLocationLabel'), Eventually(Not(Is(None))))
-        location = self.main_window.get_object('Label', 'CurrentLocationLabel')
+        self.assertThat(lambda: self.main_window.select_single('Label', objectName='CurrentLocationLabel'), 
+                            Eventually(Not(Is(None))))
+        location = self.main_window.select_single('Label', objectName='CurrentLocationLabel')
         self.assertThat(location.text, Eventually(Not(Equals(""))))
         location_name = location.text
 
         # add location
-        self.assertThat(lambda: self.main_window.get_object('Button', 'LookupItemAddButton'), Eventually(Not(Is(None))))
-        add_button = self.main_window.get_object('Button', 'LookupItemAddButton')
+        self.assertThat(lambda: self.main_window.select_single('Button', objectName='LookupItemAddButton'), 
+                            Eventually(Not(Is(None))))
+        add_button = self.main_window.select_single('Button', objectName='LookupItemAddButton')
         self.pointing_device.click_object(add_button)
 
-        # LocationManagerPage should be visible and "London" added
-        self.assertThat(lambda: self.main_window.get_object('QQuickListView', 'LocationList'), Eventually(Not(Is(None))))
-        locationList = self.main_window.get_object('QQuickListView', 'LocationList')
-        self.assertThat(lambda: self.main_window.get_object('Label', 'existingLocation0'), Eventually(Not(Is(None))))
-        addedItem = self.main_window.get_object('Label', "existingLocation0")
+        # LocationManagerPage should be visible and location added
+        self.assertThat(lambda: self.main_window.select_single('QQuickListView', objectName='LocationList'), 
+                            Eventually(Not(Is(None))))
+        locationList = self.main_window.select_single('QQuickListView', objectName='LocationList')
+        self.assertThat(lambda: self.main_window.select_single('Label', objectName='existingLocation0'), 
+                            Eventually(Not(Is(None))))
+        addedItem = self.main_window.select_single('Label', objectName="existingLocation0")
         self.assertThat(addedItem.text, Eventually(Equals(location_name)))
         self._click_sheet_confirm()
 
         # back to locations, wait till data is loaded
-        load_indicator = self.main_window.get_object('ActivityIndicator', 'LoadingSpinner')
+        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
 
         # only location is there
-        loadingPage = self.main_window.get_object("Tabs", "rootTabs")
+        loadingPage = self.main_window.select_single("Tabs", objectName="rootTabs")
         self.assertThat(loadingPage.visible, Eventually(Equals(True)))
-        tabObjects = self.main_window.get_objects('LocationTab','LocationTab')
+        tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
         self.assertEqual(1, len(tabObjects))
 
 
-        
-class TestLocationManagerWithLocation(WeatherTestCase, DatabaseMixin, SheetMixin):
+
+class TestLocationManagerWithLocation(WeatherTestCase, DatabaseMixin, SheetMixin, LocationManagerMixin):
     def setUp(self):
         self.clean_db()
         self.launch_and_quit_app()
@@ -250,18 +253,20 @@
     def _swipe_location_to_remove(self):
         """Swipe right to delete the first location"""
         number_of_locations = self._get_number_of_locations()
-        self.assertThat(lambda: self.app.select_single('Standard', objectName='existingLocationItem0'), Eventually(Not(Is(None))))
+        self.assertThat(lambda: self.app.select_single('Standard', objectName='existingLocationItem0'), 
+                            Eventually(Not(Is(None))))
         first_location = self.app.select_single("Standard", objectName="existingLocationItem0")
 
         x, y, w, h = first_location.globalRect
         tx = x + (w / 8)
         ty = y + (h / 2)
         self.pointing_device.drag(tx, ty, tx + w/4*3 , ty)
-        
+
         self.assertThat(lambda: first_location.select_many('Label')[2].visible, Eventually(Not(Is(None))))
         trashcanLabel = first_location.select_many('Label')[2]
         timeout = 0
-        while timeout < 10 and first_location.select_many('Label') and self.app.select_single("Standard", objectName="existingLocationItem0"):
+        while timeout < 10 and first_location.select_many('Label') \
+                    and self.app.select_single("Standard", objectName="existingLocationItem0"):
             self.pointing_device.click_object(trashcanLabel)
             sleep(1)
             timeout += 1
@@ -274,11 +279,11 @@
     def test_remove_location(self):
         """Removes location"""
         # wait till data is loaded
-        loadingPage = self.main_window.get_object("Tabs", "rootTabs")
+        loadingPage = self.main_window.select_single("Tabs", objectName="rootTabs")
         self.assertThat(loadingPage.visible, Eventually(Equals(True)))
 
         # count locations at start
-        tabObjects = self.main_window.get_objects('LocationTab','LocationTab')
+        tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
         tabsSumStart = len(tabObjects)
 
         # go to the location manager and remove location
@@ -287,19 +292,19 @@
         self._click_sheet_confirm()
 
         # back to locations, only one is left
-        load_indicator = self.main_window.get_object('ActivityIndicator', 'LoadingSpinner')
+        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
         self.assertThat(load_indicator.running, Eventually(Equals(False)))
-        tabObjects = self.main_window.get_objects('LocationTab','LocationTab')
+        tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
         self.assertThat(lambda: tabsSumStart-1, Eventually(Equals(len(tabObjects))))
 
     def test_cancel_remove_location(self):
         """Cancels removing of location"""
         # wait data is loaded
-        loadingPage = self.main_window.get_object("Tabs", "rootTabs")
+        loadingPage = self.main_window.select_single("Tabs", objectName="rootTabs")
         self.assertThat(loadingPage.visible, Eventually(Equals(True)))
 
         # count locations at start
-        tabObjects = self.main_window.get_objects('LocationTab','LocationTab')
+        tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
         tabsSumStart = len(tabObjects)
 
         # go to the location manager, remove location, but click cancel
@@ -308,8 +313,45 @@
         self._click_sheet_cancel()
 
         # back to locations, no loction is removed
-        loadingPage = self.main_window.get_object("Tabs", "rootTabs")
+        loadingPage = self.main_window.select_single("Tabs", objectName="rootTabs")
         self.assertThat(loadingPage.visible, Eventually(Equals(True)))
-        tabObjects = self.main_window.get_objects('LocationTab','LocationTab')
+        tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
         self.assertEqual(tabsSumStart, len(tabObjects))
 
+    def test_del_add_bug(self):
+        """Tests if remvoing and add ad loction in one action works
+           https://bugs.launchpad.net/ubuntu-weather-app/+bug/1230297"""
+        # remove a location
+        self._open_location_manager()
+        number_of_locations = self._get_number_of_locations()
+        self._swipe_location_to_remove()
+        self._open_add_location_page()
+
+        # add a location
+        resultsList = self.main_window.select_single('QQuickListView', objectName='SearchResultList')
+        self.assertThat(resultsList.visible, Eventually(Equals(True)))
+        self.assertThat(lambda: self.main_window.select_single('Label', objectName='searchResult4'), 
+                            Eventually(Not(Is(None))))
+        testResult = self.main_window.select_single('Label', objectName='searchResult4')
+        self.pointing_device.move_to_object(testResult)
+        self.pointing_device.click()
+
+        # LocationManagerPage should be visible and location added
+        self.assertThat(lambda: self.main_window.select_single('QQuickListView', objectName='LocationList'), 
+                            Eventually(Not(Is(None))))
+        locationList = self.main_window.select_single('QQuickListView', objectName='LocationList')
+        self.assertThat(lambda: self.main_window.select_single('Label', objectName='existingLocation1'), 
+                            Eventually(Not(Is(None))))
+        addedItem = self.main_window.select_single('Label', objectName="existingLocation1")
+        self.assertThat(addedItem.text, Eventually(Equals("Cairo")))
+        self.assertThat(lambda: self._get_number_of_locations(), Eventually(Equals(number_of_locations)))
+        self._click_sheet_confirm()
+
+        # back to locations, wait till data is loaded
+        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
+
+        # count the tabs
+        tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
+        self.assertThat(lambda: number_of_locations, Eventually(Equals(len(tabObjects))))
+        self.assertThat(tabObjects[1].title, Eventually(Equals("Cairo")))

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_mainview.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-08-14 20:28:56 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_mainview.py	2013-10-07 07:26:44 +0000
@@ -42,7 +42,7 @@
 
         # first tab should be visible after start
         tabs =  self.main_window.get_tabs()
-        tabObjects = self.main_window.get_objects('LocationTab','LocationTab')
+        tabObjects = self.main_window.select_many('LocationTab',objectName='LocationTab')
         self.assertThat(tabs.selectedTabIndex, Eventually(Equals(0)))
         self.assertThat(tabObjects[0].visible, Eventually(Equals(True)))
         self.assertThat(tabObjects[1].visible, Eventually(Equals(False)))
@@ -56,18 +56,18 @@
 
     def test_refresh_tabs(self):
         # get the dates from the test data
-        self.assertThat(lambda: self.main_window.get_objects('Label', 'DayDateLabel'), Eventually(Not(Is(None))))
-        curr_dates = self.main_window.get_objects('Label','DayDateLabel')
+        self.assertThat(lambda: self.main_window.select_many('Label', objectName='DayDateLabel'), Eventually(Not(Is(None))))
+        curr_dates = self.main_window.select_many('Label', objectName='DayDateLabel')
         tab1_curr_date = curr_dates[0].text
         tab2_curr_date = curr_dates[2].text
 
         # refresh and wait till loading has finished
         self.main_window.open_toolbar().click_button("RefreshButton")
-        load_indicator = self.main_window.get_object('ActivityIndicator', 'LoadingSpinner')
+        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
 
         # get the data from the refreshed tabs, have to be new
-        self.assertThat(lambda: self.main_window.get_objects('Label', 'DayDateLabel'), Eventually(Not(Is(None))))
-        refreshed_dates = self.main_window.get_objects('Label','DayDateLabel')
+        self.assertThat(lambda: self.main_window.select_many('Label',objectName='DayDateLabel'), Eventually(Not(Is(None))))
+        refreshed_dates = self.main_window.select_many('Label',objectName='DayDateLabel')
         self.assertNotEqual(tab1_curr_date, refreshed_dates[0].text)
         self.assertNotEqual(tab2_curr_date, refreshed_dates[2].text)