1
=== modified file 'debian/control'
2
--- debian/control	2013-09-30 13:49:44 +0000
3
+++ debian/control	2013-11-06 02:35:40 +0000
4
@@ -39,7 +39,7 @@
5
39
Priority: extra
39
Priority: extra
6
40
Depends: ${misc:Depends},
40
Depends: ${misc:Depends},
7
41
         ${python:Depends},
41
         ${python:Depends},
9
42
         autopilot-qt5,
42
         autopilot-qt5 (>= 1.4),
10
43
         friends-app (>= ${binary:Version}),
43
         friends-app (>= ${binary:Version}),
11
44
         libqt5test5,
44
         libqt5test5,
12
45
         libqt5widgets5,
45
         libqt5widgets5,
13
46
46
14
=== modified file 'tests/autopilot/friends_app/emulators/friends_app_utils.py'
15
--- tests/autopilot/friends_app/emulators/friends_app_utils.py	2013-07-03 23:27:42 +0000
16
+++ tests/autopilot/friends_app/emulators/friends_app_utils.py	2013-11-06 02:35:40 +0000
17
@@ -16,21 +16,22 @@
18
16
16
19
17
    def get_main_view(self):
17
    def get_main_view(self):
20
18
        """Get the main QML view"""
18
        """Get the main QML view"""
22
19
        return self.app.select_single("MainView", objectName="main")
19
        return self.app.wait_select_single("MainView", objectName="main")
23
20
20
24
21
    def get_post_view(self):
21
    def get_post_view(self):
25
22
        """Get the post QML view"""
22
        """Get the post QML view"""
27
23
        return self.app.select_single("Post", objectName="post")
23
        return self.app.wait_select_single("Post", objectName="post")
28
24
24
29
25
    def get_stream_model(self):
25
    def get_stream_model(self):
30
26
        """Get the StreamModel"""
26
        """Get the StreamModel"""
32
27
        return self.app.select_single("StreamModel", objectName="streamModel")
27
        return self.app.wait_select_single(
33
28
            "StreamModel", objectName="streamModel")
34
28
29
35
29
    def get_toolbar(self):
30
    def get_toolbar(self):
36
30
        """Returns the toolbar in the main events view."""
31
        """Returns the toolbar in the main events view."""
37
31
        main_view = self.get_main_view()
32
        main_view = self.get_main_view()
39
32
        return main_view.select_single("Toolbar")
33
        return main_view.wait_select_single("Toolbar")
40
33
34
41
34
    def get_qml_view(self):
35
    def get_qml_view(self):
42
35
        """Get the main QML view"""
36
        """Get the main QML view"""
44
36
        return self.app.select_single("QQuickView")
37
        return self.app.wait_select_single("QQuickView")
45
37
38
46
=== modified file 'tests/autopilot/friends_app/tests/__init__.py'
47
--- tests/autopilot/friends_app/tests/__init__.py	2013-09-04 18:11:55 +0000
48
+++ tests/autopilot/friends_app/tests/__init__.py	2013-11-06 02:35:40 +0000
49
@@ -13,7 +13,7 @@
50
13
from autopilot.input import Mouse, Touch, Pointer
13
from autopilot.input import Mouse, Touch, Pointer
51
14
from autopilot.display import Display
14
from autopilot.display import Display
52
15
from autopilot.platform import model
15
from autopilot.platform import model
54
16
from testtools.matchers import Equals, NotEquals
16
from testtools.matchers import Equals
55
17
from autopilot.matchers import Eventually
17
from autopilot.matchers import Eventually
56
18
18
57
19
from friends_app.emulators.timeline_view import TimelineView
19
from friends_app.emulators.timeline_view import TimelineView
58
@@ -22,14 +22,15 @@
59
22
22
60
23
23
61
24
class FriendsAppTestCase(AutopilotTestCase):
24
class FriendsAppTestCase(AutopilotTestCase):
63
25
    """A common test case class that provides several useful methods for friends-app tests."""
25
    """A common test case class that provides several useful methods for
64
26
    friends-app tests."""
65
26
    if model() == 'Desktop':
27
    if model() == 'Desktop':
66
27
        scenarios = [
28
        scenarios = [
68
28
        ('with mouse', dict(input_device_class=Mouse)),
29
            ('with mouse', dict(input_device_class=Mouse)),
69
29
        ]
30
        ]
70
30
    else:
31
    else:
71
31
        scenarios = [
32
        scenarios = [
73
32
        ('with touch', dict(input_device_class=Touch)),
33
            ('with touch', dict(input_device_class=Touch)),
74
33
        ]
34
        ]
75
34
35
76
35
    local_location = "../../src/friends-app"
36
    local_location = "../../src/friends-app"
77
@@ -64,9 +65,8 @@
78
64
                "friends-app")
65
                "friends-app")
79
65
        else:
66
        else:
80
66
            self.app = self.launch_test_application(
67
            self.app = self.launch_test_application(
84
67
               "friends-app",
68
                "friends-app", "--desktop_file_hint=/usr/share/applications/"
85
68
               "--desktop_file_hint=/usr/share/applications/friends-app.desktop",
69
                "friends-app.desktop", app_type='qt')
83
69
               app_type='qt')
86
70
70
87
71
    @property
71
    @property
88
72
    def friends_app_utils(self):
72
    def friends_app_utils(self):
89
@@ -88,11 +88,11 @@
90
88
            # Toolbar already open
88
            # Toolbar already open
91
89
            return
89
            return
92
90
90
94
91
        main_view = self.friends_app_utils.get_qml_view()
91
        qml_view = self.friends_app_utils.get_qml_view()
95
92
        x, y, w, h = toolbar.globalRect
92
        x, y, w, h = toolbar.globalRect
98
93
        x_line = main_view.x + main_view.width * 0.5
93
        x_line = qml_view.x + qml_view.width * 0.5
99
94
        start_y = main_view.y + main_view.height - 1
94
        start_y = qml_view.y + qml_view.height - 1
100
95
        stop_y = start_y - 2 * h
95
        stop_y = start_y - 2 * h
102
96
96
        self.pointing_device.move_to_object(toolbar)
103
97
        self.pointing_device.drag(x_line, start_y, x_line, stop_y)
97
        self.pointing_device.drag(x_line, start_y, x_line, stop_y)
104
98
        self.assertThat(toolbar.state, Eventually(Equals('spread')))
98
        self.assertThat(toolbar.state, Eventually(Equals('spread')))
105
99
99
106
=== modified file 'tests/autopilot/friends_app/tests/test_timeline_view.py'
107
--- tests/autopilot/friends_app/tests/test_timeline_view.py	2013-07-03 23:27:42 +0000
108
+++ tests/autopilot/friends_app/tests/test_timeline_view.py	2013-11-06 02:35:40 +0000
109
@@ -10,7 +10,7 @@
110
10
10
111
11
from __future__ import absolute_import
11
from __future__ import absolute_import
112
12
12
114
13
from testtools.matchers import Equals, NotEquals
13
from testtools.matchers import Equals
115
14
from autopilot.matchers import Eventually
14
from autopilot.matchers import Eventually
116
15
15
117
16
from friends_app.tests import FriendsAppTestCase
16
from friends_app.tests import FriendsAppTestCase
118
@@ -30,16 +30,3 @@
119
30
30
120
31
    def test_mainView_visible(self):
31
    def test_mainView_visible(self):
121
32
        self.assertThat(self.timeline_view.get_main_view().visible, Eventually(Equals(True)))
32
        self.assertThat(self.timeline_view.get_main_view().visible, Eventually(Equals(True)))
122
33
123
34
    """
124
35
    def test_stream_model_count(self):
125
36
        streammodel = self.timeline_view.get_stream_model()
126
37
        self.assertThat(streammodel.count, Eventually(NotEquals(0)))
127
38
    """
128
39
129
40
    def test_toolbar(self):
130
41
        """Make sure the ToolBar functions."""
131
42
        toolbar = self.timeline_view.get_toolbar()
132
43
        self.assertThat(toolbar.state, Equals(''))
133
44
        self.reveal_toolbar()
134
45
        self.assertThat(toolbar.state, Equals('spread'))
Status:	Superseded
Proposed branch:	lp:~chris.gagnon/friends-app/autopilot-1.4
Merge into:	lp:friends-app
Diff against target:	134 lines (+19/-31) 4 files modified debian/control (+1/-1) tests/autopilot/friends_app/emulators/friends_app_utils.py (+6/-5) tests/autopilot/friends_app/tests/__init__.py (+11/-11) tests/autopilot/friends_app/tests/test_timeline_view.py (+1/-14)
To merge this branch:	bzr merge lp:~chris.gagnon/friends-app/autopilot-1.4
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2013-11-06
Thomi Richards (community)		2013-10-30	Approve on 2013-11-06
Robert Bruce Park			Approve on 2013-11-06
Review via email: mp+193293@code.launchpad.net
1	=== modified file 'debian/control'
2	--- debian/control 2013-09-30 13:49:44 +0000
3	+++ debian/control 2013-11-06 02:35:40 +0000
4	@@ -39,7 +39,7 @@
5	39	Priority: extra	39	Priority: extra
6	40	Depends: ${misc:Depends},	40	Depends: ${misc:Depends},
7	41	${python:Depends},	41	${python:Depends},
9	42	autopilot-qt5,	42	autopilot-qt5 (>= 1.4),
10	43	friends-app (>= ${binary:Version}),	43	friends-app (>= ${binary:Version}),
11	44	libqt5test5,	44	libqt5test5,
12	45	libqt5widgets5,	45	libqt5widgets5,
13	46		46
14	=== modified file 'tests/autopilot/friends_app/emulators/friends_app_utils.py'
15	--- tests/autopilot/friends_app/emulators/friends_app_utils.py 2013-07-03 23:27:42 +0000
16	+++ tests/autopilot/friends_app/emulators/friends_app_utils.py 2013-11-06 02:35:40 +0000
17	@@ -16,21 +16,22 @@
18	16		16
19	17	def get_main_view(self):	17	def get_main_view(self):
20	18	"""Get the main QML view"""	18	"""Get the main QML view"""
22	19	return self.app.select_single("MainView", objectName="main")	19	return self.app.wait_select_single("MainView", objectName="main")
23	20		20
24	21	def get_post_view(self):	21	def get_post_view(self):
25	22	"""Get the post QML view"""	22	"""Get the post QML view"""
27	23	return self.app.select_single("Post", objectName="post")	23	return self.app.wait_select_single("Post", objectName="post")
28	24		24
29	25	def get_stream_model(self):	25	def get_stream_model(self):
30	26	"""Get the StreamModel"""	26	"""Get the StreamModel"""
32	27	return self.app.select_single("StreamModel", objectName="streamModel")	27	return self.app.wait_select_single(
33			28	"StreamModel", objectName="streamModel")
34	28		29
35	29	def get_toolbar(self):	30	def get_toolbar(self):
36	30	"""Returns the toolbar in the main events view."""	31	"""Returns the toolbar in the main events view."""
37	31	main_view = self.get_main_view()	32	main_view = self.get_main_view()
39	32	return main_view.select_single("Toolbar")	33	return main_view.wait_select_single("Toolbar")
40	33		34
41	34	def get_qml_view(self):	35	def get_qml_view(self):
42	35	"""Get the main QML view"""	36	"""Get the main QML view"""
44	36	return self.app.select_single("QQuickView")	37	return self.app.wait_select_single("QQuickView")
45	37		38
46	=== modified file 'tests/autopilot/friends_app/tests/__init__.py'
47	--- tests/autopilot/friends_app/tests/__init__.py 2013-09-04 18:11:55 +0000
48	+++ tests/autopilot/friends_app/tests/__init__.py 2013-11-06 02:35:40 +0000
49	@@ -13,7 +13,7 @@
50	13	from autopilot.input import Mouse, Touch, Pointer	13	from autopilot.input import Mouse, Touch, Pointer
51	14	from autopilot.display import Display	14	from autopilot.display import Display
52	15	from autopilot.platform import model	15	from autopilot.platform import model
54	16	from testtools.matchers import Equals, NotEquals	16	from testtools.matchers import Equals
55	17	from autopilot.matchers import Eventually	17	from autopilot.matchers import Eventually
56	18		18
57	19	from friends_app.emulators.timeline_view import TimelineView	19	from friends_app.emulators.timeline_view import TimelineView
58	@@ -22,14 +22,15 @@
59	22		22
60	23		23
61	24	class FriendsAppTestCase(AutopilotTestCase):	24	class FriendsAppTestCase(AutopilotTestCase):
63	25	"""A common test case class that provides several useful methods for friends-app tests."""	25	"""A common test case class that provides several useful methods for
64			26	friends-app tests."""
65	26	if model() == 'Desktop':	27	if model() == 'Desktop':
66	27	scenarios = [	28	scenarios = [
68	28	('with mouse', dict(input_device_class=Mouse)),	29	('with mouse', dict(input_device_class=Mouse)),
69	29	]	30	]
70	30	else:	31	else:
71	31	scenarios = [	32	scenarios = [
73	32	('with touch', dict(input_device_class=Touch)),	33	('with touch', dict(input_device_class=Touch)),
74	33	]	34	]
75	34		35
76	35	local_location = "../../src/friends-app"	36	local_location = "../../src/friends-app"
77	@@ -64,9 +65,8 @@
78	64	"friends-app")	65	"friends-app")
79	65	else:	66	else:
80	66	self.app = self.launch_test_application(	67	self.app = self.launch_test_application(
84	67	"friends-app",	68	"friends-app", "--desktop_file_hint=/usr/share/applications/"
85	68	"--desktop_file_hint=/usr/share/applications/friends-app.desktop",	69	"friends-app.desktop", app_type='qt')
83	69	app_type='qt')
86	70		70
87	71	@property	71	@property
88	72	def friends_app_utils(self):	72	def friends_app_utils(self):
89	@@ -88,11 +88,11 @@
90	88	# Toolbar already open	88	# Toolbar already open
91	89	return	89	return
92	90		90
94	91	main_view = self.friends_app_utils.get_qml_view()	91	qml_view = self.friends_app_utils.get_qml_view()
95	92	x, y, w, h = toolbar.globalRect	92	x, y, w, h = toolbar.globalRect
98	93	x_line = main_view.x + main_view.width * 0.5	93	x_line = qml_view.x + qml_view.width * 0.5
99	94	start_y = main_view.y + main_view.height - 1	94	start_y = qml_view.y + qml_view.height - 1
100	95	stop_y = start_y - 2 * h	95	stop_y = start_y - 2 * h
102	96		96	self.pointing_device.move_to_object(toolbar)
103	97	self.pointing_device.drag(x_line, start_y, x_line, stop_y)	97	self.pointing_device.drag(x_line, start_y, x_line, stop_y)
104	98	self.assertThat(toolbar.state, Eventually(Equals('spread')))	98	self.assertThat(toolbar.state, Eventually(Equals('spread')))
105	99		99
106	=== modified file 'tests/autopilot/friends_app/tests/test_timeline_view.py'
107	--- tests/autopilot/friends_app/tests/test_timeline_view.py 2013-07-03 23:27:42 +0000
108	+++ tests/autopilot/friends_app/tests/test_timeline_view.py 2013-11-06 02:35:40 +0000
109	@@ -10,7 +10,7 @@
110	10		10
111	11	from __future__ import absolute_import	11	from __future__ import absolute_import
112	12		12
114	13	from testtools.matchers import Equals, NotEquals	13	from testtools.matchers import Equals
115	14	from autopilot.matchers import Eventually	14	from autopilot.matchers import Eventually
116	15		15
117	16	from friends_app.tests import FriendsAppTestCase	16	from friends_app.tests import FriendsAppTestCase
118	@@ -30,16 +30,3 @@
119	30		30
120	31	def test_mainView_visible(self):	31	def test_mainView_visible(self):
121	32	self.assertThat(self.timeline_view.get_main_view().visible, Eventually(Equals(True)))	32	self.assertThat(self.timeline_view.get_main_view().visible, Eventually(Equals(True)))
122	33
123	34	"""
124	35	def test_stream_model_count(self):
125	36	streammodel = self.timeline_view.get_stream_model()
126	37	self.assertThat(streammodel.count, Eventually(NotEquals(0)))
127	38	"""
128	39
129	40	def test_toolbar(self):
130	41	"""Make sure the ToolBar functions."""
131	42	toolbar = self.timeline_view.get_toolbar()
132	43	self.assertThat(toolbar.state, Equals(''))
133	44	self.reveal_toolbar()
134	45	self.assertThat(toolbar.state, Equals('spread'))