Merge lp:~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed into lp:ubuntu-calendar-app

[Carla Sella]

Autopilot tests for Calendar App.

Completing test_default_view in test_weekview.py.

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

PASSED: Continuous integration, rev:616
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1117/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2446
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2446/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/588
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/114

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

review: Approve (continuous-integration)

[Carla Sella (carla-sella)]

This can be merged if ok as checking if current day is highlighted has been completed.

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

FAILED: Continuous integration, rev:616
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed/+merge/254495/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1118/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2447
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2447/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/589
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/115

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:618
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed/+merge/254495/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1119/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2448/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/590/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/116/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:619
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed/+merge/254495/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1120/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2449
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2449/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/591
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/117

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:621
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed/+merge/254495/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1121/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2476
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2476/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/592
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/118

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:622
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1134/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2518/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/605/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/131/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:623
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1136/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2520
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2520/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/607
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/133

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:624
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1137/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2537
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2537/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/608
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/134

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:625
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1138/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2538
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2538/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/609
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/135

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:626
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1139/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2546
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2546/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/610
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/136

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

looks good to me
Thanks :)

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/485/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2549/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/270/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/57/console

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Text conflict in tests/autopilot/calendar_app/__init__.py
Text conflict in tests/autopilot/calendar_app/tests/test_dayview.py
2 conflicts encountered.
bzr: ERROR: Conflicts from merge

Should be a simple fix.

review: Needs Fixing

[lp:~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed]

627. By Carla Sella on 2015-04-10

Fixed two text conflicts.

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

FAILED: Continuous integration, rev:627
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1140/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2552
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2552/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/611
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/137

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

review: Needs Fixing (continuous-integration)

[lp:~carla-sella/ubuntu-calendar-app/weekview-testing-stubs-completed]

628. By Carla Sella on 2015-04-10

Fixed wrong function name.

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

PASSED: Continuous integration, rev:628
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1141/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2553
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2553/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/612
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/138

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks great, thanks Carla!

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py	2015-04-04 15:59:15 +0000
+++ tests/autopilot/calendar_app/__init__.py	2015-04-10 19:34:31 +0000
@@ -219,7 +219,7 @@
 
     def safe_swipe_view(self, direction, view, date):
         """
-        direction: direction to swip
+        direction: direction to swipe
         view: the view you are swiping against
         date: a function object of the view
         """
@@ -276,6 +276,11 @@
         local = utc.astimezone(tz.tzlocal())
         return local
 
+    @autopilot.logging.log_action(logger.info)
+    def get_header(self):
+        return self.wait_select_single(
+            "AppHeader", objectName="MainView_Header")
+
     def press_header_todaybutton(self):
         header = self.get_header()
         header.click_action_button('todaybutton')
@@ -432,6 +437,17 @@
                 sorteddays.insert(0, day)
         return sorteddays
 
+    @autopilot.logging.log_action(logger.info)
+    def get_current_headerdatecomponent(self, now):
+        today = datetime.date(now.year, now.month, now.day)
+        header_date_components = self.select_many('HeaderDateComponent')
+        for header in header_date_components:
+            header_date = datetime.date(header.date.datetime.year,
+                                        header.date.datetime.month,
+                                        header.date.datetime.day)
+            if header_date == today:
+                return header
+
 
 class MonthView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
@@ -651,12 +667,18 @@
             'TimeLineBaseComponent', objectName='DayComponent-0').scrollHour
 
     @autopilot.logging.log_action(logger.info)
+    def get_weeknumber(self):
+        return self._get_timeline_base().weekNumber
+
     def check_loading_spinnger(self):
         timelinebasecomponent = self.get_active_timelinebasecomponent()
         loading_spinner = timelinebasecomponent.wait_select_single(
             "ActivityIndicator")
         loading_spinner.running.wait_for(False)
 
+    def _get_timeline_base(self):
+        return self.select_single("TimeLineBaseComponent", isActive=True)
+
     @autopilot.logging.log_action(logger.info)
     def get_active_timelinebasecomponent(self):
         timelinebase_components = self.select_many(("TimeLineBaseComponent"))

=== modified file 'tests/autopilot/calendar_app/tests/test_monthview.py'
--- tests/autopilot/calendar_app/tests/test_monthview.py	2015-03-06 21:33:24 +0000
+++ tests/autopilot/calendar_app/tests/test_monthview.py	2015-04-10 19:34:31 +0000
@@ -136,3 +136,12 @@
         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)
+
+    def test_today_button(self):
+        """ Verify that today button takes to today in month view """
+        self._go_to_today(1)
+
+        header = self.app.main_view.get_header()
+        header.click_action_button('todaybutton')
+
+        self._assert_today()

=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
--- tests/autopilot/calendar_app/tests/test_weekview.py	2015-04-02 15:24:49 +0000
+++ tests/autopilot/calendar_app/tests/test_weekview.py	2015-04-10 19:34:31 +0000
@@ -25,8 +25,9 @@
     range = xrange
 
 import datetime
+from datetime import timedelta
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals
+from testtools.matchers import Equals, NotEquals
 from random import randint, randrange
 
 from calendar_app.tests import CalendarAppTestCase
@@ -61,30 +62,87 @@
         self.assertThat(self.app.main_view.get_month_year(self.week_view),
                         Equals(expected_month_name_year))
 
-        # TODO: check current day is highlighted
-
-    # These testing stubs need completed
-    # def test_scroll_week_must_scroll_within_week(self):
-        # """Scrolling inside the timeline should scroll the weekdays"""
-        # pass
-
-    # def test_change_week_across_month(self):
-        # """Changing week across months should update the month"""
-        # pass
-
-    # def test_change_week_across_year(self):
-        # """Changing week across years should update the year"""
-        # pass
-
-    # def test_month_to_week(self):
-        # """Changing from a month to weekview should
-        # start weekview on the first week of the month"""
-        # pass
-
-    # def test_day_to_week(self):
-        # """Changing from a day to weekview should
-        # start weekview on the same week as the day"""
-        # pass
+        # check current day is highlighted
+        header_date = self.week_view.get_current_headerdatecomponent(now)
+        self.assertEquals(header_date.dayColor[0], 221)
+        self.assertEquals(header_date.dayColor[1], 72)
+        self.assertEquals(header_date.dayColor[2], 20)
+        self.assertEquals(header_date.dayColor[3], 255)
+
+    def test_scroll_week_must_scroll_weekdays(self):
+        """Scrolling inside the timeline should scroll the weekdays"""
+        before_days = self.week_view.get_days_of_week()
+
+        direction = 1
+        no_of_swipes = 3
+        for x in range(no_of_swipes):
+            self.app.main_view.swipe_view(direction, self.week_view)
+
+        after_days = self.week_view.get_days_of_week()
+
+        self.assertThat(before_days[0], NotEquals(after_days[0]))
+        self.assertThat(before_days[1], NotEquals(after_days[1]))
+        self.assertThat(before_days[2], NotEquals(after_days[2]))
+        self.assertThat(before_days[3], NotEquals(after_days[3]))
+        self.assertThat(before_days[4], NotEquals(after_days[4]))
+        self.assertThat(before_days[5], NotEquals(after_days[5]))
+        self.assertThat(before_days[6], NotEquals(after_days[6]))
+
+    def test_change_week_across_months(self):
+        """Changing week across months should update the month"""
+        header = self.app.main_view.get_header()
+        before_month = self.app.main_view.get_month_year(header)
+        self.week_view.change_week(4)
+
+        after_month = self.app.main_view.get_month_year(header)
+
+        self.assertThat(before_month, NotEquals(after_month))
+
+    def test_change_week_across_year(self):
+        """Changing week across years should update the year"""
+        header = self.app.main_view.get_header()
+        month_year_label = self.app.main_view.get_month_year(header)
+        before_year = month_year_label[-4:]
+
+        current_week = self.week_view.get_current_weeknumber()
+        direction = 1
+        no_of_swipes = ((55 - current_week) * 3)  # 3 swipes to change week
+        for x in range(1, no_of_swipes):
+            self.app.main_view.swipe_view(direction, self.week_view)
+
+        month_year_label = self.app.main_view.get_month_year(header)
+        after_year = month_year_label[-4:]
+
+        self.assertThat(before_year, NotEquals(after_year))
+
+    def test_month_to_week(self):
+        """Changing from a month to weekview should
+         start weekview on the first day of the week"""
+        self.app.main_view.go_to_month_view()
+        self.app.main_view.go_to_week_view()
+
+        cal_week_firstday_ts = self.app.main_view.get_week_view().firstDay
+        cal_week_firstday = datetime.date(cal_week_firstday_ts.datetime.year,
+                                          cal_week_firstday_ts.datetime.month,
+                                          cal_week_firstday_ts.datetime.day)
+
+        now = datetime.datetime.now()
+        delta = datetime.datetime.weekday(now)
+        first_dow = now - timedelta(delta)
+        expected_first_dow = datetime.date(first_dow.year, first_dow.month,
+                                           first_dow.day)
+
+        self.assertEquals(cal_week_firstday, expected_first_dow)
+
+    def test_day_to_week(self):
+        """Changing from a day to weekview should
+           start weekview on the same week as the day"""
+        day_view = self.app.main_view.go_to_day_view()
+        day_week_no = day_view.get_weeknumber()
+        week_view = self.app.main_view.go_to_week_view()
+        week_week_no = week_view.get_current_weeknumber()
+
+        self.assertEquals(day_week_no, week_week_no)
 
     def test_change_week(self):
         """It must be possible to change weeks by swiping the timeline"""

=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
--- tests/autopilot/calendar_app/tests/test_yearview.py	2014-10-02 12:38:28 +0000
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2015-04-10 19:34:31 +0000
@@ -94,3 +94,13 @@
     def test_show_previous_years(self):
         """It must be possible to show previous years by swiping the view."""
         self._change_year(-1)
+
+    def test_today_button(self):
+        """ Verify that today button takes to today in month view """
+        date = datetime.datetime.now()
+        self._change_year(1)
+
+        header = self.app.main_view.get_header()
+        header.click_action_button('todaybutton')
+
+        self.assertEqual(self.year_view.get_selected_day().date, date.day)