Merge lp:~canonical-platform-qa/ubuntu-calendar-app/fix1351319-swipe_to_get_current_day into lp:ubuntu-calendar-app

[Leo Arias]

On autopilot tests, if the current month does not exist on the year grid, swipe it into view.

This branch needs a new release of the toolkit.
These two branches in particular:
https://code.launchpad.net/~canonical-platform-qa/ubuntu-ui-toolkit/fix1351670-grid_view_autopilot_helper/+merge/229353
https://code.launchpad.net/~canonical-platform-qa/ubuntu-ui-toolkit/make_flickable_methods_public/+merge/229354

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

FAILED: Continuous integration, rev:381
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/744/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1885
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1885/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/302

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

I'd like to see a jenkins run against this

[lp:~canonical-platform-qa/ubuntu-calendar-app/fix1351319-swipe_to_get_current_day]

383. By Leo Arias on 2014-09-04

Fixed the call to swipe.

[Leo Arias (elopio)]

> I'd like to see a jenkins run against this

It's on its way. I've just confirmed that the test now works on mako.

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

FAILED: Continuous integration, rev:383
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/747/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1895/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1895/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/305

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Can this apply to other swipe tests in calendar? also note https://code.launchpad.net/~nskaggs/ubuntu-calendar-app/fix-1359167/+merge/233387 which overhauls the tests (gets rid of emulators.py among other things)

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

FAILED: Continuous integration, rev:383
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/763/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/184/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/321/console

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Merge conflicts now since the overhaul. The python3 support landed in another branch; you'll get it when you merge trunk.

review: Needs Fixing

[lp:~canonical-platform-qa/ubuntu-calendar-app/fix1351319-swipe_to_get_current_day]

384. By Leo Arias on 2014-09-05

Merged with trunk.

385. By Leo Arias on 2014-09-05

Removed the merge file.

[Leo Arias (elopio)]

> Can this apply to other swipe tests in calendar? also note
> https://code.launchpad.net/~nskaggs/ubuntu-calendar-
> app/fix-1359167/+merge/233387 which overhauls the tests (gets rid of
> emulators.py among other things)

I merged. The tests are running now.
This only applies to swipes on the year view. And we do it only on one tests, as far as I know.

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

PASSED: Continuous integration, rev:384
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/769/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/195
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/327

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Thanks for the fix Leo!

review: Approve

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

PASSED: Continuous integration, rev:385
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/770/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/197
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/197/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/328

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

review: Approve (continuous-integration)

=== modified file 'YearView.qml'
--- YearView.qml	2014-08-18 16:48:54 +0000
+++ YearView.qml	2014-09-05 15:28:43 +0000
@@ -100,9 +100,10 @@
 
                 MonthComponent {
                     id: monthComponent
+                    objectName: "monthComponent" + index
                     showEvents: false
                     currentMonth: new Date(yearView.year, index, 1, 0, 0, 0, 0)
-                    
+
                     isYearView: true
                     anchors.fill: parent
                     anchors.margins: units.gu(0.5)

=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py	2014-09-05 01:20:19 +0000
+++ tests/autopilot/calendar_app/__init__.py	2014-09-05 15:28:43 +0000
@@ -16,14 +16,15 @@
 
 """Calendar app autopilot helpers."""
 
+import datetime
 import logging
 from time import sleep
 
 import autopilot.logging
+import ubuntuuitoolkit
+from autopilot import exceptions
 from dateutil import tz
 
-import ubuntuuitoolkit
-
 from calendar_app import data
 
 
@@ -237,6 +238,64 @@
 
     """Autopilot helper for the Year View page."""
 
+    def get_selected_day(self):
+        """Return the selected day.
+
+        :returns: A python datetime.date object with the selected day.
+
+        """
+        current_year_grid = self._get_current_year_grid()
+        for index in range(12):
+            month_component = self._find_month_component(
+                current_year_grid, index)
+            try:
+                today = month_component.select_single(
+                    'QQuickItem', isCurrentMonth=True, isToday=True)
+            except exceptions.StateNotFoundError:
+                continue
+            else:
+                return datetime.date(
+                    current_year_grid.year, index + 1, today.date)
+        else:
+            raise CalendarException(
+                'No day is selected on the currently visible year.')
+
+    def _get_current_year_grid(self):
+        path_view_base = self.select_single(
+            'PathViewBase', objectName='yearPathView')
+        return path_view_base.select_single(
+            ubuntuuitoolkit.QQuickGridView, isCurrentItem=True)
+
+    def _find_month_component(self, grid, index):
+        try:
+            month = self._get_month_component(grid, index)
+        except exceptions.StateNotFoundError:
+            month = self._swipe_to_find_month_component(grid, index)
+        if month is None:
+            raise CalendarException('Month {} not found.'.format(index))
+        else:
+            return month
+
+    def _get_month_component(self, grid, index):
+        return grid.select_single(
+            'MonthComponent',
+            objectName='monthComponent{}'.format(index))
+
+    def _swipe_to_find_month_component(self, grid, index):
+        month = None
+        grid.swipe_to_top()
+        while not grid.atYEnd:
+            try:
+                month = self._get_month_component(grid, index)
+            except exceptions.StateNotFoundError:
+                # FIXME do not call the private _get_containers.
+                # Reported as bug http://pad.lv/1365674
+                # --elopio - 2014-09-04
+                grid.swipe_to_show_more_below(grid._get_containers())
+            else:
+                break
+        return month
+
 
 class WeekView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 

=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
--- tests/autopilot/calendar_app/tests/test_yearview.py	2014-09-04 16:04:37 +0000
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2014-09-05 15:28:43 +0000
@@ -24,7 +24,7 @@
 if sys.version_info < (3,):
     range = xrange
 
-from datetime import datetime
+import datetime
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, NotEquals
 
@@ -41,10 +41,6 @@
         return self.year_view.wait_select_single("QQuickGridView",
                                                  isCurrentItem=True)
 
-    def _get_month_grid(self):
-        current_month = self._get_current_month()
-        return current_month.select_single(objectName="monthGrid")
-
     def _change_year(self, direction, how_many=5):
         current_year = self.year_view.currentYear
 
@@ -55,25 +51,10 @@
                 lambda: self.year_view.currentYear,
                 Eventually(Equals(current_year + (i * direction))))
 
-    def _get_current_month(self):
-        now = datetime.now()
-        _current_month_name = now.strftime("%B")
-
-        year_grid = self._get_year_grid()
-        months = year_grid.select_many("MonthComponent")
-
-        for month in months:
-            _current_month_label = month.select_single(
-                "Label", objectName="monthLabel")
-            if _current_month_name == _current_month_label.text:
-                return month
-
-        return None
-
     def test_current_year_is_default(self):
         """The current year should be the default shown"""
         self.assertThat(self.year_view.currentYear,
-                        Equals(datetime.now().year))
+                        Equals(datetime.datetime.now().year))
 
     def test_selecting_a_month_switch_to_month_view(self):
         """It must be possible to select a month and open the month view."""
@@ -109,22 +90,9 @@
 
     def test_current_day_is_selected(self):
         """The current day must be selected."""
-
-        month_grid = self._get_month_grid()
-
-        # there could actually be two labels with
-        # the current day: one is the current day of the current month,
-        # the other one is the current day of the previous or next month. Both
-        # shouldn't have the standard white color.
-        current_day_labels = month_grid.select_many(
-            "Label", text=str(datetime.now().day))
-
-        # probably better to check the surrounding UbuntuShape object,
-        # upgrade when python-autopilot 1.4 will be available (get_parent).
-        for current_day_label in current_day_labels:
-            color = current_day_label.color
-            label_color = (color[0], color[1], color[2], color[3])
-            self.assertThat(label_color, NotEquals((255, 255, 255, 255)))
+        selected_day = self.year_view.get_selected_day()
+        self.assertEqual(
+            selected_day, datetime.date.today())
 
     def test_show_next_years(self):
         """It must be possible to show next years by swiping the view."""