Merge lp:~carla-sella/ubuntu-calendar-app/current-day-month-year-selected into lp:ubuntu-calendar-app

[Carla Sella]

Autopilot test for Calendar App.

Updating monthview test suite.

[Carla Sella (carla-sella)]

Added test_current_day_month_and_year_is_selected.

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

FAILED: Continuous integration, rev:597
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1095/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2187
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2187/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/566
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/92

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

review: Needs Fixing (continuous-integration)

[lp:~carla-sella/ubuntu-calendar-app/current-day-month-year-selected]

598. By Carla Sella <email address hidden> on 2015-03-01

Fixed datetime errors.

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

PASSED: Continuous integration, rev:598
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1096/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2188
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2188/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/567
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/93

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

A couple tweaks suggested :-)

review: Needs Fixing

[lp:~carla-sella/ubuntu-calendar-app/current-day-month-year-selected]

599. By Carla Sella on 2015-03-03

Fixed get_current_selected_day.

[Carla Sella (carla-sella)]

Nicholas: found a way to fix get_current_selected_day() so that the item returned is one ant the right one.

[Carla Sella (carla-sella)]

Still have to do the "assert the days of the week are correct for the locale (starting with sunday, saturday, monday depending)"

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

FAILED: Continuous integration, rev:599
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1099/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2216
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2216/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/570
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/96

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

review: Needs Fixing (continuous-integration)

[lp:~carla-sella/ubuntu-calendar-app/current-day-month-year-selected]

600. By Carla Sella on 2015-03-05

Added test_days_of_week_are_correct.

[Carla Sella (carla-sella)]

This mp should be complete now.

[lp:~carla-sella/ubuntu-calendar-app/current-day-month-year-selected]

601. By Carla Sella on 2015-03-05

Fixed pep8 and pyflakes.

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

FAILED: Continuous integration, rev:600
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1104/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2257/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/575/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/101/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:601
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1105/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2258
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2258/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/576
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/102

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Minor comments. Feel free to merge once addressed.

review: Approve

[lp:~carla-sella/ubuntu-calendar-app/current-day-month-year-selected]

602. By Carla Sella on 2015-03-06

Adde modifications as Nicholas' notes.

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

PASSED: Continuous integration, rev:602
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1106/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2287
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/577
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/103

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

review: Approve (continuous-integration)

=== modified file 'MonthComponent.qml'
--- MonthComponent.qml	2014-11-29 09:40:53 +0000
+++ MonthComponent.qml	2015-03-06 21:34:27 +0000
@@ -148,6 +148,7 @@
 
             Row{
                 id: dayLabelRow
+                objectName: "dayLabelRow" + index
 
                 property int dayWidth: width / 7;
 
@@ -230,6 +231,7 @@
 
         Label{
             id: weekDay
+            objectName: "weekDay" + index
             width: parent.dayWidth
             property var day :Qt.locale().standaloneDayName(( Qt.locale().firstDayOfWeek + index), Locale.ShortFormat)
             text: isYearView ? day.charAt(0) : day;

=== modified file 'MonthView.qml'
--- MonthView.qml	2015-02-18 19:27:20 +0000
+++ MonthView.qml	2015-03-06 21:34:27 +0000
@@ -50,6 +50,7 @@
         ]
 
         contents: Label {
+            objectName:"monthYearLabel"
             fontSize: "x-large"
             // TRANSLATORS: this is a time formatting string,
             // see http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid expressions.

=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py	2015-02-26 21:11:03 +0000
+++ tests/autopilot/calendar_app/__init__.py	2015-03-06 21:34:27 +0000
@@ -435,10 +435,26 @@
     def get_current_month(self):
         return self.select_single('MonthComponent', isCurrentItem=True)
 
+    @autopilot.logging.log_action(logger.info)
     def get_current_month_name(self):
         month = self.get_current_month()
         return month.currentMonth.datetime.strftime("%B")
 
+    @autopilot.logging.log_action(logger.info)
+    def get_current_selected_day(self):
+        today_days = self.select_many(
+            'MonthComponentDateDelegate', isToday=True)
+        for item in today_days:
+            if item.isCurrentMonth:
+                return item
+
+    @autopilot.logging.log_action(logger.info)
+    def get_day_label(self, day):
+        days_row = self.select_single(
+            'QQuickRow', objectName='dayLabelRow0')
+        return days_row.select_single(
+            'Label', objectName='weekDay{}'.format(day))
+
 
 class DayView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 

=== modified file 'tests/autopilot/calendar_app/tests/test_monthview.py'
--- tests/autopilot/calendar_app/tests/test_monthview.py	2014-09-04 16:04:37 +0000
+++ tests/autopilot/calendar_app/tests/test_monthview.py	2015-03-06 21:34:27 +0000
@@ -22,6 +22,7 @@
 from testtools.matchers import Equals, NotEquals
 
 import math
+import calendar
 
 from calendar_app.tests import CalendarAppTestCase
 
@@ -96,3 +97,42 @@
 
     def test_monthview_go_to_today_prev_year(self):
         self._go_to_today(-12)
+
+    def test_current_day_month_and_year_is_selected(self):
+        """
+        By default, the month view shows the current day, month and year.
+        """
+        now = datetime.now()
+        expected_month_name_year = now.strftime("%B %Y")
+
+        self.assertThat(self.app.main_view.get_month_year(self.month_view),
+                        Equals(expected_month_name_year))
+
+        expected_day = str(int(now.strftime("%d")))
+        selected_day = self.month_view.get_current_selected_day()
+
+        self.assertEquals(
+            selected_day.select_single('Label').text, expected_day)
+
+    def test_days_of_week_are_correct(self):
+        """
+        Verify that days of week are correct for the locale
+        """
+        first_week_day = calendar.day_abbr[calendar.firstweekday()]
+        day_0_label = self.month_view.get_day_label(0).day
+        day_1_label = self.month_view.get_day_label(1).day
+        day_2_label = self.month_view.get_day_label(2).day
+        day_3_label = self.month_view.get_day_label(3).day
+        day_4_label = self.month_view.get_day_label(4).day
+        day_5_label = self.month_view.get_day_label(5).day
+        day_6_label = self.month_view.get_day_label(6).day
+
+        self.assertEquals(day_0_label, first_week_day)
+
+        self.assertEquals(calendar.day_abbr[calendar.MONDAY], day_0_label)
+        self.assertEquals(calendar.day_abbr[calendar.TUESDAY], day_1_label)
+        self.assertEquals(calendar.day_abbr[calendar.WEDNESDAY], day_2_label)
+        self.assertEquals(calendar.day_abbr[calendar.THURSDAY], day_3_label)
+        self.assertEquals(calendar.day_abbr[calendar.FRIDAY], day_4_label)
+        self.assertEquals(calendar.day_abbr[calendar.SATURDAY], day_5_label)
+        self.assertEquals(calendar.day_abbr[calendar.SUNDAY], day_6_label)