Merge lp:~nskaggs/ubuntu-calendar-app/fix-infloop-ap-trunk into lp:ubuntu-calendar-app

[Nicholas Skaggs]

Fix inifinite loop in weekview tests; add testing stubs

Fix inifinite loop in weekview tests; add testing stubs

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

FAILED: Continuous integration, rev:594
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1088/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2128/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/85/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:595
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1089/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2129
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/86

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:596
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1090/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2131
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/87

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

review: Approve (continuous-integration)

[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/464/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2134/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/249/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/36/console

review: Needs Fixing (continuous-integration)

[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/465/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2144
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/250
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/37

review: Needs Fixing (continuous-integration)

[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/1093/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2146
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/564
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/90

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

review: Needs Fixing (continuous-integration)

[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/466/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2147
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2147/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/251
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/38

review: Needs Fixing (continuous-integration)

[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/467/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2152
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/252
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/39

review: Needs Fixing (continuous-integration)

[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/468/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2159
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2159/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/253
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/40

review: Needs Fixing (continuous-integration)

[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/469/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2168
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2168/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/254
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/41

review: Needs Fixing (continuous-integration)

[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/470/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2169
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2169/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/255
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/42

review: Needs Fixing (continuous-integration)

[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/471/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2172
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2172/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/256
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/43

review: Needs Fixing (continuous-integration)

[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/472/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2202
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2202/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/257
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/44

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:596
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1097/
Executed test runs:
    None: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2209/console
    None: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/568/console
    None: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/94/console

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

review: Needs Fixing (continuous-integration)

[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/1098/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2210
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2210/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/569
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/95

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

review: Needs Fixing (continuous-integration)

[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/473/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2239/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/258/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/45/console

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:598
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/1100/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2240/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/571/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/97/console

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

review: Needs Fixing (continuous-integration)

[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/474/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2241
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-autolanding/259
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-autolanding/46

review: Needs Fixing (continuous-integration)

[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/1101/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2243
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/572
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-vivid-amd64-ci/98

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

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

So looks like trunk is more or less fixed. The tests will fail during the crossover period for days; see

http://91.189.93.70:8080/job/generic-mediumtests-utopic/2243/artifact/calendar_app.tests.test_new_event.NewEventTestCase.test_add_new_event_with_default_values.ogv

This needs to be fixed by setting the date and time properly

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

review: Approve (continuous-integration)

=== modified file 'TimeLineBaseComponent.qml'
--- TimeLineBaseComponent.qml	2014-12-18 19:44:51 +0000
+++ TimeLineBaseComponent.qml	2015-03-04 23:14:07 +0000
@@ -31,6 +31,7 @@
     property var keyboardEventProvider;
 
     property date startDay: DateExt.today();
+    property int weekNumber: startDay.weekNumber();
     property bool isActive: false
     property alias contentY: timeLineView.contentY
     property alias contentInteractive: timeLineView.interactive

=== modified file 'TimeLineHeader.qml'
--- TimeLineHeader.qml	2015-02-18 19:11:05 +0000
+++ TimeLineHeader.qml	2015-03-04 23:14:07 +0000
@@ -44,7 +44,8 @@
 
             Label{
                 id: weekNumLabel
-                text: i18n.tr("W") + root.startDay.weekNumber()
+                objectName: "weeknumber"
+                text: i18n.tr("W") + root.weekNumber
                 fontSize: "small"
                 height: units.gu(5)
                 width: parent.width
@@ -144,7 +145,7 @@
 
                 TimeLineHeaderComponent{
                     objectName: "timelineHeader"
-                    startDay: headerRoot.startDay 
+                    startDay: headerRoot.startDay
                     type: ViewType.ViewTypeWeek
                     width: parent.width
                     height: units.gu(5)

=== modified file 'WeekView.qml'
--- WeekView.qml	2015-02-18 19:27:20 +0000
+++ WeekView.qml	2015-03-04 23:14:07 +0000
@@ -65,7 +65,7 @@
 
     PathViewBase{
         id: weekViewPath
-        objectName: "weekViewPath"
+        objectName: "weekviewpathbase"
 
         anchors.fill: parent
 

=== modified file 'tests/autopilot/calendar_app/__init__.py'
--- tests/autopilot/calendar_app/__init__.py	2015-02-26 18:26:10 +0000
+++ tests/autopilot/calendar_app/__init__.py	2015-03-04 23:14:07 +0000
@@ -24,6 +24,7 @@
 import ubuntuuitoolkit
 from autopilot import exceptions
 from dateutil import tz
+import math
 from testtools.matchers import GreaterThan
 
 from calendar_app import data
@@ -256,7 +257,7 @@
         """Swipe the given view to up or down.
 
         Args:
-            direction:
+        direction:
         """
 
         start = (-direction * y_pad) % 1
@@ -374,6 +375,58 @@
 
     """Autopilot helper for the Week View page."""
 
+    def get_current_weeknumber(self):
+        return self._get_timeline_base().weekNumber
+
+    def _get_timeline_base(self):
+        return self.select_single("TimeLineBaseComponent", isActive=True)
+
+    def _get_timeline_header(self):
+        return self._get_timeline_base().select_single(objectName="viewHeader")
+
+    def _get_date_label_headers(self):
+        return self._get_timeline_header().select_many("Label",
+                                                       objectName="dateLabel")
+
+    def _get_pathview_base(self):
+        # return self.select_single('PathViewBase',
+        #                           objectname='weekviewpathbase')
+        # why do you hate me autopilot? ^^
+        return self.select_single('PathViewBase')
+
+    def change_week(self, delta):
+        direction = int(math.copysign(1, delta))
+        main_view = self.get_root_instance().select_single(MainView)
+
+        pathview_base = self._get_pathview_base()
+
+        for _ in range(abs(delta)):
+            timeline_header = self._get_timeline_header()
+
+            main_view.swipe_view(direction, timeline_header)
+            # prevent timing issues with swiping
+            pathview_base.moving.wait_for(False)
+
+    def get_days_of_week(self):
+        # sort based on text value of the day
+        days = sorted(self._get_date_label_headers(),
+                      key=lambda label: label.text)
+        days = [int(item.text) for item in days]
+
+        # resort so beginning of next month comes after the end
+        # need to support overlapping months 28,30,31 -> 1
+        sorteddays = []
+        for day in days:
+            inserted = 0
+            for index, sortday in enumerate(sorteddays):
+                if day - sorteddays[index] == 1:
+                    sorteddays.insert(index + 1, day)
+                    inserted = 1
+                    break
+            if inserted == 0:
+                sorteddays.insert(0, day)
+        return sorteddays
+
 
 class MonthView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
@@ -445,6 +498,9 @@
 
         raise CalendarException('No event found for %s' % event_name)
 
+    def get_selected_day(self):
+        return self._get_day_component()
+
     def _get_day_component(self, day='selected'):
         """Get the selected day component.
            This method considers 'yesterday' to be the selected day - 1

=== modified file 'tests/autopilot/calendar_app/tests/test_agendaview.py'
--- tests/autopilot/calendar_app/tests/test_agendaview.py	2015-02-25 21:23:53 +0000
+++ tests/autopilot/calendar_app/tests/test_agendaview.py	2015-03-04 23:14:07 +0000
@@ -22,9 +22,6 @@
 
 import logging
 
-from autopilot.matchers import Eventually
-from testtools.matchers import Equals
-
 from calendar_app.tests import CalendarAppTestCaseWithVcard
 
 from calendar_app import data
@@ -48,14 +45,8 @@
         event_details_page = self.app.main_view.get_event_details()
         event_details = event_details_page.get_event_information()
 
-        self.assertThat(
-            event_details.name, Eventually(Equals(test_event.name)))
-        self.assertThat(
-            event_details.description,
-            Eventually(Equals(test_event.description)))
-        self.assertThat(
-            event_details.calendar, Eventually(Equals(test_event.calendar)))
-        self.assertThat(
-            event_details.location, Eventually(Equals(test_event.location)))
-        self.assertThat(
-            event_details.guests, Eventually(Equals(test_event.guests)))
+        self.assertEquals(event_details.name, test_event.name)
+        self.assertEquals(event_details.description, test_event.description)
+        self.assertEquals(event_details.calendar, test_event.calendar)
+        self.assertEquals(event_details.location, test_event.location)
+        self.assertEquals(event_details.guests, test_event.guests)

=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
--- tests/autopilot/calendar_app/tests/test_weekview.py	2014-12-18 19:44:51 +0000
+++ tests/autopilot/calendar_app/tests/test_weekview.py	2015-03-04 23:14:07 +0000
@@ -26,7 +26,8 @@
 
 import datetime
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, NotEquals
+from testtools.matchers import Equals
+from random import randint, randrange
 
 from calendar_app.tests import CalendarAppTestCase
 import logging
@@ -40,150 +41,69 @@
         super(TestWeekView, self).setUp()
         self.week_view = self.app.main_view.go_to_week_view()
 
-    def _change_week(self, direction):
-        first_dow = self._get_first_day_of_week()
-
-        # prevent timing issues with swiping
-        old_day = self.app.main_view.to_local_date(
-            self.week_view.dayStart.datetime)
-
-        pathView = self.week_view.select_single("PathViewBase")
-        timeLineBase = pathView.select_single("TimeLineBaseComponent",
-                                              isActive=True)
-        timelineview = timeLineBase.select_single(objectName="timelineview")
-        val = 0
-        if direction == 1:
-            val = timelineview.contentWidth - timelineview.width
-
-        while timelineview.contentX != val:
-            self.app.main_view.swipe_view(direction, self.week_view)
-
-        self.app.main_view.swipe_view(direction, self.week_view)
-        self.assertThat(lambda:
-                        self.app.main_view.to_local_date(
-                            self.week_view.dayStart.datetime),
-                        Eventually(NotEquals(old_day)))
-
-        new_day_start = self.app.main_view.to_local_date(
-            self.week_view.dayStart.datetime)
-
-        expected_day_start = first_dow + datetime.timedelta(
-            days=(7 * direction))
-
-        self.assertThat(new_day_start.day, Equals(expected_day_start.day))
-
-    def _get_days_of_week(self):
-        # sort based on text value of the day
-        days = sorted(self._get_date_label_headers(),
-                      key=lambda label: label.text)
-        days = [int(item.text) for item in days]
-
-        # resort so beginning of next month comes after the end
-        # need to support overlapping months 28,30,31 -> 1
-        sorteddays = []
-        for day in days:
-            inserted = 0
-            for index, sortday in enumerate(sorteddays):
-                if day - sorteddays[index] == 1:
-                    sorteddays.insert(index + 1, day)
-                    inserted = 1
-                    break
-            if inserted == 0:
-                sorteddays.insert(0, day)
-        return sorteddays
-
-    def _get_date_label_headers(self):
-        pathView = self.week_view.select_single("PathViewBase")
-        timeLineBase = pathView.select_single("TimeLineBaseComponent",
-                                              isActive=True)
-        viewHeader = timeLineBase.select_single(objectName="viewHeader")
-        timeLineHeader = viewHeader.select_single(objectName="timelineHeader")
-        dateLabels = timeLineHeader.select_many("Label",
-                                                objectName="dateLabel")
-        return dateLabels
-
-    def _get_first_day_of_week(self):
-        date = self.app.main_view.to_local_date(
-            self.week_view.dayStart.datetime)
-        firstDay = self.app.main_view.to_local_date(
-            self.week_view.firstDay.datetime)
-
-        # sunday
-        if firstDay.weekday() == 6:
-            logger.debug("Locale has Sunday as first day of week")
-            weekday = date.weekday()
-            diff = datetime.timedelta(days=weekday + 1)
-        # saturday
-        elif firstDay.weekday() == 5:
-            logger.debug("Locale has Saturday as first day of week")
-            weekday = date.weekday()
-            diff = datetime.timedelta(days=weekday + 2)
-        # monday
-        else:
-            logger.debug("Locale has Monday as first day of week")
-            weekday = date.weekday()
-            diff = datetime.timedelta(days=weekday)
-
-        # set the start of week
-        if date.day != firstDay.day:
-            day_start = date - diff
-            logger.debug("Setting day_start to %s" % firstDay.day)
-        else:
-            day_start = date
-            logger.debug("Using today as day_start %s" % date)
-        return day_start
-
-    def test_current_month_and_year_is_selected(self):
-        """By default, the week view shows the current month and year."""
+    def _assert_week_delta(self, original_week, delta):
+        current_week = self.week_view.get_current_weeknumber()
+        expected_week = original_week + delta
+
+        if expected_week < 0:
+            expected_week += 53
+        elif expected_week > 52:
+            expected_week -= 53
+
+        self.assertEquals(current_week, expected_week)
+
+    def test_default_view(self):
+        """By default, the week view shows the current week.
+        It also displays the current year and month"""
 
         now = datetime.datetime.now()
-
         expected_month_name_year = now.strftime("%B %Y")
-
         self.assertThat(self.app.main_view.get_month_year(self.week_view),
                         Equals(expected_month_name_year))
 
-    def test_current_week_is_selected(self):
-        """By default, the week view shows the current week."""
-
-        now = datetime.datetime.now()
-        days = self._get_days_of_week()
-        day_headers = self._get_date_label_headers()
-
-        first_dow = self._get_first_day_of_week()
-
-        for i in range(7):
-            current_day = days[i]
-            expected_day = (first_dow + datetime.timedelta(days=i)).day
-
-            self.assertThat(current_day, Equals(expected_day))
-
-            # current day is highlighted in white.
-            # days returned by AP are out of order, so check header and today
-            color = day_headers[i].color
-            label_color = (color[0], color[1], color[2], color[3])
-            if label_color == (255, 255, 255, 255):
-                self.assertThat(int(day_headers[i].text), Equals(now.day))
-
-    def test_show_next_weeks(self):
-        """It must be possible to show next weeks by swiping the view."""
-        for i in range(6):
-            self._change_week(1)
-
-    def test_show_previous_weeks(self):
-        """It must be possible to show previous weeks by swiping the view."""
-        for i in range(6):
-            self._change_week(-1)
+        # 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
+
+    def test_change_week(self):
+        """It must be possible to change weeks by swiping the timeline"""
+        weeks = randint(1, 6)
+        direction = randrange(-1, 1, 2)
+        delta = weeks * direction
+        original_week = self.week_view.get_current_weeknumber()
+
+        self.week_view.change_week(delta)
+        self._assert_week_delta(original_week, delta)
 
     def test_selecting_a_day_switches_to_day_view(self):
         """It must be possible to show a single day by clicking on it."""
-        first_day_date = self.week_view.firstDay
-        # expected_day = first_day_date.day
-        expected_month = first_day_date.month
-        expected_year = first_day_date.year
-
-        days = self._get_days_of_week()
+        days = self.week_view.get_days_of_week()
         day_to_select = self.app.main_view.get_label_with_text(days[0])
+        expected_day = days[0]
+        dayStart = self.week_view.dayStart
+        expected_month = dayStart.month
+        expected_year = dayStart.year
 
         self.app.pointing_device.click_object(day_to_select)
 
@@ -192,9 +112,8 @@
         self.assertThat(day_view.visible, Eventually(Equals(True)))
 
         # Check that the 'Day' view is on the correct/selected day.
-        selected_date = datetime.datetime.strptime(
-            self.app.main_view.get_month_year(day_view),
-            '%B %Y')
-        # self.assertThat(expected_day, Equals(selected_date.day))
+        selected_date = \
+            self.app.main_view.get_day_view().get_selected_day().startDay
+        self.assertThat(expected_day, Equals(selected_date.day))
         self.assertThat(expected_month, Equals(selected_date.month))
         self.assertThat(expected_year, Equals(selected_date.year))