1
=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
2
--- tests/autopilot/calendar_app/tests/test_weekview.py	2013-10-28 21:08:48 +0000
3
+++ tests/autopilot/calendar_app/tests/test_weekview.py	2013-11-04 22:14:24 +0000
4
@@ -9,7 +9,6 @@
5
9
Calendar app autopilot tests for the week view.
9
Calendar app autopilot tests for the week view.
6
10
"""
10
"""
7
11
11
8
12
import calendar
9
13
import datetime
12
import datetime
10
14
13
11
15
from autopilot.matchers import Eventually
14
from autopilot.matchers import Eventually
12
@@ -49,15 +48,11 @@
13
49
48
14
50
        now = datetime.datetime.now()
49
        now = datetime.datetime.now()
15
51
        days = self.get_days_of_week()
50
        days = self.get_days_of_week()
18
52
        monday = (now - datetime.timedelta(days=now.weekday())).day
51
        monday = (now - datetime.timedelta(days=now.weekday()))
17
53
        current_month_days = calendar.monthrange(now.year, now.month)[1]
19
54
52
20
55
        for i in xrange(7):
53
        for i in xrange(7):
21
56
            current_day = int(days[i].text)
54
            current_day = int(days[i].text)
26
57
            expected_day = (monday + i) % current_month_days
55
            expected_day = (monday + datetime.timedelta(days=i)).day
23
58
24
59
            if (monday + i) == current_month_days:
25
60
                expected_day = current_month_days
27
61
56
28
62
            self.assertThat(current_day, Equals(expected_day))
57
            self.assertThat(current_day, Equals(expected_day))
29
63
58
30
64
59
31
=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
32
--- tests/autopilot/calendar_app/tests/test_yearview.py	2013-10-28 21:08:48 +0000
33
+++ tests/autopilot/calendar_app/tests/test_yearview.py	2013-11-04 22:14:24 +0000
34
@@ -31,7 +31,10 @@
35
31
    def test_selecting_a_month_switch_to_month_view(self):
31
    def test_selecting_a_month_switch_to_month_view(self):
36
32
        """It must be possible to select a month and open the month view."""
32
        """It must be possible to select a month and open the month view."""
37
33
33
39
34
        months = self.months_from_selected_year()
34
        # TODO: the component indexed at 1 is the one currently displayed,
40
35
        # investigate a way to validate this assumption visually.
41
36
        year_grid = self.year_view.select_many("QQuickGridView")[1]
42
37
        months = year_grid.select_many("MonthComponent")
43
35
        self.assert_current_year_is_default_one(months[0])
38
        self.assert_current_year_is_default_one(months[0])
44
36
39
45
37
        february = months[1]
40
        february = months[1]
46
@@ -56,19 +59,22 @@
47
56
    def test_current_day_is_selected(self):
59
    def test_current_day_is_selected(self):
48
57
        """The current day must be selected."""
60
        """The current day must be selected."""
49
58
61
52
59
        months = self.months_from_selected_year()
62
        current_month = self.current_month()
51
60
        current_month = months[datetime.now().month - 1]
53
61
        month_grid = current_month.select_single(objectName="monthGrid")
63
        month_grid = current_month.select_single(objectName="monthGrid")
54
62
64
56
63
        current_day_label = month_grid.select_single(
65
        # there could actually be two labels with
57
66
        # the current day: one is the current day of the current month,
58
67
        # the other one is the current day of the previous or next month. Both
59
68
        # shouldn't have the standard white color.
60
69
        current_day_labels = month_grid.select_many(
61
64
            "Label", text=str(datetime.now().day))
70
            "Label", text=str(datetime.now().day))
62
65
71
63
66
        # probably better to check the surrounding UbuntuShape object,
72
        # probably better to check the surrounding UbuntuShape object,
64
67
        # upgrade when python-autopilot 1.4 will be available (get_parent).
73
        # upgrade when python-autopilot 1.4 will be available (get_parent).
69
68
        color = current_day_label.color
74
        for current_day_label in current_day_labels:
70
69
        label_color = (color[0], color[1], color[2], color[3])
75
            color = current_day_label.color
71
70
76
            label_color = (color[0], color[1], color[2], color[3])
72
71
        self.assertThat(label_color, NotEquals((255, 255, 255, 255)))
77
            self.assertThat(label_color, NotEquals((255, 255, 255, 255)))
73
72
78
74
73
    def test_show_next_years(self):
79
    def test_show_next_years(self):
75
74
        """It must be possible to show next years by swiping the view."""
80
        """It must be possible to show next years by swiping the view."""
76
@@ -93,9 +99,33 @@
77
93
        self.assertThat(self.main_view.get_year(month_component),
99
        self.assertThat(self.main_view.get_year(month_component),
78
94
                        Equals(datetime.now().year))
100
                        Equals(datetime.now().year))
79
95
101
83
96
    def months_from_selected_year(self):
102
    def current_month(self):
84
97
        # TODO: the component indexed at 1 is the one currently displayed,
103
        now = datetime.now()
85
98
        # investigate a way to validate this assumption visually.
104
        current_month_name = now.strftime("%B")
86
105
87
106
        # for months after June, we must scroll down the page to have
88
107
        # the month components loaded in the view.
89
108
        if now.month > 6:
90
109
            self.drag_page_up()
91
99
110
92
100
        year_grid = self.year_view.select_many("QQuickGridView")[1]
111
        year_grid = self.year_view.select_many("QQuickGridView")[1]
94
101
        return year_grid.select_many("MonthComponent")
112
        months = year_grid.select_many("MonthComponent")
95
113
96
114
        for month in months:
97
115
            current_month_label = month.select_single(
98
116
                "Label", objectName="monthLabel")
99
117
100
118
            if current_month_name == current_month_label.text:
101
119
                return month
102
120
103
121
        return None
104
122
105
123
    def drag_page_up(self):
106
124
        x_line = (self.year_view.globalRect[0] +
107
125
                  self.year_view.globalRect[2] / 2)
108
126
109
127
        y_stop = self.year_view.globalRect[1]
110
128
        y_start = self.year_view.globalRect[3]
111
129
112
130
        self.pointing_device.drag(x_line, y_start, x_line, y_stop)
113
131
        self.pointing_device.drag(x_line, y_start, x_line, y_stop)
Status:	Merged
Merged at revision:	168
Proposed branch:	lp:~acerisara/ubuntu-calendar-app/failing-tests
Merge into:	lp:ubuntu-calendar-app
Diff against target:	113 lines (+44/-19) 2 files modified tests/autopilot/calendar_app/tests/test_weekview.py (+2/-7) tests/autopilot/calendar_app/tests/test_yearview.py (+42/-12)
To merge this branch:	bzr merge lp:~acerisara/ubuntu-calendar-app/failing-tests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Needs Fixing on 2013-11-12
Nicholas Skaggs (community)		2013-11-03	Needs Fixing on 2013-11-08
Review via email: mp+193706@code.launchpad.net
1	=== modified file 'tests/autopilot/calendar_app/tests/test_weekview.py'
2	--- tests/autopilot/calendar_app/tests/test_weekview.py 2013-10-28 21:08:48 +0000
3	+++ tests/autopilot/calendar_app/tests/test_weekview.py 2013-11-04 22:14:24 +0000
4	@@ -9,7 +9,6 @@
5	9	Calendar app autopilot tests for the week view.	9	Calendar app autopilot tests for the week view.
6	10	"""	10	"""
7	11		11
8	12	import calendar
9	13	import datetime	12	import datetime
10	14		13
11	15	from autopilot.matchers import Eventually	14	from autopilot.matchers import Eventually
12	@@ -49,15 +48,11 @@
13	49		48
14	50	now = datetime.datetime.now()	49	now = datetime.datetime.now()
15	51	days = self.get_days_of_week()	50	days = self.get_days_of_week()
18	52	monday = (now - datetime.timedelta(days=now.weekday())).day	51	monday = (now - datetime.timedelta(days=now.weekday()))
17	53	current_month_days = calendar.monthrange(now.year, now.month)[1]
19	54		52
20	55	for i in xrange(7):	53	for i in xrange(7):
21	56	current_day = int(days[i].text)	54	current_day = int(days[i].text)
26	57	expected_day = (monday + i) % current_month_days	55	expected_day = (monday + datetime.timedelta(days=i)).day
23	58
24	59	if (monday + i) == current_month_days:
25	60	expected_day = current_month_days
27	61		56
28	62	self.assertThat(current_day, Equals(expected_day))	57	self.assertThat(current_day, Equals(expected_day))
29	63		58
30	64		59
31	=== modified file 'tests/autopilot/calendar_app/tests/test_yearview.py'
32	--- tests/autopilot/calendar_app/tests/test_yearview.py 2013-10-28 21:08:48 +0000
33	+++ tests/autopilot/calendar_app/tests/test_yearview.py 2013-11-04 22:14:24 +0000
34	@@ -31,7 +31,10 @@
35	31	def test_selecting_a_month_switch_to_month_view(self):	31	def test_selecting_a_month_switch_to_month_view(self):
36	32	"""It must be possible to select a month and open the month view."""	32	"""It must be possible to select a month and open the month view."""
37	33		33
39	34	months = self.months_from_selected_year()	34	# TODO: the component indexed at 1 is the one currently displayed,
40			35	# investigate a way to validate this assumption visually.
41			36	year_grid = self.year_view.select_many("QQuickGridView")[1]
42			37	months = year_grid.select_many("MonthComponent")
43	35	self.assert_current_year_is_default_one(months[0])	38	self.assert_current_year_is_default_one(months[0])
44	36		39
45	37	february = months[1]	40	february = months[1]
46	@@ -56,19 +59,22 @@
47	56	def test_current_day_is_selected(self):	59	def test_current_day_is_selected(self):
48	57	"""The current day must be selected."""	60	"""The current day must be selected."""
49	58		61
52	59	months = self.months_from_selected_year()	62	current_month = self.current_month()
51	60	current_month = months[datetime.now().month - 1]
53	61	month_grid = current_month.select_single(objectName="monthGrid")	63	month_grid = current_month.select_single(objectName="monthGrid")
54	62		64
56	63	current_day_label = month_grid.select_single(	65	# there could actually be two labels with
57			66	# the current day: one is the current day of the current month,
58			67	# the other one is the current day of the previous or next month. Both
59			68	# shouldn't have the standard white color.
60			69	current_day_labels = month_grid.select_many(
61	64	"Label", text=str(datetime.now().day))	70	"Label", text=str(datetime.now().day))
62	65		71
63	66	# probably better to check the surrounding UbuntuShape object,	72	# probably better to check the surrounding UbuntuShape object,
64	67	# upgrade when python-autopilot 1.4 will be available (get_parent).	73	# upgrade when python-autopilot 1.4 will be available (get_parent).
69	68	color = current_day_label.color	74	for current_day_label in current_day_labels:
70	69	label_color = (color[0], color[1], color[2], color[3])	75	color = current_day_label.color
71	70		76	label_color = (color[0], color[1], color[2], color[3])
72	71	self.assertThat(label_color, NotEquals((255, 255, 255, 255)))	77	self.assertThat(label_color, NotEquals((255, 255, 255, 255)))
73	72		78
74	73	def test_show_next_years(self):	79	def test_show_next_years(self):
75	74	"""It must be possible to show next years by swiping the view."""	80	"""It must be possible to show next years by swiping the view."""
76	@@ -93,9 +99,33 @@
77	93	self.assertThat(self.main_view.get_year(month_component),	99	self.assertThat(self.main_view.get_year(month_component),
78	94	Equals(datetime.now().year))	100	Equals(datetime.now().year))
79	95		101
83	96	def months_from_selected_year(self):	102	def current_month(self):
84	97	# TODO: the component indexed at 1 is the one currently displayed,	103	now = datetime.now()
85	98	# investigate a way to validate this assumption visually.	104	current_month_name = now.strftime("%B")
86			105
87			106	# for months after June, we must scroll down the page to have
88			107	# the month components loaded in the view.
89			108	if now.month > 6:
90			109	self.drag_page_up()
91	99		110
92	100	year_grid = self.year_view.select_many("QQuickGridView")[1]	111	year_grid = self.year_view.select_many("QQuickGridView")[1]
94	101	return year_grid.select_many("MonthComponent")	112	months = year_grid.select_many("MonthComponent")
95			113
96			114	for month in months:
97			115	current_month_label = month.select_single(
98			116	"Label", objectName="monthLabel")
99			117
100			118	if current_month_name == current_month_label.text:
101			119	return month
102			120
103			121	return None
104			122
105			123	def drag_page_up(self):
106			124	x_line = (self.year_view.globalRect[0] +
107			125	self.year_view.globalRect[2] / 2)
108			126
109			127	y_stop = self.year_view.globalRect[1]
110			128	y_start = self.year_view.globalRect[3]
111			129
112			130	self.pointing_device.drag(x_line, y_start, x_line, y_stop)
113			131	self.pointing_device.drag(x_line, y_start, x_line, y_stop)