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

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

381. By Leo Arias on 2014-09-04

Merged with trunk.

382. By Leo Arias on 2014-09-04

Multiple fixes.

383. By Leo Arias on 2014-09-04

Fixed the call to swipe.

384. By Leo Arias on 2014-09-05

Merged with trunk.

385. By Leo Arias on 2014-09-05

Removed the merge file.

Unmerged revisions

=== modified file 'YearView.qml'
--- YearView.qml	2014-07-01 16:54:23 +0000
+++ YearView.qml	2014-08-03 03:40:40 +0000
@@ -83,9 +83,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/emulators.py'
--- tests/autopilot/calendar_app/emulators.py	2014-07-31 19:39:04 +0000
+++ tests/autopilot/calendar_app/emulators.py	2014-08-03 03:40:40 +0000
@@ -16,19 +16,15 @@
 
 """Calendar app autopilot emulators."""
 
+import datetime
 import logging
 from time import sleep
 
 import autopilot.logging
+import ubuntuuitoolkit
+from autopilot import exceptions
 from dateutil import tz
 
-import ubuntuuitoolkit
-from ubuntuuitoolkit._custom_proxy_objects import _flickable
-from ubuntuuitoolkit import (
-    emulators as toolkit_emulators,
-    pickers
-)
-
 from calendar_app import data
 
 
@@ -40,14 +36,7 @@
     """Exception raised when there are problems with the Calendar."""
 
 
-# for now we are borrowing the textfield helper for the textarea
-# once the toolkit has a textarea helper this should be removed
-# https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1327354
-class TextArea(toolkit_emulators.TextField):
-    """Autopilot helper for the TextArea component."""
-
-
-class MainView(toolkit_emulators.MainView):
+class MainView(ubuntuuitoolkit.MainView):
 
     """An emulator that makes it easy to interact with the calendar-app."""
 
@@ -127,7 +116,7 @@
         else:
             mode_value = 'Years|Months|Days'
         picker = self.wait_select_single(
-            pickers.DatePicker, mode=mode_value, visible=True)
+            ubuntuuitoolkit.pickers.DatePicker, mode=mode_value, visible=True)
         if mode_value == 'Hours|Minutes':
             picker.pick_time(value)
         else:
@@ -221,22 +210,77 @@
         return local
 
 
-class YearView(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+class YearView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot helper for the Year View page."""
 
-
-class WeekView(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+    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', 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(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, index):
+        return self.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(index)
+            except exceptions.StateNotFoundError:
+                grid.swipe_to_show_more_below()
+            else:
+                break
+        return month
+
+
+class WeekView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot helper for the Week View page."""
 
 
-class MonthView(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+class MonthView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot helper for the Year View page."""
 
 
-class DayView(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+class DayView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot helper for the Day View page."""
 
@@ -369,7 +413,7 @@
         return day_header
 
 
-class EventBubble(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+class EventBubble(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopiot helper for the Event Bubble items."""
 
@@ -410,7 +454,7 @@
 
 # override toolkit helper to
 # workaround bug https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1343916
-class QQuickFlickable(_flickable.QQuickFlickable):
+class QQuickFlickable(ubuntuuitoolkit.QQuickFlickable):
 
     def _slow_drag(self, start_x, stop_x, start_y, stop_y):
         rate = (self.flickDeceleration + 250) / 350
@@ -418,7 +462,7 @@
         self.pointing_device.click()
 
 
-class NewEvent(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+class NewEvent(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot helper for the New Event page."""
 
@@ -478,7 +522,8 @@
         self._ensure_visible_and_write(description_text_area, value)
 
     def _get_description_text_area(self):
-        return self.select_single(TextArea, objectName='eventDescriptionInput')
+        return self.select_single(
+            ubuntuuitoolkit.TextArea, objectName='eventDescriptionInput')
 
     def _fill_location(self, value):
         self._ensure_entry_field_visible_and_write('eventLocationInput', value)
@@ -532,12 +577,12 @@
         self.pointing_device.click_object(save_button)
 
 
-class NewEventEntryField(toolkit_emulators.TextField):
+class NewEventEntryField(ubuntuuitoolkit.TextField):
 
     """Autopilot helper for the NewEventEntryField component."""
 
 
-class EventDetails(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+class EventDetails(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot helper for the Event Details page."""
 
@@ -593,7 +638,8 @@
         return guests
 
 
-class DeleteConfirmationDialog(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+class DeleteConfirmationDialog(
+        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot helper for the Delete Confirmation dialog."""
 

=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
--- tests/autopilot/calendar_app/tests/__init__.py	2014-06-26 18:10:28 +0000
+++ tests/autopilot/calendar_app/tests/__init__.py	2014-08-03 03:40:40 +0000
@@ -28,9 +28,9 @@
 from autopilot.testcase import AutopilotTestCase
 from autopilot import logging as autopilot_logging
 
+import ubuntuuitoolkit
 from ubuntuuitoolkit import (
     base,
-    emulators as toolkit_emulators,
     fixture_setup as toolkit_fixtures
 )
 
@@ -83,7 +83,7 @@
             base.get_qmlscene_launch_command(),
             self.local_location_qml,
             app_type='qt',
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
     @autopilot_logging.log_action(logger.info)
     def launch_test_installed(self):
@@ -91,13 +91,13 @@
             base.get_qmlscene_launch_command(),
             self.installed_location_qml,
             app_type='qt',
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
     @autopilot_logging.log_action(logger.info)
     def launch_test_click(self):
         return self.launch_click_package(
             "com.ubuntu.calendar",
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
     def _copy_xauthority_file(self, directory):
         """ Copy .Xauthority file to directory, if it exists in /home

=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
--- tests/autopilot/calendar_app/tests/test_yearview.py	2014-07-01 20:06:00 +0000
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2014-08-03 03:40:40 +0000
@@ -43,10 +43,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
 
@@ -57,21 +53,6 @@
                 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,
@@ -111,22 +92,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."""