1
=== modified file 'YearView.qml'
2
--- YearView.qml	2014-08-18 16:48:54 +0000
3
+++ YearView.qml	2014-09-05 15:28:43 +0000
4
@@ -100,9 +100,10 @@
5
100
100
6
101
                MonthComponent {
101
                MonthComponent {
7
102
                    id: monthComponent
102
                    id: monthComponent
8
103
                    objectName: "monthComponent" + index
9
103
                    showEvents: false
104
                    showEvents: false
10
104
                    currentMonth: new Date(yearView.year, index, 1, 0, 0, 0, 0)
105
                    currentMonth: new Date(yearView.year, index, 1, 0, 0, 0, 0)
12
105
                    
106
13
106
                    isYearView: true
107
                    isYearView: true
14
107
                    anchors.fill: parent
108
                    anchors.fill: parent
15
108
                    anchors.margins: units.gu(0.5)
109
                    anchors.margins: units.gu(0.5)
16
109
110
17
=== modified file 'tests/autopilot/calendar_app/__init__.py'
18
--- tests/autopilot/calendar_app/__init__.py	2014-09-05 01:20:19 +0000
19
+++ tests/autopilot/calendar_app/__init__.py	2014-09-05 15:28:43 +0000
20
@@ -16,14 +16,15 @@
21
16
16
22
17
"""Calendar app autopilot helpers."""
17
"""Calendar app autopilot helpers."""
23
18
18
24
19
import datetime
25
19
import logging
20
import logging
26
20
from time import sleep
21
from time import sleep
27
21
22
28
22
import autopilot.logging
23
import autopilot.logging
29
24
import ubuntuuitoolkit
30
25
from autopilot import exceptions
31
23
from dateutil import tz
26
from dateutil import tz
32
24
27
33
25
import ubuntuuitoolkit
34
26
35
27
from calendar_app import data
28
from calendar_app import data
36
28
29
37
29
30
38
@@ -237,6 +238,64 @@
39
237
238
40
238
    """Autopilot helper for the Year View page."""
239
    """Autopilot helper for the Year View page."""
41
239
240
42
241
    def get_selected_day(self):
43
242
        """Return the selected day.
44
243
45
244
        :returns: A python datetime.date object with the selected day.
46
245
47
246
        """
48
247
        current_year_grid = self._get_current_year_grid()
49
248
        for index in range(12):
50
249
            month_component = self._find_month_component(
51
250
                current_year_grid, index)
52
251
            try:
53
252
                today = month_component.select_single(
54
253
                    'QQuickItem', isCurrentMonth=True, isToday=True)
55
254
            except exceptions.StateNotFoundError:
56
255
                continue
57
256
            else:
58
257
                return datetime.date(
59
258
                    current_year_grid.year, index + 1, today.date)
60
259
        else:
61
260
            raise CalendarException(
62
261
                'No day is selected on the currently visible year.')
63
262
64
263
    def _get_current_year_grid(self):
65
264
        path_view_base = self.select_single(
66
265
            'PathViewBase', objectName='yearPathView')
67
266
        return path_view_base.select_single(
68
267
            ubuntuuitoolkit.QQuickGridView, isCurrentItem=True)
69
268
70
269
    def _find_month_component(self, grid, index):
71
270
        try:
72
271
            month = self._get_month_component(grid, index)
73
272
        except exceptions.StateNotFoundError:
74
273
            month = self._swipe_to_find_month_component(grid, index)
75
274
        if month is None:
76
275
            raise CalendarException('Month {} not found.'.format(index))
77
276
        else:
78
277
            return month
79
278
80
279
    def _get_month_component(self, grid, index):
81
280
        return grid.select_single(
82
281
            'MonthComponent',
83
282
            objectName='monthComponent{}'.format(index))
84
283
85
284
    def _swipe_to_find_month_component(self, grid, index):
86
285
        month = None
87
286
        grid.swipe_to_top()
88
287
        while not grid.atYEnd:
89
288
            try:
90
289
                month = self._get_month_component(grid, index)
91
290
            except exceptions.StateNotFoundError:
92
291
                # FIXME do not call the private _get_containers.
93
292
                # Reported as bug http://pad.lv/1365674
94
293
                # --elopio - 2014-09-04
95
294
                grid.swipe_to_show_more_below(grid._get_containers())
96
295
            else:
97
296
                break
98
297
        return month
99
298
100
240
299
101
241
class WeekView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
300
class WeekView(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
102
242
301
103
243
302
104
=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
105
--- tests/autopilot/calendar_app/tests/test_yearview.py	2014-09-04 16:04:37 +0000
106
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2014-09-05 15:28:43 +0000
107
@@ -24,7 +24,7 @@
108
24
if sys.version_info < (3,):
24
if sys.version_info < (3,):
109
25
    range = xrange
25
    range = xrange
110
26
26
112
27
from datetime import datetime
27
import datetime
113
28
from autopilot.matchers import Eventually
28
from autopilot.matchers import Eventually
114
29
from testtools.matchers import Equals, NotEquals
29
from testtools.matchers import Equals, NotEquals
115
30
30
116
@@ -41,10 +41,6 @@
117
41
        return self.year_view.wait_select_single("QQuickGridView",
41
        return self.year_view.wait_select_single("QQuickGridView",
118
42
                                                 isCurrentItem=True)
42
                                                 isCurrentItem=True)
119
43
43
120
44
    def _get_month_grid(self):
121
45
        current_month = self._get_current_month()
122
46
        return current_month.select_single(objectName="monthGrid")
123
47
124
48
    def _change_year(self, direction, how_many=5):
44
    def _change_year(self, direction, how_many=5):
125
49
        current_year = self.year_view.currentYear
45
        current_year = self.year_view.currentYear
126
50
46
127
@@ -55,25 +51,10 @@
128
55
                lambda: self.year_view.currentYear,
51
                lambda: self.year_view.currentYear,
129
56
                Eventually(Equals(current_year + (i * direction))))
52
                Eventually(Equals(current_year + (i * direction))))
130
57
53
131
58
    def _get_current_month(self):
132
59
        now = datetime.now()
133
60
        _current_month_name = now.strftime("%B")
134
61
135
62
        year_grid = self._get_year_grid()
136
63
        months = year_grid.select_many("MonthComponent")
137
64
138
65
        for month in months:
139
66
            _current_month_label = month.select_single(
140
67
                "Label", objectName="monthLabel")
141
68
            if _current_month_name == _current_month_label.text:
142
69
                return month
143
70
144
71
        return None
145
72
146
73
    def test_current_year_is_default(self):
54
    def test_current_year_is_default(self):
147
74
        """The current year should be the default shown"""
55
        """The current year should be the default shown"""
148
75
        self.assertThat(self.year_view.currentYear,
56
        self.assertThat(self.year_view.currentYear,
150
76
                        Equals(datetime.now().year))
57
                        Equals(datetime.datetime.now().year))
151
77
58
152
78
    def test_selecting_a_month_switch_to_month_view(self):
59
    def test_selecting_a_month_switch_to_month_view(self):
153
79
        """It must be possible to select a month and open the month view."""
60
        """It must be possible to select a month and open the month view."""
154
@@ -109,22 +90,9 @@
155
109
90
156
110
    def test_current_day_is_selected(self):
91
    def test_current_day_is_selected(self):
157
111
        """The current day must be selected."""
92
        """The current day must be selected."""
174
112
93
        selected_day = self.year_view.get_selected_day()
175
113
        month_grid = self._get_month_grid()
94
        self.assertEqual(
176
114
95
            selected_day, datetime.date.today())
161
115
        # there could actually be two labels with
162
116
        # the current day: one is the current day of the current month,
163
117
        # the other one is the current day of the previous or next month. Both
164
118
        # shouldn't have the standard white color.
165
119
        current_day_labels = month_grid.select_many(
166
120
            "Label", text=str(datetime.now().day))
167
121
168
122
        # probably better to check the surrounding UbuntuShape object,
169
123
        # upgrade when python-autopilot 1.4 will be available (get_parent).
170
124
        for current_day_label in current_day_labels:
171
125
            color = current_day_label.color
172
126
            label_color = (color[0], color[1], color[2], color[3])
173
127
            self.assertThat(label_color, NotEquals((255, 255, 255, 255)))
177
128
96
178
129
    def test_show_next_years(self):
97
    def test_show_next_years(self):
179
130
        """It must be possible to show next years by swiping the view."""
98
        """It must be possible to show next years by swiping the view."""
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2014-09-05
Nicholas Skaggs (community)		2014-08-03	Approve on 2014-09-05
Review via email: mp+229356@code.launchpad.net