Merge lp:~canonical-platform-qa/ubuntu-weather-app/fix1365279-setup_once into lp:ubuntu-weather-app/obsolete.trunk

[Leo Arias]

Fixed the set up of the location tests.

[Leo Arias (elopio)]

There are many things to fix on the weather tests. I'm ignoring all of them for now, as I just want the tests to start passing. I've added a TODO to clean things up after RTM.

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

FAILED: Continuous integration, rev:352
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/249/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/75
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/75/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/56/console

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

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/ubuntu-weather-app/fix1365279-setup_once]

353. By Leo Arias on 2014-09-04

Fixed pep8.

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

PASSED: Continuous integration, rev:353
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/250/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/76
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-weather-app/76/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-utopic-amd64-ci/57

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

review: Approve (continuous-integration)

[Martin Borho (martin-borho)]

Looks good to me, thanks!

review: Approve

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2014-08-16 17:45:06 +0000
+++ po/com.ubuntu.weather.pot	2014-09-04 06:38:11 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-16 12:44-0500\n"
+"POT-Creation-Date: 2014-09-03 23:29-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2014-06-26 09:29:19 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2014-09-04 06:38:11 +0000
@@ -43,11 +43,13 @@
 
     local_location = "../../ubuntu-weather-app.qml"
     installed_location = "/usr/share/ubuntu-weather-app/ubuntu-weather-app.qml"
+    should_launch_app = True
 
     def setUp(self):
         super(WeatherTestCase, self).setUp()
         self.pointing_device = Pointer(self.input_device_class.create())
-        self.launch_app()
+        if self.should_launch_app:
+            self.launch_app()
 
     def launch_app(self):
         if os.path.exists(self.local_location):

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2014-07-10 19:34:54 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_locationmanager.py	2014-09-04 06:38:11 +0000
@@ -27,29 +27,10 @@
 logger = logging.getLogger(__name__)
 
 
-class TestLocationManager(WeatherTestCase, DatabaseMixin, SheetMixin,
-                          LocationManagerMixin):
-
-    def setUp(self):
-        # we want to start with no database
-        self.clean_db()
-        super(TestLocationManager, self).setUp()
-        self.assertThat(
-            self.main_view.visible, Eventually(Equals(True)))
-
-    def _preload_database_and_launch(self):
-        # we want to start with existing data
-        logger.debug("Closing app")
-        self.doCleanups()
-        # wipe the existing database and create a new blank one
-        self.create_blank_db()
-        # add locations to storage
-        logger.debug("Adding fake data to new database")
-        self.add_locations_to_database()
-        logger.debug("Re-Launching app to introspect")
-        super(TestLocationManager, self).setUp()
-        self.assertThat(
-            self.main_view.visible, Eventually(Equals(True)))
+# FIXME Use fixtures instead of the complex multiple inheritance.
+# --elopio - 2014-09-03
+class BaseTestLocationManager(
+        WeatherTestCase, DatabaseMixin, SheetMixin, LocationManagerMixin):
 
     def _open_location_manager(self, kb=False):
         """Opens the location manager"""
@@ -81,6 +62,30 @@
             "QQuickListView")
         return qqlw.count
 
+    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
+        self.main_view.wait_for_activity_to_finish()
+        resultsList = self.main_view.select_single(
+            'QQuickListView', objectName='SearchResultList')
+        self.assertThat(resultsList.visible, Eventually(Equals(True)))
+        firstResult = self.main_view.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_view.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
+        self.main_view.wait_for_activity_to_finish()
+
     def _search_for_city(self, city):
         searchField = self.main_view.wait_select_single(
             "TextField", objectName="SearchField")
@@ -96,34 +101,15 @@
         self.keyboard.press_and_release('Enter')
         return searchField
 
-    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
-        self.main_view.wait_for_activity_to_finish()
-        resultsList = self.main_view.select_single(
-            'QQuickListView', objectName='SearchResultList')
-        self.assertThat(resultsList.visible, Eventually(Equals(True)))
-        firstResult = self.main_view.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_view.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
-        self.main_view.wait_for_activity_to_finish()
-
-    def _remove_location(self):
-        self._open_location_manager()
-        self._swipe_first_location_to_remove()
-        self._click_sheet_confirm()
+
+class TestLocationManager(BaseTestLocationManager):
+
+    def setUp(self):
+        # we want to start with no database
+        self.clean_db()
+        super(TestLocationManager, self).setUp()
+        self.assertThat(
+            self.main_view.visible, Eventually(Equals(True)))
 
     def _verify_location(self, title, index):
         location = self.main_view.wait_select_single(
@@ -132,10 +118,6 @@
         self.assertThat(location.index, Equals(index))
         self.assertThat(location.visible, Equals(True))
 
-    def _wait_for_tab(self):
-        loadingPage = self.main_view.get_tabs()
-        self.assertThat(loadingPage.visible, Eventually(Equals(True)))
-
     def test_add_location(self):
         """Adds a location"""
 
@@ -257,10 +239,38 @@
         # only location is there
         self._verify_location(location_name, 0)
 
+
+class TestLocationManagerWithPreloadDatabase(BaseTestLocationManager):
+
+    should_launch_app = False
+
+    def setUp(self):
+        # we want to start with no database
+        super(TestLocationManagerWithPreloadDatabase, self).setUp()
+        self._preload_database()
+        self.launch_app()
+        self.assertThat(
+            self.main_view.visible, Eventually(Equals(True)))
+
+    def _preload_database(self):
+        # wipe the existing database and create a new blank one
+        self.create_blank_db()
+        # add locations to storage
+        logger.debug("Adding fake data to new database")
+        self.add_locations_to_database()
+        logger.debug("Re-Launching app to introspect")
+
+    def _remove_location(self):
+        self._open_location_manager()
+        self._swipe_first_location_to_remove()
+        self._click_sheet_confirm()
+
+    def _wait_for_tab(self):
+        loadingPage = self.main_view.get_tabs()
+        self.assertThat(loadingPage.visible, Eventually(Equals(True)))
+
     def test_remove_location(self):
         """Removes location"""
-        self._preload_database_and_launch()
-
         # wait till data is loaded
         self._wait_for_tab()
 
@@ -278,8 +288,6 @@
 
     def test_cancel_remove_location(self):
         """Cancels removing of location"""
-        self._preload_database_and_launch()
-
         # wait data is loaded
         self._wait_for_tab()
 
@@ -300,9 +308,6 @@
     def test_del_add_bug(self):
         """Tests if removing and add a location in one action works
            https://bugs.launchpad.net/ubuntu-weather-app/+bug/1230297"""
-
-        self._preload_database_and_launch()
-
         # remove a location
         self._remove_location()
 
@@ -324,7 +329,6 @@
     def test_open_location_manager_keyboard(self):
         if self.platform_model != "Desktop":
             return
-        self._preload_database_and_launch()
         self._open_location_manager(kb=True)
 
         # close sheet by keyboard and test
@@ -337,7 +341,6 @@
     def test_add_location_keyboard(self):
         if self.platform_model != "Desktop":
             return
-        self._preload_database_and_launch()
         self._open_location_manager(kb=True)
         self._open_add_location_page()