Merge lp:~carla-sella/ubuntu-clock-app/new-add_world_city_test into lp:ubuntu-clock-app

[Carla Sella]

Autopilot test for ubuntu-clock/reboot app

Need help on StateNotFoundError.

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

FAILED: Continuous integration, rev:56
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/220/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/59/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/220/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/220/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:58
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/222/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/66/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/222/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/222/rebuild

review: Needs Fixing (continuous-integration)

[Carla Sella (carla-sella)]

Test is complete, only need to remove some commented lines in emulators.py commented for a problem with count property of QQuickRepeater - userWorldCityRepeater.

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

FAILED: Continuous integration, rev:60
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/226/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/70/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/226/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/226/rebuild

review: Needs Fixing (continuous-integration)

[Carla Sella (carla-sella)]

I had to put a sleep here:

202 + sleep(5)

as I could not find a way to fix a timing issue.
If I do not put a sleep here the count property of the QQuickListView will be zero and the test will fail as the for instruction just after the sleep will be skipped.

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

FAILED: Continuous integration, rev:61
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/235/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/82/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/235/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/235/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:63
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/239/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/88/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/239/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/239/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Carla, I cannot help you yet with this issue since I am doing some last minute work that is required to replace the old clock app. So I will be busy until the end of the week with that. I will try to find a solution in the weekend for this MP.

Meanwhile I am marking this as a work-in-progress.

[Carla Sella (carla-sella)]

Ok thank you Nekhelesh.

[Nekhelesh Ramananthan (nik90)]

Sry :/ But I think you have everything from your side. So this MP is blocked on me essentially. So I will take the blame for it :D

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

FAILED: Continuous integration, rev:65
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/456/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/284/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/103/console

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

review: Needs Fixing (continuous-integration)

[Carla Sella (carla-sella)]

Test kept on fialing even if code looked ok to me, so Nekhelesh tested the QML and noticed that when you delete the last world city the count property remains set at one instead of zero. If you add 2 world cities (count=2), and then delete one, the count changes to 1. If you delete the last one, the count remains as 1. I have Reported bug #1368393 for this problem.
I will try to add a hack around the issue until the bug is fixed as this is a minor issue now as it does not affect the user.

[Carla Sella (carla-sella)]

I Discovered that deleting world city clock deletes the city from the clock app, but if you look with autopilot vis the world city is still there. Iadded a comment to bug #1368393 about this.

[lp:~carla-sella/ubuntu-clock-app/new-add_world_city_test]

66. By Carla Sella on 2014-09-12

Completed add world city tests.

67. By Carla Sella on 2014-09-12

Commit for merging.

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

FAILED: Continuous integration, rev:67
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/467/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/314/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/114/console

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

review: Needs Fixing (continuous-integration)

[lp:~carla-sella/ubuntu-clock-app/new-add_world_city_test]

68. By Carla Sella on 2014-09-12

Fixed pep8 and pyflakes.

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

PASSED: Continuous integration, rev:68
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/468/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/315
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/315/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/115

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

oO passing :-)

[Carla Sella (carla-sella)]

Yeah! :P

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Is this ready to land now?

[Nekhelesh Ramananthan (nik90)]

Looks good! As always thnx a lot for the AP test. More test coverage, mean happy QA team :)

review: Approve

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2014-09-04 20:08:39 +0000
+++ app/clock/ClockPage.qml	2014-09-12 19:44:41 +0000
@@ -151,6 +151,7 @@
 
         AddWorldCityButton {
             id: addWorldCityButton
+            objectName: "addWorldCityButton"
 
             opacity: settingsIcon.opacity
             anchors {

=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
--- app/worldclock/UserWorldCityDelegate.qml	2014-09-04 21:03:56 +0000
+++ app/worldclock/UserWorldCityDelegate.qml	2014-09-12 19:44:41 +0000
@@ -53,6 +53,7 @@
 
             Label {
                 text: model.city
+                objectName: "userCityNameText"
                 width: parent.width
                 elide: Text.ElideRight
                 color: UbuntuColors.midAubergine
@@ -60,6 +61,7 @@
 
             Label {
                 text: model.country
+                objectName: "userCountryNameText"
                 fontSize: "xx-small"
                 width: parent.width
                 elide: Text.ElideRight

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2014-08-24 12:47:50 +0000
+++ app/worldclock/WorldCityList.qml	2014-09-12 19:44:41 +0000
@@ -34,6 +34,7 @@
 
 Page {
     id: worldCityList
+    objectName: "worldCityList"
 
     property bool isOnlineMode: false
 
@@ -48,6 +49,7 @@
             head: worldCityList.head
             actions: [
                 Action {
+                    objectName: "searchButton"
                     iconName: "search"
                     text: i18n.tr("City")
                     onTriggered: {
@@ -73,6 +75,7 @@
 
             contents: TextField {
                 id: searchField
+                objectName: "searchField"
 
                 inputMethodHints: Qt.ImhNoPredictiveText
                 placeholderText: i18n.tr("Search...")
@@ -202,6 +205,7 @@
 
     ListView {
         id: cityList
+        objectName: "cityList"
 
         function addWorldCity(city, country, timezone) {
             console.log("[LOG]: Adding city to U1db Database")
@@ -255,6 +259,7 @@
 
         delegate: ListItem.Base {
             showDivider: false
+            objectName: "worldCityItem" + index
 
             Column {
                 id: worldCityDelegateColumn
@@ -268,6 +273,7 @@
 
                 Label {
                     text: city
+                    objectName: "cityNameText"
                     width: parent.width
                     elide: Text.ElideRight
                     color: UbuntuColors.midAubergine
@@ -275,6 +281,7 @@
 
                 Label {
                     text: country
+                    objectName: "countryNameText"
                     fontSize: "xx-small"
                     width: parent.width
                     elide: Text.ElideRight

=== modified file 'tests/autopilot/ubuntu_clock_app/emulators.py'
--- tests/autopilot/ubuntu_clock_app/emulators.py	2014-08-14 23:15:46 +0000
+++ tests/autopilot/ubuntu_clock_app/emulators.py	2014-09-12 19:44:41 +0000
@@ -20,6 +20,7 @@
 
 from autopilot import logging as autopilot_logging
 from autopilot.introspection import dbus
+from testtools.matchers import GreaterThan
 
 from ubuntuuitoolkit import pickers
 import ubuntuuitoolkit
@@ -59,6 +60,12 @@
         """ Get the AlarmList object. """
         return AlarmList.select(self)
 
+    @autopilot_logging.log_action(logger.info)
+    def get_worldCityList(self):
+        """ Return the World City List page """
+        return self.wait_select_single("WorldCityList",
+                                       objectName="worldCityList")
+
 
 class Page(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
@@ -100,6 +107,74 @@
 class ClockPage(PageWithBottomEdge):
     """Autopilot helper for the Clock page."""
 
+    @autopilot_logging.log_action(logger.info)
+    def click_addCity_to_open_worldCityList(self):
+        """Swipe to reveal WorldCityList"""
+
+        addWorldCityButton = self.wait_select_single(
+            "AbstractButton", objectName="addWorldCityButton")
+        self.pointing_device.click_object(addWorldCityButton)
+
+    def get_num_of_saved_cities(self):
+        """Return the number of saved world cities"""
+        return int(self._get_saved_world_city_list().count)
+
+    def _get_saved_world_city_list(self):
+        """Return the saved world city listview object"""
+        return self.wait_select_single(
+            "QQuickRepeater", objectName='userWorldCityRepeater')
+
+    @autopilot_logging.log_action(logger.info)
+    def delete_added_world_city(self, city_Name, country_Name):
+        """ Delete added world city from user world city list """
+        old_cities_count = self.get_num_of_saved_cities()
+        index = 0
+        for index in range(old_cities_count):
+            if self.wait_select_single(
+                objectName='userWorldCityItem{}'.format(index)).\
+                wait_select_single("Label", objectName="userCityNameText").\
+                    text == city_Name:
+                if self.wait_select_single(
+                    objectName='userWorldCityItem{}'.format(index)).\
+                    wait_select_single(
+                    "Label", objectName="userCountryNameText").\
+                        text == country_Name:
+                    self._delete_userWorldCityItem(index)
+
+    # FIXME -----------------------------------------------------------------
+    # Commenting the following lines as deleting a world city when there is
+    # only one in the user world city list does not decrease counter to 0 but
+    # leaves it at 1 so the test fails
+    # Reported bug #1368393
+    # Discovered that deleting world city clock deletes the city from the clock
+    # app, but if you look with autopilot vis the world city is still there
+    # added a comment to bug #1368393
+    #
+    #    try:
+    #        self._get_saved_world_city_list().count.wait_for(
+    #            old_cities_count - 1)
+    #    except AssertionError:
+    #        raise ClockEmulatorException('Error deleting city.')
+    # -------------------------------------------------------------------------
+
+    def _delete_userWorldCityItem(self, index):
+        cityItem = self.wait_select_single(
+            objectName='userWorldCityItem{}'.format(index))
+        self._swipe_to_delete(cityItem)
+        self._confirm_removal(cityItem)
+
+    def _swipe_to_delete(self, cityItem):
+        x, y, width, height = cityItem.globalRect
+        start_x = x + (width * 0.2)
+        stop_x = x + (width * 0.8)
+        start_y = stop_y = y + (height // 2)
+
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+
+    def _confirm_removal(self, cityItem):
+        deleteButton = cityItem.wait_select_single(name='delete')
+        self.pointing_device.click_object(deleteButton)
+
 
 class Page11(Page):
     """Autopilot helper for the Alarm page."""
@@ -170,6 +245,54 @@
             raise ClockEmulatorException('Error creating alarm.')
 
 
+class WorldCityList(Page):
+    """Autopilot helper for World City List page."""
+
+    @autopilot_logging.log_action(logger.info)
+    def add_world_city_from_list(self, city_Name, country_Name):
+        """Add world city from list
+
+        :param city_Name: world city name to add
+        :param country_Name: country city name belongs to (same city name could
+         be found in more countries)
+        """
+        self.wait_select_single("ActivityIndicator").running.wait_for(False)
+        cityList = self.wait_select_single("QQuickListView",
+                                           objectName="cityList")
+
+        cityList.count.wait_for(GreaterThan(0))
+
+        for index in range(int(cityList.count)):
+            if cityList.wait_select_single(
+                objectName="worldCityItem{}".format(index)).wait_select_single(
+                    "Label", objectName="cityNameText").text == city_Name:
+                if cityList.wait_select_single(
+                    objectName="worldCityItem{}".format(index)).\
+                    wait_select_single("Label", objectName="countryNameText").\
+                        text == country_Name:
+                    cityList.click_element(
+                        "worldCityItem{}".format(index), direction=None)
+                    break
+
+    @autopilot_logging.log_action(logger.info)
+    def search_world_city_(self, city_Name, country_Name):
+        """Add world city by searching the world city name
+
+        :param city_Name: world city name to add
+
+        """
+        header = self.main_view.get_header()
+        header.click_action_button("searchButton")
+        self._search_world_city(city_Name, country_Name)
+
+    def _search_world_city(self, city_Name, country_Name):
+        header = self.main_view.get_header()
+        searchTextfield = header.wait_select_single(
+            "TextField", objectName='searchField')
+        searchTextfield.visible.wait_for(True)
+        searchTextfield.write(city_Name)
+
+
 class EditAlarmPage(Page):
     """Autopilot helper for the Add Alarm page."""
 

=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_clock.py'
--- tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2014-08-02 12:57:23 +0000
+++ tests/autopilot/ubuntu_clock_app/tests/test_clock.py	2014-09-12 19:44:41 +0000
@@ -42,3 +42,43 @@
             self.main_view.visible, Eventually(Equals(True)))
 
         self.page = self.main_view.open_clock()
+
+    def test_add_city_from_list_must_add_world_city(self):
+        """Test if adding a world city chosing it from the list works"""
+
+        city_Name = "Amsterdam"
+        country_Name = "Netherlands"
+
+        old_city_count = self.page.get_num_of_saved_cities()
+
+        self.page.click_addCity_to_open_worldCityList()
+        worldCityList = self.main_view.get_worldCityList()
+        worldCityList.add_world_city_from_list(city_Name, country_Name)
+
+        # Confirm that the city has been added
+        self.assertThat(
+            self.page.get_num_of_saved_cities,
+            Eventually(Equals(old_city_count + 1)))
+
+        self.page.delete_added_world_city(city_Name, country_Name)
+
+    def test_add_city_by_searching_must_add_world_city(self):
+        """Test if adding a world city serching in the list works"""
+
+        city_Name = "Venice"
+        country_Name = "Provincia di Venezia, Veneto, Italy"
+        brief_country_Name = " Veneto, Italy"
+
+        old_city_count = self.page.get_num_of_saved_cities()
+
+        self.page.click_addCity_to_open_worldCityList()
+        worldCityList = self.main_view.get_worldCityList()
+        worldCityList.search_world_city_(city_Name, country_Name)
+        worldCityList.add_world_city_from_list(city_Name, country_Name)
+
+        # Confirm that the city has been added
+        self.assertThat(
+            self.page.get_num_of_saved_cities,
+            Eventually(Equals(old_city_count + 1)))
+
+        self.page.delete_added_world_city(city_Name, brief_country_Name)