Merge lp:~fazerlicourice/ubuntu-weather-app/add-test-switch-data-providers into lp:ubuntu-weather-app

[Vamshi Balanaga]

Added a test that confirms that the app correctly switches data providers.
Keys need to be present while testing for this to work.

Added a test that confirms that the app correctly switches data providers.
Keys need to be present while testing for this to work.

[Nicholas Skaggs (nskaggs)]

I won't probably be able to review this until tomorrow. However, you are correct in that you need a TWC key. The weather devs can explain it better than I.

[Andrew Hayzen (ahayzen)]

Looks good so far, I've added quite a few comments let me know if any don't make sense.

review: Needs Fixing

[lp:~fazerlicourice/ubuntu-weather-app/add-test-switch-data-providers]

216. By Vamshi Balanaga <email address hidden> on 2016-01-31

made requested changes.

[Vamshi Balanaga (fazerlicourice)]

I'm unable to revert a file. I did bzr revert CMakeLists.txt.user but it didn't work.

[lp:~fazerlicourice/ubuntu-weather-app/add-test-switch-data-providers]

217. By Vamshi Balanaga <email address hidden> on 2016-01-31

merged from ubuntu weather app and fixed conflicts

[Nicholas Skaggs (nskaggs)]

Are we happy with this now?

[Andrew Hayzen (ahayzen)]

Not yet, some issues still stand.

@fazer, try passing -r with the revision to go back to with the bzr revert command, or if that doesn't work I can have a look into other ways to revert it.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:217
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~fazerlicourice/ubuntu-weather-app/add-test-switch-data-providers/+merge/283749/+edit-commit-message

https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/990/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/537/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/990/rebuild

review: Needs Fixing (continuous-integration)

[lp:~fazerlicourice/ubuntu-weather-app/add-test-switch-data-providers]

218. By Vamshi Balanaga <email address hidden> on 2016-02-06

attempted to revert CMake.txt.user file

219. By Vamshi Balanaga <email address hidden> on 2016-02-06

merged from master

220. By Vamshi Balanaga <email address hidden> on 2016-02-06

still attempting to revert the CMake file

[Vamshi Balanaga (fazerlicourice)]

How do I trigger a re-build of Jenkins? Or is that something only you can do?

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:220
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1022/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/574/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1022/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

How is this coming along? Do we feel this test is possible using qmltestrunner instead of autopilot?

[lp:~fazerlicourice/ubuntu-weather-app/add-test-switch-data-providers]

221. By Vamshi Balanaga <email address hidden> on 2016-02-20

merged upstream

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:220
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1045/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/597/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1045/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:221
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1046/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/598/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1046/rebuild

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

Sorry for the very long review time.

This failed with

Traceback (most recent call last):
  File "/tmp/adt-run.7DdPR6/tree/tests/autopilot/ubuntu_weather_app/tests/test_settings_page.py", line 178, in test_switch_service
    self._check_provider("weatherchannel")
  File "/tmp/adt-run.7DdPR6/tree/tests/autopilot/ubuntu_weather_app/tests/test_settings_page.py", line 77, in _check_provider
    self.data_provider_page.click_back()
AttributeError: 'TestSettingsPage' object has no attribute 'data_provider_page'

Seems you either need todo the click_back() before the self._check_provider(service) or pass the data_provider_page as a parameter, although I think the first solution in this case will be the most extensible in the future.

Also you might want to merge with trunk as your other MP landed, so there could be conflicts.

review: Needs Fixing

[Vamshi Balanaga (fazerlicourice)]

Alright, will get on it as soon as possible, busy time at school.

[Vamshi Balanaga (fazerlicourice)]

Is there an irc channel for the weather app? If I need to run some stuff by someone else?

Also, I keep gettign an error that says I can't find any of List items in the settings page. I'm using this command:

self.wait_select_single("StandardListItem", title=listitem_title)

listitem_title is a method parameter.( http://bazaar.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/reboot/view/head:/tests/autopilot/ubuntu_weather_app/__init__.py#L286 )

[Andrew Hayzen (ahayzen)]

It looks like they should be a StandardListItem, check in Autopilot Vis to ensure they aren't another type and check that the test is actually on the correct page when trying to find the listitems.

There is an IRC channel for app development in general for Ubuntu, which is #ubuntu-app-devel, I and many others hang around in there :-) Further channels such as #ubuntu-autopilot #ubuntu-quality and #ubuntu-touch can be useful, for a full list refer to [0].

Let me know if you can't figure out the listitem issue.

0 - https://wiki.ubuntu.com/IRC/ChannelList

Unmerged revisions

221. By Vamshi Balanaga <email address hidden> on 2016-02-20

merged upstream

220. By Vamshi Balanaga <email address hidden> on 2016-02-06

still attempting to revert the CMake file

219. By Vamshi Balanaga <email address hidden> on 2016-02-06

merged from master

218. By Vamshi Balanaga <email address hidden> on 2016-02-06

attempted to revert CMake.txt.user file

217. By Vamshi Balanaga <email address hidden> on 2016-01-31

merged from ubuntu weather app and fixed conflicts

216. By Vamshi Balanaga <email address hidden> on 2016-01-31

made requested changes.

215. By Vamshi Balanaga <email address hidden> on 2016-01-24

fixed pep8

214. By Vamshi Balanaga <email address hidden> on 2016-01-24

removed stuff

213. By Vamshi Balanaga <email address hidden> on 2016-01-24

removed code from seperate branch

212. By Vamshi Balanaga <email address hidden> on 2016-01-24

Added test to switch between data providers and verify that it executed correctly (LP: #1452489)

=== modified file 'AUTHORS'
--- AUTHORS	2015-08-09 15:32:22 +0000
+++ AUTHORS	2016-02-20 12:28:09 +0000
@@ -3,8 +3,9 @@
 In addition, numerous translations, bug reports and other non-code contributions have been made which are equally valued.
 
 Andrew Hayzen <[e-mail]>
+Carla Sella <[e-mail]>
 Daniel Holbach <[e-mail]>
 Martin Borho <[e-mail]>
 Nekhelesh Ramananthan <[e-mail]>
+Vamshi Balanaga <[e-mail]>
 Victor Thompson <[e-mail]>
-Carla Sella <[e-mail]>

=== modified file 'app/components/DayDelegateExtraInfo.qml'
--- app/components/DayDelegateExtraInfo.qml	2015-12-12 03:41:27 +0000
+++ app/components/DayDelegateExtraInfo.qml	2016-02-20 12:28:09 +0000
@@ -49,6 +49,7 @@
 
     ForecastDetailsDelegate {
         id: chanceOfPrecipForecast
+        objectName: "chanceOfPrecipForecast"
         forecast: i18n.tr("Chance of precipitation")
         imageSource: "../graphics/extended-information_chance-of-rain.svg"
         value: modelData.chanceOfPrecip
@@ -64,6 +65,7 @@
 
     ForecastDetailsDelegate {
         id: uvIndexForecast
+        objectName: "uvIndexForecast"
         imageSource: "../graphics/extended-information_uv-level.svg"
         forecast: i18n.tr("UV Index")
         value: modelData.uvIndex

=== modified file 'app/ui/settings/DataProviderPage.qml'
--- app/ui/settings/DataProviderPage.qml	2015-11-02 21:28:34 +0000
+++ app/ui/settings/DataProviderPage.qml	2016-02-20 12:28:09 +0000
@@ -22,6 +22,7 @@
 import "../../data/keys.js" as Keys
 
 Page {
+    objectName: "dataProviderPage"
     title: i18n.tr("Data Provider")
 
     ListModel {
@@ -29,9 +30,14 @@
         ListElement { text: "OpenWeatherMap" }
     }
 
+    // Hack for autopilot otherwise DataProviderPage appears as Page
+    // due to bug 1341671 it is required that there is a property so that
+    // qml doesn't optimise using the parent type
+    property bool bug1341671workaround: true
+
     ExpandableListItem {
         id: dataProviderSetting
-
+        objectName: "dataProviderSetting"
         listViewHeight: dataProviderModel.count*units.gu(7) - units.gu(1)
         model: dataProviderModel
         text: i18n.tr("Provider")

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-29 23:07:11 +0000
+++ debian/changelog	2016-02-20 12:28:09 +0000
@@ -10,6 +10,9 @@
   [ Victor Thompson ]
   * Change translatable string from "rain" to "precipitation" (LP:1521701)
 
+  [ Vamshi Balanaga ]
+  * Added test to switch between data providers and verify that it executed correctly (LP: #1452489)
+
  -- Andrew Hayzen <[e-mail]>  Thu, 03 Dec 2015 15:20:49 +0000
 
 ubuntu-weather-app (3.1ubuntu1) vivid; urgency=medium

=== modified file 'tests/autopilot/ubuntu_weather_app/__init__.py'
--- tests/autopilot/ubuntu_weather_app/__init__.py	2015-11-03 00:38:48 +0000
+++ tests/autopilot/ubuntu_weather_app/__init__.py	2016-02-20 12:28:09 +0000
@@ -27,7 +27,6 @@
 
     return func_wrapper
 
-
 #
 # Base helpers
 #
@@ -147,6 +146,48 @@
         self.searching.wait_for(False)
 
 
+class DataProviderPage(Page):
+    """Autopilot helper for DataProviderPage."""
+    def change_listitem_data_provider(self, listitem):
+        """Common actions to change listitem unit and return if it changed"""
+
+        # Expand the listitem as we are already on the data provider page
+        self.expand_data_provider_listitem(listitem)
+
+        # Get the currently selected value
+        previous_provider = self.get_expanded_listitem(listitem, "True").title
+
+        # Click the non-selected value
+        self.click_not_selected_listitem(listitem)
+
+        # Return True/False if the selection has changed
+        return self.get_expanded_listitem(
+            listitem, "True").title != previous_provider
+
+    @click_object
+    def click_not_selected_listitem(self, listitem):
+        return self.get_expanded_listitem(listitem, "False")
+
+    @click_object
+    def click_selected_listitem(self, listitem):
+        return self.get_expanded_listitem(listitem, True)
+
+    @click_object
+    def click_data_provider_listitem(self, listitem):
+        return self.select_single("ExpandableListItem", objectName=listitem)
+
+    def expand_data_provider_listitem(self, listitem):
+        item = self.click_data_provider_listitem(listitem)
+        item.expanded.wait_for(True)
+        return item
+
+    def get_expanded_listitem(self, listitem, showIcon):
+        listitemSetting = self.select_single(
+            "ExpandableListItem", objectName=listitem)
+        return listitemSetting.select_single(
+            "StandardListItem", showIcon=showIcon)
+
+
 class DayDelegate(UbuntuUIToolkitCustomProxyObjectBase):
     @click_object
     def click_self(self):
@@ -267,11 +308,16 @@
     """Autopilot helper for SettingsPage."""
     @click_object
     def click_settings_page_listitem(self, listitem_title):
-        return self.select_single("StandardListItem", title=listitem_title)
+        return self.wait_select_single(
+            "StandardListItem", title=listitem_title)
 
     def get_units_page(self):
         return self.main_view.wait_select_single(UnitsPage, visible=True)
 
+    def get_data_provider_page(self):
+        return self.main_view.wait_select_single(DataProviderPage,
+                                                 visible=True)
+
 
 class UnitsPage(Page):
     """Autopilot helper for UnitsPage."""

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/test_settings_page.py'
--- tests/autopilot/ubuntu_weather_app/tests/test_settings_page.py	2015-09-14 18:23:35 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/test_settings_page.py	2016-02-20 12:28:09 +0000
@@ -10,6 +10,7 @@
 from __future__ import absolute_import
 
 import logging
+from autopilot.matchers import Eventually
 from testtools.matchers import Equals
 
 
@@ -26,6 +27,7 @@
     def setUp(self):
         super(TestSettingsPage, self).setUp()
 
+        self.main_view = self.app.main_view
         # Get the home page and selected pane
         self.home_page = self.app.get_home_page()
         self.location_pane = self.home_page.get_selected_location_pane()
@@ -40,26 +42,88 @@
         self.location_pane.click_settings_button()
         self.settings_page = self.app.get_settings_page()
 
+    def _get_units_page(self):
+        """ helper method to get the units page """
+
         # Click the units page
         self.settings_page.click_settings_page_listitem("Units")
 
-        # Get the units page
-        self.units_page = self.settings_page.get_units_page()
+        return self.settings_page.get_units_page()
+
+    def _go_to_settings_page(self):
+        """ helper method that navigates to the setting page """
+
+        # Open the Settings page
+        self.location_pane.click_settings_button()
+
+        # Get the Settings page
+        self.settings_page = self.app.get_settings_page()
+
+    def _get_data_provider_page(self):
+        """ helper method to get the data provider page """
+
+        # Open the Data Provider Page
+        self.settings_page.click_settings_page_listitem("Data Provider")
+
+        # Get the Data Provider Page
+        return self.settings_page.get_data_provider_page()
+
+    def _check_provider(self, service):
+        """
+        checks selected weather data provider from the first location tab
+        """
+
+        # Go back to Home page
+        self.data_provider_page.click_back()
+        self.settings_page.click_back()
+
+        # Reget the home page and selected pane as they have changed
+        self.location_pane = self.home_page.get_selected_location_pane()
+        self.day_delegate = self.location_pane.get_day_delegate(0)
+        day_delegate_extra_info = self.day_delegate.get_extra_info()
+
+        if service == "openweathermap":
+
+            # Check that the 'Chance of Rain' and
+            # 'UV Index' Labels are not visible
+            self.assertThat(day_delegate_extra_info.wait_select_single(
+                "ForecastDetailsDelegate",
+                objectName="chanceOfRainForecast").visible,
+                Eventually(Equals(False)))
+            self.assertThat(day_delegate_extra_info.wait_select_single(
+                "ForecastDetailsDelegate",
+                objectName="uvIndexForecast").visible,
+                Eventually(Equals(False)))
+
+        elif service == "weatherchannel":
+
+            # Check that the 'Chance of Rain' and 'UV Index' Labels are visible
+            self.assertThat(day_delegate_extra_info.wait_select_single(
+                "ForecastDetailsDelegate",
+                objectName="chanceOfPrecipForecast").visible,
+                Eventually(Equals(True)))
+            self.assertThat(day_delegate_extra_info.wait_select_single(
+                "ForecastDetailsDelegate",
+                objectName="uvIndexForecast").visible,
+                Eventually(Equals(True)))
 
     def test_switch_temperature_units(self):
         """ tests switching temperature units in Units page """
 
+        # Get the units page
+        units_page = self._get_units_page()
+
         # Check that the initial unit is F
         self.assertThat(self.initial_temperature_unit, Equals("F"))
 
         # Change the unit
-        changed = self.units_page.change_listitem_unit("temperatureSetting")
+        changed = units_page.change_listitem_unit("temperatureSetting")
 
         # Check that the new value is not the previously selected
         self.assertThat(changed, Equals(True))
 
         # Go back to the home page
-        self.units_page.click_back()
+        units_page.click_back()
         self.settings_page.click_back()
 
         # Reget the home page and selected pane as they have changed
@@ -75,17 +139,20 @@
     def test_switch_wind_speed_units(self):
         """ tests switching wind speed unit in Units page """
 
+        # Get the units page
+        units_page = self._get_units_page()
+
         # Check that the initial unit is mph
         self.assertThat(self.initial_wind_unit, Equals("mph"))
 
         # Change the unit
-        changed = self.units_page.change_listitem_unit("windSetting")
+        changed = units_page.change_listitem_unit("windSetting")
 
         # Check that the new value is not the previously selected
         self.assertThat(changed, Equals(True))
 
         # Go back to the home page
-        self.units_page.click_back()
+        units_page.click_back()
         self.settings_page.click_back()
 
         # Reget the home page and selected pane as they have changed
@@ -95,3 +162,41 @@
         # Check that the unit is different to the starting unit
         self.assertThat(self.day_delegate.get_wind_unit().endswith(
             self.initial_wind_unit), Equals(False))
+
+    def test_switch_service(self):
+        """ tests switching data providers in Data provider page """
+
+        # Get Data Provider Page
+        data_provider_page = self._get_data_provider_page()
+
+        # Select TWC as the provider
+        data_provider_page.expand_data_provider_listitem(
+            "dataProviderSetting")
+        data_provider_page.click_selected_listitem("dataProviderSetting")
+
+        # Check that the initial provider is TWC
+        self._check_provider("weatherchannel")
+
+        # Reget page
+        self._go_to_settings_page()
+        data_provider_page = self._get_data_provider_page()
+
+        # Attempt to change it to OWM and make sure that it does
+        self.assertThat(
+            data_provider_page.change_listitem_data_provider(
+                "dataProviderSetting"), Equals(True))
+
+        # Check provider
+        self._check_provider("openweathermap")
+
+        # Reget page
+        self._go_to_settings_page()
+        data_provider_page = self._get_data_provider_page()
+
+        # Attempt to change it back to TWC and make sure that it does
+        self.assertThat(
+            data_provider_page.change_listitem_data_provider(
+                "dataProviderSetting"), Equals(True))
+
+        # Check provider
+        self._check_provider("weatherchannel")