Merge lp:~nskaggs/ubuntu-calendar-app/fix-yearview into lp:ubuntu-calendar-app

[Nicholas Skaggs]

Resolves Bug #1351663

Resolves Bug #1351663

[lp:~nskaggs/ubuntu-calendar-app/fix-yearview]

404. By Nicholas Skaggs on 2014-09-30

remove locale setting

405. By Nicholas Skaggs on 2014-09-30

fix flake8

Unmerged revisions

=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py	2014-09-23 15:09:07 +0000
+++ tests/autopilot/calendar_app/__init__.py	2014-09-29 23:23:54 +0000
@@ -245,24 +245,56 @@
     def get_selected_day(self):
         """Return the selected day.
 
-        :returns: A python datetime.date object with the selected day.
+        :returns: A today calendar object
 
         """
-        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:
+        month = self.get_selected_month()
+        try:
+            today = month.select_single(
+                'QQuickItem', isCurrentMonth=True, isToday=True)
+        except exceptions.StateNotFoundError:
             raise CalendarException(
-                'No day is selected on the currently visible year.')
+            'No day is selected on the currently visible year.')
+        else:
+            return today
+
+    def get_selected_month(self):
+        """Return the selected month.
+
+        :returns: A month calendar object
+
+        """
+        current_year_grid = self._get_current_year_grid()
+        return self._get_month_component(current_year_grid, current_year_grid.scrollMonth)
+
+    def get_day(self, monthNumber, dayNumber):
+        """Return the day object.
+        :param monthNumber the numeric month to get
+        :param dayNumber the numeric day to get
+        :returns: A month calendar object
+
+        """
+        month = self.get_month(monthNumber)
+
+        try:
+            day = month.select_single('QQuickItem', date=dayNumber)
+        except exceptions.StateNotFoundError:
+            raise CalendarException('%s not found in %s' % (
+                dayNumber, monthNumber))
+        else:
+            return today
+
+
+    def get_month(self, monthNumber):
+        """Return the month object.
+        :param monthNumber the numeric month to get
+        :returns: A month calendar object
+
+        """
+        current_year_grid = self._get_current_year_grid()
+        # the monthcomponents start at zero, thus subtract 1 to get month
+        return self._find_month_component(current_year_grid, monthNumber - 1)
+
 
     def _get_current_year_grid(self):
         path_view_base = self.select_single(
@@ -308,7 +340,14 @@
 
 class MonthView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
-    """Autopilot helper for the Year View page."""
+    """Autopilot helper for the Month View page."""
+
+    def get_current_month(self):
+        return self.select_single('MonthComponent', isCurrentItem=True)
+
+    def get_current_month_name(self):
+        return self.get_current_month().select_single('Label',
+            objectName='monthLabel').text
 
 
 class DayView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):

=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
--- tests/autopilot/calendar_app/tests/test_yearview.py	2014-09-29 23:23:54 +0000
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2014-09-29 23:23:54 +0000
@@ -52,72 +52,38 @@
                 lambda: self.year_view.currentYear,
                 Eventually(Equals(current_year + (i * direction))))
 
-    def _flick_view_up(self, view):
-        """Swipe the given view to bottom to up"""
-
-        start = (0.15) % 1
-        stop = (-0.15) % 1
-
-        x_line = view.globalRect[0] + view.globalRect[2] / 2
-        y_start = view.globalRect[1] + view.globalRect[3] * start
-        y_stop = view.globalRect[1] + view.globalRect[3] * stop
-
-        self.pointing_device.drag(x_line, y_start, x_line, y_stop)
-
-    def _flick_view(self, view):
-        """Swipe the given view to bottom to up"""
-        counter = 0
-        # try up to 3 times to swipe
-        while counter < 3:
-            self._flick_view_up(view)
-            sleep(1)
-            counter += 1
-
-    def test_current_year_is_default(self):
-        """The current year should be the default shown"""
-        self.assertThat(self.year_view.currentYear,
-                        Equals(datetime.datetime.now().year))
+    def test_default_view(self):
+        """The current year should be the default shown
+        and the current month should be visible. In addition
+        the current day should be selected"""
+        date = datetime.datetime.now()
+        self.assertEqual(self.year_view.currentYear, date.year)
+        self.assertEqual(self.year_view.get_selected_month().currentMonth.datetime.month, date.month)
+        self.assertEqual(self.year_view.get_selected_day().date, date.day)
 
     def test_selecting_a_month_switch_to_month_view(self):
         """It must be possible to select a month and open the month view."""
 
-        # TODO: the component indexed at 1 is the one currently displayed,
-        # investigate a way to validate this assumption visually.
-        year_grid = self._get_year_grid()
-        months = year_grid.select_many("MonthComponent")
-        months.sort(key=lambda month: month.currentMonth)
-
-        # Swiping view vertically enought time to make sure January is visible
-        self._flick_view(self.year_view)
-
-        february = months[1]
-        expected_month_name = self.app.main_view.get_month_name(february)
-        expected_year = self.app.main_view.get_year(february)
-
-        self.app.pointing_device.click_object(february)
-
-        self.assertThat(
-            self.app.main_view.get_month_view, Eventually(NotEquals(None)))
-
+        # click the select month
+        month = self.year_view.get_selected_month()
+        expected_year = self.year_view.currentYear
+        expected_month = month.currentMonth.datetime.month
+        expected_month_name = month.select_single('Label',
+            objectName = 'monthLabel').text
+
+        self.app.pointing_device.click_object(month)
+
+        # confirm month transition
         month_view = self.app.main_view.get_month_view()
         self.assertThat(month_view.visible, Eventually(Equals(True)))
 
-        selected_month = month_view.select_single("MonthComponent",
-                                                  isCurrentItem=True)
-
-        self.assertThat(selected_month, NotEquals(None))
-
-        self.assertThat(self.app.main_view.get_year(selected_month),
-                        Equals(expected_year))
-
-        self.assertThat(self.app.main_view.get_month_name(selected_month),
-                        Equals(expected_month_name))
-
-    def test_current_day_is_selected(self):
-        """The current day must be selected."""
-        selected_day = self.year_view.get_selected_day()
-        self.assertEqual(
-            selected_day, datetime.date.today())
+        self.assertEquals(month_view.currentMonth.datetime.year,
+            expected_year)
+
+        self.assertEquals(month_view.currentMonth.datetime.month,
+            expected_month)
+
+        self.assertEquals(month_view.get_current_month_name(), expected_month_name)
 
     def test_show_next_years(self):
         """It must be possible to show next years by swiping the view."""