Merge lp:~nskaggs/ubuntu-weather-app/swipe-delete-ap-tests into lp:ubuntu-weather-app/obsolete.trunk

[Nicholas Skaggs]

Fix test_del_add_bug test, simplify tests, re-enable disabled tests

Restructure tests a bit, re-enable disabled tests and fix http://ci.ubuntu.com/smokeng/trusty/touch/maguro/55:20131209.1:20131203/5355/ubuntu-weather-app-autopilot/559254/

[lp:~nskaggs/ubuntu-weather-app/swipe-delete-ap-tests]

167. By Nicholas Skaggs on 2013-12-11

remove more extraneous stuff :-)

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

PASSED: Continuous integration, rev:167
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/95/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/370
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-ci/93
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-ci/93
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-trusty-amd64-ci/7

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-11-05 19:50:18 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-12-11 01:10:20 +0000
@@ -118,8 +118,7 @@
     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')
+        addCityItem = self.main_window.wait_select_single('Standard', objectName='AddCityListItem')
         self.assertThat(lambda: addCityItem.visible, Eventually(Equals(True)))
         self.pointing_device.move_to_object(addCityItem)
         self.pointing_device.click()

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-11-12 22:29:11 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2013-12-11 01:10:20 +0000
@@ -26,10 +26,36 @@
         self.assertThat(
             self.get_qml_view().visible, Eventually(Equals(True)))
 
-    def search_for_city(self, city):
-        self.assertThat(lambda: self.main_window.select_single('TextField', objectName='SearchField'),
-                                   Eventually(Not(Is(None))))
-        searchField = self.main_window.select_single("TextField", objectName="SearchField")
+    def _preload_database_and_relaunch(self):
+        self.clean_db()
+        self.launch_and_quit_app()
+        # add one location to storage
+        self.save_locations_to_storage(locations_data)
+        super(TestLocationManager, self).setUp()
+        self.assertThat(
+            self.get_qml_view().visible, Eventually(Equals(True)))
+
+    def _open_location_manager(self):
+        """Opens the location manager"""
+        self.main_window.open_toolbar().click_button("EditButton")
+
+    def _swipe_first_location_to_remove(self):
+        """Swipe right to delete the first location"""
+        first_location = self.app.wait_select_single("Standard", objectName="existingLocationItem0")
+        number_of_locations = self._get_number_of_locations()
+
+        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(self._get_number_of_locations, Eventually(Equals(number_of_locations-1)))
+
+    def _get_number_of_locations(self):
+        qqlw = self.app.select_single("ComposerSheet").select_single("QQuickListView")
+        return qqlw.count
+
+    def _search_for_city(self, city):
+        searchField = self.main_window.wait_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
@@ -42,51 +68,39 @@
         self.keyboard.press_and_release('Enter')
         return searchField
 
-    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
-        taken 1 second later."""
-        item = self.app.select_single(object_type, **kwargs)
-        tries = 10
-        while item is None and tries > 0:
-            sleep(0.2)
-            item = self.app.select_single(object_type, **kwargs)
-            tries = tries - 1
-        return item
+    def _add_location(self, location):
+        self._open_add_location_page()
+
+        # insert city name to search for
+        self._search_for_city(location)
+
+        # wait for results and click on the first item
+        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='SearchingSpinner')
+        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
+        resultsList = self.main_window.select_single('QQuickListView', objectName='SearchResultList')
+        self.assertThat(resultsList.visible, Eventually(Equals(True)))
+        firstResult = self.main_window.wait_select_single('Label', objectName='searchResult0')
+        self.pointing_device.move_to_object(firstResult)
+        self.pointing_device.click()
+
+        # LocationManagerPage should be visible and location added
+        addedItem = self.main_window.wait_select_single('Label', text=location)
+        self.assertThat(addedItem.text, Eventually(Equals(location)))
+        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))
+
+    def _remove_location(self):
+        self._open_location_manager()
+        self._swipe_first_location_to_remove()
+        self._click_sheet_confirm()
 
     def test_add_location(self):
         """Adds a location"""
-        self._open_add_location_page()
-
-        # insert city name to search for
-        self.search_for_city("London")
-
-        # wait for results and click on the first item
-        # http_failed = lambda: self.main_window.select_single('SplashComponent',  objectName='HTTPFailedSplash').visible
-        # self.assertThat(http_failed, Eventually(NotEquals(True)))
-        load_indicator = self.main_window.select_single('ActivityIndicator', objectName='SearchingSpinner')
-        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
-        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='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.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.select_single('ActivityIndicator', objectName='LoadingSpinner')
-        self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
+
+        self._add_location("Paris")
 
         # only location is there
         loadingPage = self.main_window.select_single("Tabs", objectName="rootTabs")
@@ -100,19 +114,12 @@
 
         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')
+        testResult = self.main_window.wait_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='existingLocation0'),
-                            Eventually(Not(Is(None))))
-        addedItem = self.main_window.select_single('Label', objectName="existingLocation0")
+        addedItem = self.main_window.wait_select_single('Label', objectName="existingLocation0")
         self.assertThat(addedItem.text, Eventually(Equals("Cairo")))
         self._click_sheet_confirm()
 
@@ -131,27 +138,20 @@
         self._open_add_location_page()
 
         # insert city name to search for
-        searchField = self.search_for_city("London")
+        searchField = self._search_for_city("London")
 
         # wait for results and click on the first item
-        #http_failed = lambda: self.main_window.select_single('SplashComponent', objectName='HTTPFailedSplash').visible
-        #self.assertThat(http_failed, Eventually(NotEquals(True)))
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='SearchingSpinner')
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         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='searchResult0'),
-                            Eventually(Not(Is(None))))
-        firstResult = self.select_single_retry("Label", objectName="searchResult0")
+        firstResult = self.main_window.wait_select_single("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.select_single('TextField', objectName='SearchField'),
-                            Eventually(Not(Is(None))))
-        searchField = self.main_window.select_single("TextField", objectName="SearchField")
+        searchField = self.main_window.wait_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")
+        clear_button = searchField.wait_select_single("AbstractButton")
         self.pointing_device.click_object(clear_button)
         self.assertThat(searchField.text, Eventually(Equals("")))
 
@@ -161,18 +161,14 @@
         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.select_single('Label', objectName='searchResult0'),
-                            Eventually(Not(Is(None))))
-        firstResult = self.select_single_retry("Label", objectName="searchResult0")
+        firstResult = self.main_window.wait_select_single("Label", objectName="searchResult0")
         self.assertThat(firstResult.text, Eventually(Equals("Hamburg")))
 
     def test_cancel_adding_location(self):
         """Cancel the cities search"""
         self._open_add_location_page()
         self._click_sheet_cancel()
-        self.assertThat(lambda: self.main_window.select_single('QQuickListView', objectName='LocationList'),
-                            Eventually(Not(Is(None))))
-        locationList = self.main_window.select_single('QQuickListView', objectName='LocationList')
+        locationList = self.main_window.wait_select_single('QQuickListView', objectName='LocationList')
         self.assertThat(locationList.visible, Eventually(Equals(True)))
 
     def test_no_location_found(self):
@@ -180,11 +176,9 @@
         self._open_add_location_page()
 
         # insert city name to search for
-        self.search_for_city("UbuntuCity")
+        self._search_for_city("UbuntuCity")
 
         # wait for result and look if label is shown
-        # http_failed = lambda: self.main_window.select_single('SplashComponent', objectName='HTTPFailedSearch').visible
-        # self.assertThat(http_failed, Eventually(NotEquals(True)))
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='SearchingSpinner')
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
         errorLabel = self.main_window.select_single('Label', objectName='noCityError')
@@ -193,9 +187,7 @@
     def test_location_lookup(self):
         """Tests the location lookup"""
         # start lookup
-        self.assertThat(lambda: self.main_window.select_single('Standard', objectName='LocationLookupItem'),
-                            Eventually(Not(Is(None))))
-        lookupItem = self.main_window.select_single('Standard', objectName='LocationLookupItem')
+        lookupItem = self.main_window.wait_select_single('Standard', objectName='LocationLookupItem')
         self.pointing_device.click_object(lookupItem)
 
         # wait for result
@@ -203,25 +195,16 @@
         self.assertThat(load_indicator.running, Eventually(Equals(False), timeout=120))
 
         # check a location was found
-        self.assertThat(lambda: self.main_window.select_single('Label', objectName='CurrentLocationLabel'),
-                            Eventually(Not(Is(None))))
-        location = self.main_window.select_single('Label', objectName='CurrentLocationLabel')
+        location = self.main_window.wait_select_single('Label', objectName='CurrentLocationLabel')
         self.assertThat(location.text, Eventually(Not(Equals(""))))
         location_name = location.text
 
         # add location
-        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')
+        add_button = self.main_window.wait_select_single('Button', objectName='LookupItemAddButton')
         self.pointing_device.click_object(add_button)
 
         # 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")
+        addedItem = self.main_window.wait_select_single('Label', objectName="existingLocation0")
         self.assertThat(addedItem.text, Eventually(Equals(location_name)))
         self._click_sheet_confirm()
 
@@ -235,51 +218,10 @@
         tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
         self.assertEqual(1, len(tabObjects))
 
-
-
-class TestLocationManagerWithLocation(WeatherTestCase, DatabaseMixin, SheetMixin, LocationManagerMixin):
-    def setUp(self):
-        self.clean_db()
-        self.launch_and_quit_app()
-        # add one location to storage
-        self.save_locations_to_storage(locations_data)
-        super(TestLocationManagerWithLocation, self).setUp()
-        self.assertThat(
-            self.get_qml_view().visible, Eventually(Equals(True)))
-
-    def _open_location_manager(self):
-        """Opens the location manager"""
-        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()
-        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"):
-            self.pointing_device.click_object(trashcanLabel)
-            sleep(1)
-            timeout += 1
-        self.assertThat(lambda: self._get_number_of_locations(), Eventually(Equals(number_of_locations-1)))
-
-    def _get_number_of_locations(self):
-        qqlw = self.app.select_single("ComposerSheet").select_single("QQuickListView")
-        return qqlw.count
-
-    @unittest.skip("https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1245651")
     def test_remove_location(self):
         """Removes location"""
+        self._preload_database_and_relaunch()
+
         # wait till data is loaded
         loadingPage = self.main_window.select_single("Tabs", objectName="rootTabs")
         self.assertThat(loadingPage.visible, Eventually(Equals(True)))
@@ -288,10 +230,8 @@
         tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
         tabsSumStart = len(tabObjects)
 
-        # go to the location manager and remove location
-        self._open_location_manager()
-        self._swipe_location_to_remove()
-        self._click_sheet_confirm()
+        # go to the location manager and remove 1st location
+        self._remove_location()
 
         # back to locations, only one is left
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
@@ -299,9 +239,10 @@
         tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
         self.assertThat(lambda: tabsSumStart-1, Eventually(Equals(len(tabObjects))))
 
-    @unittest.skip("https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1245651")
     def test_cancel_remove_location(self):
         """Cancels removing of location"""
+        self._preload_database_and_relaunch()
+
         # wait data is loaded
         loadingPage = self.main_window.select_single("Tabs", objectName="rootTabs")
         self.assertThat(loadingPage.visible, Eventually(Equals(True)))
@@ -312,7 +253,7 @@
 
         # go to the location manager, remove location, but click cancel
         self._open_location_manager()
-        self._swipe_location_to_remove()
+        self._swipe_first_location_to_remove()
         self._click_sheet_cancel()
 
         # back to locations, no loction is removed
@@ -322,33 +263,19 @@
         self.assertEqual(tabsSumStart, len(tabObjects))
 
     def test_del_add_bug(self):
-        """Tests if remvoing and add ad loction in one action works
+        """Tests if removing and add a location in one action works
            https://bugs.launchpad.net/ubuntu-weather-app/+bug/1230297"""
+
+        self._preload_database_and_relaunch()
+
         # remove a location
-        self._open_location_manager()
+        self._remove_location()
+
         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()
+        self._open_location_manager()
+        self._add_location("Cairo")
 
         # back to locations, wait till data is loaded
         load_indicator = self.main_window.select_single('ActivityIndicator', objectName='LoadingSpinner')
@@ -356,7 +283,7 @@
 
         # count the tabs
         tabObjects = self.main_window.select_many('LocationTab', objectName='LocationTab')
-        self.assertThat(lambda: number_of_locations, Eventually(Equals(len(tabObjects))))
+        self.assertThat(lambda: number_of_locations + 1, Eventually(Equals(len(tabObjects))))
         self.assertThat(
             self.main_window.select_single('LocationTab', index=1).title,
             Eventually(Equals("Cairo")))