1
=== modified file 'HACKING'
2
--- HACKING	2013-11-13 06:22:09 +0000
3
+++ HACKING	2014-09-02 23:04:44 +0000
4
@@ -1,5 +1,34 @@
5
1
dialer-app hacking guide
6
2
========================
7
3
8
4
Getting dialer-app
9
5
------------------
10
6
11
7
To get the main development branch of dialer-app:
12
8
13
9
    $ bzr branch lp:dialer-app
14
10
15
11
16
12
Building the app
17
13
----------------
18
14
19
15
This app is built using cmake. Here's an example on how to build it:
20
16
21
17
    $ cmake .
22
18
    $ make -j 8
23
19
24
20
25
21
Running the built app
26
22
---------------------
27
23
28
24
After building the app, it can be run with:
29
25
30
26
    $ ./src/dialer-app
31
27
32
28
33
1
Test coverage
29
Test coverage
34
2
-------------
30
-------------
35
31
36
3
dialer-app has autopilot tests which cover basic use cases like making an
32
dialer-app has autopilot tests which cover basic use cases like making an
37
4
outgoing call and receiving an incoming call. They are integration tests which
33
outgoing call and receiving an incoming call. They are integration tests which
38
5
cover dialer-app itself, all the user session APIs below it (libofono-qt,
34
cover dialer-app itself, all the user session APIs below it (libofono-qt,
39
@@ -11,20 +40,30 @@
40
11
The tests should run on both a desktop (like an Ubuntu desktop live session or
40
The tests should run on both a desktop (like an Ubuntu desktop live session or
41
12
Otto [http://launchpad.net/otto]) and a phone environment.
41
Otto [http://launchpad.net/otto]) and a phone environment.
42
13
42
45
14
How to run the tests
43
46
15
--------------------
44
Running the autopilot tests with the installed app
47
45
--------------------------------------------------
48
46
49
16
The easiest and standard way across Ubuntu phablet packages is to install the
47
The easiest and standard way across Ubuntu phablet packages is to install the
50
17
dialer-app-autopilot package and run the tests from the system Python path:
48
dialer-app-autopilot package and run the tests from the system Python path:
51
18
49
54
19
  sudo apt-get install dialer-app-autopilot
50
    $ sudo apt-get install dialer-app-autopilot
55
20
  autopilot run dialer_app
51
    $ autopilot3 run dialer_app
56
21
52
57
22
dialer-app-autopilot depends on ofono-phonesim-autostart to set up the
53
dialer-app-autopilot depends on ofono-phonesim-autostart to set up the
58
23
simulated Modem automatically, and all the other additional test dependencies
54
simulated Modem automatically, and all the other additional test dependencies
59
24
for autopilot. You can also run the tests right out of the source tree for
55
for autopilot. You can also run the tests right out of the source tree for
60
25
development:
56
development:
61
26
57
64
27
  cd tests/autopilot
58
    $ cd tests/autopilot
65
28
  autopilot run dialer_app
59
    $ autopilot3 run dialer_app
66
29
60
67
30
(but you still need all the dialer-app-autopilot dependencies installed).
61
(but you still need all the dialer-app-autopilot dependencies installed).
68
62
69
63
70
64
Running the autopilot tests with the built app
71
65
----------------------------------------------
72
66
73
67
After building the app, the autopilot tests can be run with:
74
68
75
69
    $ make test-autopilot
76
31
70
77
=== added file 'README'
78
--- README	1970-01-01 00:00:00 +0000
79
+++ README	2014-09-02 23:04:44 +0000
80
@@ -0,0 +1,8 @@
81
1
dialer-app
82
2
==========
83
3
84
4
Dialer application for Ubuntu Touch.
85
5
86
6
You can find information on how to compile and run this program in
87
7
the HACKING file, and you can find licensing information in the
88
8
COPYING files.
89
0
9
90
=== modified file 'tests/CMakeLists.txt'
91
--- tests/CMakeLists.txt	2014-05-22 14:25:18 +0000
92
+++ tests/CMakeLists.txt	2014-09-02 23:04:44 +0000
93
@@ -1,8 +1,1 @@
102
1
set(AUTOPILOT_DIR autopilot/dialer_app)
1
add_subdirectory(autopilot)
95
2
96
3
execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
97
4
    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
98
5
99
6
install(DIRECTORY ${AUTOPILOT_DIR}
100
7
    DESTINATION ${PYTHON_PACKAGE_DIR}
101
8
    )
103
9
2
104
=== added file 'tests/autopilot/CMakeLists.txt'
105
--- tests/autopilot/CMakeLists.txt	1970-01-01 00:00:00 +0000
106
+++ tests/autopilot/CMakeLists.txt	2014-09-02 23:04:44 +0000
107
@@ -0,0 +1,13 @@
108
1
set(AUTOPILOT_DIR dialer_app)
109
2
110
3
execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
111
4
    OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
112
5
113
6
install(DIRECTORY ${AUTOPILOT_DIR}
114
7
    DESTINATION ${PYTHON_PACKAGE_DIR}
115
8
    )
116
9
117
10
add_custom_target(test-autopilot
118
11
    BUILD_DIR=${CMAKE_BINARY_DIR} autopilot3 run -v ${AUTOPILOT_DIR}
119
12
    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
120
13
)
121
0
14
122
=== modified file 'tests/autopilot/dialer_app/ListItemWithActions.py'
123
--- tests/autopilot/dialer_app/ListItemWithActions.py	2014-09-02 23:04:44 +0000
124
+++ tests/autopilot/dialer_app/ListItemWithActions.py	2014-09-02 23:04:44 +0000
125
@@ -7,7 +7,7 @@
126
7
# under the terms of the GNU General Public License version 3, as published
7
# under the terms of the GNU General Public License version 3, as published
127
8
# by the Free Software Foundation.
8
# by the Free Software Foundation.
128
9
9
130
10
"""Dialer app autopilot emulators."""
10
"""Dialer app autopilot custom proxy objects."""
131
11
11
132
12
from ubuntuuitoolkit._custom_proxy_objects import _common
12
from ubuntuuitoolkit._custom_proxy_objects import _common
133
13
13
134
@@ -23,6 +23,7 @@
135
23
        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
23
        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
136
24
24
137
25
25
138
26
139
26
class HistoryDelegate(ListItemWithActions):
27
class HistoryDelegate(ListItemWithActions):
140
27
28
141
28
    """Autopilot helper for the History delegate."""
29
    """Autopilot helper for the History delegate."""
142
29
30
143
=== renamed file 'tests/autopilot/dialer_app/emulators.py' => 'tests/autopilot/dialer_app/__init__.py'
144
--- tests/autopilot/dialer_app/emulators.py	2014-08-08 15:01:33 +0000
145
+++ tests/autopilot/dialer_app/__init__.py	2014-09-02 23:04:44 +0000
146
@@ -1,5 +1,5 @@
147
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
149
2
# Copyright 2013 Canonical
2
# Copyright 2013, 2014 Canonical
150
3
#
3
#
151
4
# This file is part of dialer-app.
4
# This file is part of dialer-app.
152
5
#
5
#
153
@@ -7,14 +7,15 @@
154
7
# under the terms of the GNU General Public License version 3, as published
7
# under the terms of the GNU General Public License version 3, as published
155
8
# by the Free Software Foundation.
8
# by the Free Software Foundation.
156
9
9
158
10
"""Dialer app autopilot emulators."""
10
"""Dialer app autopilot custom proxy objects."""
159
11
11
160
12
from autopilot.introspection.dbus import StateNotFoundError
161
13
from ubuntuuitoolkit import emulators as toolkit_emulators
162
14
import logging
12
import logging
163
15
13
166
16
14
import ubuntuuitoolkit
167
17
class MainView(toolkit_emulators.MainView):
15
from autopilot import exceptions as autopilot_exceptions
168
16
169
17
170
18
class MainView(ubuntuuitoolkit.MainView):
171
18
    def __init__(self, *args):
19
    def __init__(self, *args):
172
19
        super().__init__(*args)
20
        super().__init__(*args)
173
20
        self.logger = logging.getLogger(__name__)
21
        self.logger = logging.getLogger(__name__)
174
@@ -56,16 +57,17 @@
175
56
57
176
57
58
177
58
class PageWithBottomEdge(MainView):
59
class PageWithBottomEdge(MainView):
180
59
    """An emulator class that makes it easy to interact with the bottom edge
60
181
60
       swipe page"""
61
    """Autopilot custom proxy object for PageWithBottomEdge components."""
182
61
62
183
62
    def reveal_bottom_edge_page(self):
63
    def reveal_bottom_edge_page(self):
184
63
        """Bring the bottom edge page to the screen"""
64
        """Bring the bottom edge page to the screen"""
185
64
        self.bottomEdgePageLoaded.wait_for(True)
65
        self.bottomEdgePageLoaded.wait_for(True)
186
65
        try:
66
        try:
187
66
            action_item = self.wait_select_single(objectName='bottomEdgeTip')
67
            action_item = self.wait_select_single(objectName='bottomEdgeTip')
190
67
            start_x = (action_item.globalRect.x +
68
            start_x = (
191
68
                      (action_item.globalRect.width * 0.5))
69
                action_item.globalRect.x +
192
70
                (action_item.globalRect.width * 0.5))
193
69
            # Start swiping from the top of the component because after some
71
            # Start swiping from the top of the component because after some
194
70
            # seconds it gets almost fully hidden. The center will be out of
72
            # seconds it gets almost fully hidden. The center will be out of
195
71
            # view.
73
            # view.
196
@@ -74,7 +76,7 @@
197
74
            self.pointing_device.drag(start_x, start_y, start_x, stop_y,
76
            self.pointing_device.drag(start_x, start_y, start_x, stop_y,
198
75
                                      rate=2)
77
                                      rate=2)
199
76
            self.isReady.wait_for(True)
78
            self.isReady.wait_for(True)
201
77
        except StateNotFoundError:
79
        except autopilot_exceptions.StateNotFoundError:
202
78
            self.logger.error('BottomEdge element not found.')
80
            self.logger.error('BottomEdge element not found.')
203
79
            raise
81
            raise
204
80
82
205
81
83
206
=== removed file 'tests/autopilot/dialer_app/__init__.py'
207
--- tests/autopilot/dialer_app/__init__.py	2013-07-16 14:05:40 +0000
208
+++ tests/autopilot/dialer_app/__init__.py	1970-01-01 00:00:00 +0000
209
@@ -1,10 +0,0 @@
210
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
211
2
# Copyright 2012 Canonical
212
3
#
213
4
# This file is part of dialer-app.
214
5
#
215
6
# dialer-app is free software: you can redistribute it and/or modify it
216
7
# under the terms of the GNU General Public License version 3, as published
217
8
# by the Free Software Foundation.
218
9
219
10
"""Marumbi autopilot tests and emulators - top level package."""
220
11
0
221
=== modified file 'tests/autopilot/dialer_app/tests/__init__.py'
222
--- tests/autopilot/dialer_app/tests/__init__.py	2014-09-02 23:04:44 +0000
223
+++ tests/autopilot/dialer_app/tests/__init__.py	2014-09-02 23:04:44 +0000
224
@@ -1,5 +1,5 @@
225
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
227
2
# Copyright 2012, 2013 Canonical
2
# Copyright 2012, 2013, 2014 Canonical
228
3
#
3
#
229
4
# This file is part of dialer-app.
4
# This file is part of dialer-app.
230
5
#
5
#
231
@@ -9,21 +9,19 @@
232
9
9
233
10
"""Dialer App autopilot tests."""
10
"""Dialer App autopilot tests."""
234
11
11
235
12
import logging
236
13
import os
237
14
238
12
import fixtures
15
import fixtures
240
13
from autopilot.input import Mouse, Touch, Pointer
16
import ubuntuuitoolkit
241
14
from autopilot.matchers import Eventually
17
from autopilot.matchers import Eventually
242
15
from autopilot.platform import model
243
16
from autopilot.testcase import AutopilotTestCase
18
from autopilot.testcase import AutopilotTestCase
244
17
from testtools.matchers import Equals
19
from testtools.matchers import Equals
250
18
from ubuntuuitoolkit import (
20
from ubuntuuitoolkit import fixture_setup
251
19
    emulators as toolkit_emulators,
21
252
20
    fixture_setup
22
import dialer_app
248
21
)
249
22
from dialer_app import emulators
253
23
from dialer_app import helpers
23
from dialer_app import helpers
254
24
24
255
25
import os
256
26
import logging
257
27
25
258
28
logger = logging.getLogger(__name__)
26
logger = logging.getLogger(__name__)
259
29
27
260
@@ -39,27 +37,13 @@
261
39
37
262
40
    """
38
    """
263
41
39
274
42
    if model() == 'Desktop':
40
    LOCAL_BINARY_PATH = 'src/dialer-app'
275
43
        scenarios = [
41
    # The path to the locally built binary, relative to the build directory.
266
44
            ('with mouse', dict(input_device_class=Mouse)),
267
45
        ]
268
46
    else:
269
47
        scenarios = [
270
48
            ('with touch', dict(input_device_class=Touch)),
271
49
        ]
272
50
273
51
    local_location = "../../src/dialer-app"
276
52
42
277
53
    def setUp(self):
43
    def setUp(self):
278
54
        self.pointing_device = Pointer(self.input_device_class.create())
279
55
        super().setUp()
44
        super().setUp()
280
56
281
57
        self.set_up_locale()
45
        self.set_up_locale()
287
58
46
        self.launch_application()
283
59
        if os.path.exists(self.local_location):
284
60
            self.launch_test_local()
285
61
        else:
286
62
            self.launch_test_installed()
288
63
47
289
64
        self.assertThat(self.main_view.visible, Eventually(Equals(True)))
48
        self.assertThat(self.main_view.visible, Eventually(Equals(True)))
290
65
49
291
@@ -73,24 +57,27 @@
292
73
            fixture_setup.InitctlEnvironmentVariable(LANGUAGE='en')
57
            fixture_setup.InitctlEnvironmentVariable(LANGUAGE='en')
293
74
        )
58
        )
294
75
59
296
76
    def launch_test_local(self):
60
    def launch_application(self):
297
61
        build_dir = os.environ.get('BUILD_DIR', None)
298
62
        if build_dir is not None:
299
63
            self.launch_built_application(build_dir)
300
64
        else:
301
65
            self.launch_installed_application()
302
66
303
67
    def launch_built_application(self, build_dir):
304
68
        binary_path = os.path.join(build_dir, self.LOCAL_BINARY_PATH)
305
77
        self.app = self.launch_test_application(
69
        self.app = self.launch_test_application(
307
78
            self.local_location,
70
            binary_path,
308
79
            app_type='qt',
71
            app_type='qt',
310
80
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase
72
            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase
311
81
        )
73
        )
312
82
74
314
83
    def launch_test_installed(self):
75
    def launch_installed_application(self):
315
84
        self.app = self.launch_upstart_application(
76
        self.app = self.launch_upstart_application(
316
85
            'dialer-app',
77
            'dialer-app',
323
86
            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase
78
            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase
318
87
        )
319
88
320
89
    def _click_object(self, objectName):
321
90
        self.pointing_device.click_object(
322
91
            self.app.wait_select_single(objectName=objectName)
324
92
        )
79
        )
325
93
80
326
94
    @property
81
    @property
327
95
    def main_view(self):
82
    def main_view(self):
329
96
        return self.app.wait_select_single(emulators.MainView)
83
        return self.app.wait_select_single(dialer_app.MainView)
330
97
84
331
=== modified file 'tests/autopilot/dialer_app/tests/test_calls.py'
332
--- tests/autopilot/dialer_app/tests/test_calls.py	2014-08-26 13:35:46 +0000
333
+++ tests/autopilot/dialer_app/tests/test_calls.py	2014-09-02 23:04:44 +0000
334
@@ -69,7 +69,8 @@
335
69
    def get_history_for_number(self, number):
69
    def get_history_for_number(self, number):
336
70
        # because of the bottom edge tree structure, multiple copies of the
70
        # because of the bottom edge tree structure, multiple copies of the
337
71
        # same item are returned, so just use the first one
71
        # same item are returned, so just use the first one
339
72
        return self.history_list.select_many("HistoryDelegate", phoneNumber=number)[0]
72
        return self.history_list.select_many(
340
73
            "HistoryDelegate", phoneNumber=number)[0]
341
73
74
342
74
    def test_outgoing_noanswer(self):
75
    def test_outgoing_noanswer(self):
343
75
        """Outgoing call to a normal number, no answer"""
76
        """Outgoing call to a normal number, no answer"""
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-09-03
Gustavo Pichorim Boiko (community)		2014-08-13	Approve on 2014-09-03
Nicholas Skaggs (community)			Approve on 2014-08-14
Chris Gagnon (community)		2014-08-13	Needs Fixing on 2014-08-14
Review via email: mp+230687@code.launchpad.net
1	=== modified file 'HACKING'
2	--- HACKING 2013-11-13 06:22:09 +0000
3	+++ HACKING 2014-09-02 23:04:44 +0000
4	@@ -1,5 +1,34 @@
5			1	dialer-app hacking guide
6			2	========================
7			3
8			4	Getting dialer-app
9			5	------------------
10			6
11			7	To get the main development branch of dialer-app:
12			8
13			9	$ bzr branch lp:dialer-app
14			10
15			11
16			12	Building the app
17			13	----------------
18			14
19			15	This app is built using cmake. Here's an example on how to build it:
20			16
21			17	$ cmake .
22			18	$ make -j 8
23			19
24			20
25			21	Running the built app
26			22	---------------------
27			23
28			24	After building the app, it can be run with:
29			25
30			26	$ ./src/dialer-app
31			27
32			28
33	1	Test coverage	29	Test coverage
34	2	-------------	30	-------------
35			31
36	3	dialer-app has autopilot tests which cover basic use cases like making an	32	dialer-app has autopilot tests which cover basic use cases like making an
37	4	outgoing call and receiving an incoming call. They are integration tests which	33	outgoing call and receiving an incoming call. They are integration tests which
38	5	cover dialer-app itself, all the user session APIs below it (libofono-qt,	34	cover dialer-app itself, all the user session APIs below it (libofono-qt,
39	@@ -11,20 +40,30 @@
40	11	The tests should run on both a desktop (like an Ubuntu desktop live session or	40	The tests should run on both a desktop (like an Ubuntu desktop live session or
41	12	Otto [http://launchpad.net/otto]) and a phone environment.	41	Otto [http://launchpad.net/otto]) and a phone environment.
42	13		42
45	14	How to run the tests	43
46	15	--------------------	44	Running the autopilot tests with the installed app
47			45	--------------------------------------------------
48			46
49	16	The easiest and standard way across Ubuntu phablet packages is to install the	47	The easiest and standard way across Ubuntu phablet packages is to install the
50	17	dialer-app-autopilot package and run the tests from the system Python path:	48	dialer-app-autopilot package and run the tests from the system Python path:
51	18		49
54	19	sudo apt-get install dialer-app-autopilot	50	$ sudo apt-get install dialer-app-autopilot
55	20	autopilot run dialer_app	51	$ autopilot3 run dialer_app
56	21		52
57	22	dialer-app-autopilot depends on ofono-phonesim-autostart to set up the	53	dialer-app-autopilot depends on ofono-phonesim-autostart to set up the
58	23	simulated Modem automatically, and all the other additional test dependencies	54	simulated Modem automatically, and all the other additional test dependencies
59	24	for autopilot. You can also run the tests right out of the source tree for	55	for autopilot. You can also run the tests right out of the source tree for
60	25	development:	56	development:
61	26		57
64	27	cd tests/autopilot	58	$ cd tests/autopilot
65	28	autopilot run dialer_app	59	$ autopilot3 run dialer_app
66	29		60
67	30	(but you still need all the dialer-app-autopilot dependencies installed).	61	(but you still need all the dialer-app-autopilot dependencies installed).
68			62
69			63
70			64	Running the autopilot tests with the built app
71			65	----------------------------------------------
72			66
73			67	After building the app, the autopilot tests can be run with:
74			68
75			69	$ make test-autopilot
76	31		70
77	=== added file 'README'
78	--- README 1970-01-01 00:00:00 +0000
79	+++ README 2014-09-02 23:04:44 +0000
80	@@ -0,0 +1,8 @@
81			1	dialer-app
82			2	==========
83			3
84			4	Dialer application for Ubuntu Touch.
85			5
86			6	You can find information on how to compile and run this program in
87			7	the HACKING file, and you can find licensing information in the
88			8	COPYING files.
89	0		9
90	=== modified file 'tests/CMakeLists.txt'
91	--- tests/CMakeLists.txt 2014-05-22 14:25:18 +0000
92	+++ tests/CMakeLists.txt 2014-09-02 23:04:44 +0000
93	@@ -1,8 +1,1 @@
102	1	set(AUTOPILOT_DIR autopilot/dialer_app)	1	add_subdirectory(autopilot)
95	2
96	3	execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
97	4	OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
98	5
99	6	install(DIRECTORY ${AUTOPILOT_DIR}
100	7	DESTINATION ${PYTHON_PACKAGE_DIR}
101	8	)
103	9		2
104	=== added file 'tests/autopilot/CMakeLists.txt'
105	--- tests/autopilot/CMakeLists.txt 1970-01-01 00:00:00 +0000
106	+++ tests/autopilot/CMakeLists.txt 2014-09-02 23:04:44 +0000
107	@@ -0,0 +1,13 @@
108			1	set(AUTOPILOT_DIR dialer_app)
109			2
110			3	execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
111			4	OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
112			5
113			6	install(DIRECTORY ${AUTOPILOT_DIR}
114			7	DESTINATION ${PYTHON_PACKAGE_DIR}
115			8	)
116			9
117			10	add_custom_target(test-autopilot
118			11	BUILD_DIR=${CMAKE_BINARY_DIR} autopilot3 run -v ${AUTOPILOT_DIR}
119			12	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
120			13	)
121	0		14
122	=== modified file 'tests/autopilot/dialer_app/ListItemWithActions.py'
123	--- tests/autopilot/dialer_app/ListItemWithActions.py 2014-09-02 23:04:44 +0000
124	+++ tests/autopilot/dialer_app/ListItemWithActions.py 2014-09-02 23:04:44 +0000
125	@@ -7,7 +7,7 @@
126	7	# under the terms of the GNU General Public License version 3, as published	7	# under the terms of the GNU General Public License version 3, as published
127	8	# by the Free Software Foundation.	8	# by the Free Software Foundation.
128	9		9
130	10	"""Dialer app autopilot emulators."""	10	"""Dialer app autopilot custom proxy objects."""
131	11		11
132	12	from ubuntuuitoolkit._custom_proxy_objects import _common	12	from ubuntuuitoolkit._custom_proxy_objects import _common
133	13		13
134	@@ -23,6 +23,7 @@
135	23	self.pointing_device.drag(start_x, start_y, stop_x, stop_y)	23	self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
136	24		24
137	25		25
138			26
139	26	class HistoryDelegate(ListItemWithActions):	27	class HistoryDelegate(ListItemWithActions):
140	27		28
141	28	"""Autopilot helper for the History delegate."""	29	"""Autopilot helper for the History delegate."""
142	29		30
143	=== renamed file 'tests/autopilot/dialer_app/emulators.py' => 'tests/autopilot/dialer_app/__init__.py'
144	--- tests/autopilot/dialer_app/emulators.py 2014-08-08 15:01:33 +0000
145	+++ tests/autopilot/dialer_app/__init__.py 2014-09-02 23:04:44 +0000
146	@@ -1,5 +1,5 @@
147	1	# -- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 --	1	# -- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 --
149	2	# Copyright 2013 Canonical	2	# Copyright 2013, 2014 Canonical
150	3	#	3	#
151	4	# This file is part of dialer-app.	4	# This file is part of dialer-app.
152	5	#	5	#
153	@@ -7,14 +7,15 @@
154	7	# under the terms of the GNU General Public License version 3, as published	7	# under the terms of the GNU General Public License version 3, as published
155	8	# by the Free Software Foundation.	8	# by the Free Software Foundation.
156	9		9
158	10	"""Dialer app autopilot emulators."""	10	"""Dialer app autopilot custom proxy objects."""
159	11		11
160	12	from autopilot.introspection.dbus import StateNotFoundError
161	13	from ubuntuuitoolkit import emulators as toolkit_emulators
162	14	import logging	12	import logging
163	15		13
166	16		14	import ubuntuuitoolkit
167	17	class MainView(toolkit_emulators.MainView):	15	from autopilot import exceptions as autopilot_exceptions
168			16
169			17
170			18	class MainView(ubuntuuitoolkit.MainView):
171	18	def __init__(self, *args):	19	def __init__(self, *args):
172	19	super().__init__(*args)	20	super().__init__(*args)
173	20	self.logger = logging.getLogger(__name__)	21	self.logger = logging.getLogger(__name__)
174	@@ -56,16 +57,17 @@
175	56		57
176	57		58
177	58	class PageWithBottomEdge(MainView):	59	class PageWithBottomEdge(MainView):
180	59	"""An emulator class that makes it easy to interact with the bottom edge	60
181	60	swipe page"""	61	"""Autopilot custom proxy object for PageWithBottomEdge components."""
182	61		62
183	62	def reveal_bottom_edge_page(self):	63	def reveal_bottom_edge_page(self):
184	63	"""Bring the bottom edge page to the screen"""	64	"""Bring the bottom edge page to the screen"""
185	64	self.bottomEdgePageLoaded.wait_for(True)	65	self.bottomEdgePageLoaded.wait_for(True)
186	65	try:	66	try:
187	66	action_item = self.wait_select_single(objectName='bottomEdgeTip')	67	action_item = self.wait_select_single(objectName='bottomEdgeTip')
190	67	start_x = (action_item.globalRect.x +	68	start_x = (
191	68	(action_item.globalRect.width * 0.5))	69	action_item.globalRect.x +
192			70	(action_item.globalRect.width * 0.5))
193	69	# Start swiping from the top of the component because after some	71	# Start swiping from the top of the component because after some
194	70	# seconds it gets almost fully hidden. The center will be out of	72	# seconds it gets almost fully hidden. The center will be out of
195	71	# view.	73	# view.
196	@@ -74,7 +76,7 @@
197	74	self.pointing_device.drag(start_x, start_y, start_x, stop_y,	76	self.pointing_device.drag(start_x, start_y, start_x, stop_y,
198	75	rate=2)	77	rate=2)
199	76	self.isReady.wait_for(True)	78	self.isReady.wait_for(True)
201	77	except StateNotFoundError:	79	except autopilot_exceptions.StateNotFoundError:
202	78	self.logger.error('BottomEdge element not found.')	80	self.logger.error('BottomEdge element not found.')
203	79	raise	81	raise
204	80		82
205	81		83
206	=== removed file 'tests/autopilot/dialer_app/__init__.py'
207	--- tests/autopilot/dialer_app/__init__.py 2013-07-16 14:05:40 +0000
208	+++ tests/autopilot/dialer_app/__init__.py 1970-01-01 00:00:00 +0000
209	@@ -1,10 +0,0 @@
210	1	# -- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 --
211	2	# Copyright 2012 Canonical
212	3	#
213	4	# This file is part of dialer-app.
214	5	#
215	6	# dialer-app is free software: you can redistribute it and/or modify it
216	7	# under the terms of the GNU General Public License version 3, as published
217	8	# by the Free Software Foundation.
218	9
219	10	"""Marumbi autopilot tests and emulators - top level package."""
220	11		0
221	=== modified file 'tests/autopilot/dialer_app/tests/__init__.py'
222	--- tests/autopilot/dialer_app/tests/__init__.py 2014-09-02 23:04:44 +0000
223	+++ tests/autopilot/dialer_app/tests/__init__.py 2014-09-02 23:04:44 +0000
224	@@ -1,5 +1,5 @@
225	1	# -- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 --	1	# -- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 --
227	2	# Copyright 2012, 2013 Canonical	2	# Copyright 2012, 2013, 2014 Canonical
228	3	#	3	#
229	4	# This file is part of dialer-app.	4	# This file is part of dialer-app.
230	5	#	5	#
231	@@ -9,21 +9,19 @@
232	9		9
233	10	"""Dialer App autopilot tests."""	10	"""Dialer App autopilot tests."""
234	11		11
235			12	import logging
236			13	import os
237			14
238	12	import fixtures	15	import fixtures
240	13	from autopilot.input import Mouse, Touch, Pointer	16	import ubuntuuitoolkit
241	14	from autopilot.matchers import Eventually	17	from autopilot.matchers import Eventually
242	15	from autopilot.platform import model
243	16	from autopilot.testcase import AutopilotTestCase	18	from autopilot.testcase import AutopilotTestCase
244	17	from testtools.matchers import Equals	19	from testtools.matchers import Equals
250	18	from ubuntuuitoolkit import (	20	from ubuntuuitoolkit import fixture_setup
251	19	emulators as toolkit_emulators,	21
252	20	fixture_setup	22	import dialer_app
248	21	)
249	22	from dialer_app import emulators
253	23	from dialer_app import helpers	23	from dialer_app import helpers
254	24		24
255	25	import os
256	26	import logging
257	27		25
258	28	logger = logging.getLogger(__name__)	26	logger = logging.getLogger(__name__)
259	29		27
260	@@ -39,27 +37,13 @@
261	39		37
262	40	"""	38	"""
263	41		39
274	42	if model() == 'Desktop':	40	LOCAL_BINARY_PATH = 'src/dialer-app'
275	43	scenarios = [	41	# The path to the locally built binary, relative to the build directory.
266	44	('with mouse', dict(input_device_class=Mouse)),
267	45	]
268	46	else:
269	47	scenarios = [
270	48	('with touch', dict(input_device_class=Touch)),
271	49	]
272	50
273	51	local_location = "../../src/dialer-app"
276	52		42
277	53	def setUp(self):	43	def setUp(self):
278	54	self.pointing_device = Pointer(self.input_device_class.create())
279	55	super().setUp()	44	super().setUp()
280	56
281	57	self.set_up_locale()	45	self.set_up_locale()
287	58		46	self.launch_application()
283	59	if os.path.exists(self.local_location):
284	60	self.launch_test_local()
285	61	else:
286	62	self.launch_test_installed()
288	63		47
289	64	self.assertThat(self.main_view.visible, Eventually(Equals(True)))	48	self.assertThat(self.main_view.visible, Eventually(Equals(True)))
290	65		49
291	@@ -73,24 +57,27 @@
292	73	fixture_setup.InitctlEnvironmentVariable(LANGUAGE='en')	57	fixture_setup.InitctlEnvironmentVariable(LANGUAGE='en')
293	74	)	58	)
294	75		59
296	76	def launch_test_local(self):	60	def launch_application(self):
297			61	build_dir = os.environ.get('BUILD_DIR', None)
298			62	if build_dir is not None:
299			63	self.launch_built_application(build_dir)
300			64	else:
301			65	self.launch_installed_application()
302			66
303			67	def launch_built_application(self, build_dir):
304			68	binary_path = os.path.join(build_dir, self.LOCAL_BINARY_PATH)
305	77	self.app = self.launch_test_application(	69	self.app = self.launch_test_application(
307	78	self.local_location,	70	binary_path,
308	79	app_type='qt',	71	app_type='qt',
310	80	emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase	72	emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase
311	81	)	73	)
312	82		74
314	83	def launch_test_installed(self):	75	def launch_installed_application(self):
315	84	self.app = self.launch_upstart_application(	76	self.app = self.launch_upstart_application(
316	85	'dialer-app',	77	'dialer-app',
323	86	emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase	78	emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase
318	87	)
319	88
320	89	def _click_object(self, objectName):
321	90	self.pointing_device.click_object(
322	91	self.app.wait_select_single(objectName=objectName)
324	92	)	79	)
325	93		80
326	94	@property	81	@property
327	95	def main_view(self):	82	def main_view(self):
329	96	return self.app.wait_select_single(emulators.MainView)	83	return self.app.wait_select_single(dialer_app.MainView)
330	97		84
331	=== modified file 'tests/autopilot/dialer_app/tests/test_calls.py'
332	--- tests/autopilot/dialer_app/tests/test_calls.py 2014-08-26 13:35:46 +0000
333	+++ tests/autopilot/dialer_app/tests/test_calls.py 2014-09-02 23:04:44 +0000
334	@@ -69,7 +69,8 @@
335	69	def get_history_for_number(self, number):	69	def get_history_for_number(self, number):
336	70	# because of the bottom edge tree structure, multiple copies of the	70	# because of the bottom edge tree structure, multiple copies of the
337	71	# same item are returned, so just use the first one	71	# same item are returned, so just use the first one
339	72	return self.history_list.select_many("HistoryDelegate", phoneNumber=number)[0]	72	return self.history_list.select_many(
340			73	"HistoryDelegate", phoneNumber=number)[0]
341	73		74
342	74	def test_outgoing_noanswer(self):	75	def test_outgoing_noanswer(self):
343	75	"""Outgoing call to a normal number, no answer"""	76	"""Outgoing call to a normal number, no answer"""