1
=== modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py'
2
--- tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-06-11 15:36:51 +0000
3
+++ tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-07-10 14:20:25 +0000
4
@@ -115,3 +115,11 @@
5
115
        self.launch_upstart_application(application_name)
115
        self.launch_upstart_application(application_name)
6
116
        self.assertThat(greeter.created, Eventually(Equals(False)))
116
        self.assertThat(greeter.created, Eventually(Equals(False)))
7
117
        self.assert_current_focused_application(application_name)
117
        self.assert_current_focused_application(application_name)
8
118
9
119
    def test_click_dash_icon_must_unfocus_application(self):
10
120
        application_name = self.launch_fake_app()
11
121
        self.assert_current_focused_application(application_name)
12
122
13
123
        self.main_window.show_dash_from_launcher()
14
124
15
125
        self.assert_current_focused_application('')
16
118
126
17
=== modified file 'tests/autopilot/unity8/shell/emulators/launcher.py'
18
--- tests/autopilot/unity8/shell/emulators/launcher.py	2013-11-01 13:59:50 +0000
19
+++ tests/autopilot/unity8/shell/emulators/launcher.py	2014-07-10 14:20:25 +0000
20
@@ -1,7 +1,7 @@
21
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 -*-
22
2
#
2
#
23
3
# Unity Autopilot Test Suite
3
# Unity Autopilot Test Suite
25
4
# Copyright (C) 2012-2013 Canonical
4
# Copyright (C) 2012, 2013, 2014 Canonical
26
5
#
5
#
27
6
# This program is free software: you can redistribute it and/or modify
6
# This program is free software: you can redistribute it and/or modify
28
7
# it under the terms of the GNU General Public License as published by
7
# it under the terms of the GNU General Public License as published by
29
@@ -17,22 +17,43 @@
30
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
17
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
31
18
#
18
#
32
19
19
38
20
from unity8.shell.emulators import UnityEmulatorBase
20
import logging
39
21
from autopilot.input import Touch
21
40
22
22
import autopilot.logging
41
23
23
42
24
class Launcher(UnityEmulatorBase):
24
from unity8.shell import emulators
43
25
44
26
45
27
logger = logging.getLogger(__name__)
46
28
47
29
48
30
class Launcher(emulators.UnityEmulatorBase):
49
25
31
50
26
    """An emulator that understands the Launcher."""
32
    """An emulator that understands the Launcher."""
51
27
33
52
34
    @autopilot.logging.log_action(logger.debug)
53
28
    def show(self):
35
    def show(self):
56
29
        """Swipes open the launcher."""
36
        """Show the launcher swiping it to the right."""
57
30
        touch = Touch.create()
37
        if not self.shown:
58
38
            self._swipe_to_show_launcher()
59
39
            self.shown.wait_for(True)
60
40
        else:
61
41
            logger.debug('The launcher is already opened.')
62
31
42
63
43
    def _swipe_to_show_launcher(self):
64
32
        view = self.get_root_instance().select_single('QQuickView')
44
        view = self.get_root_instance().select_single('QQuickView')
65
45
        start_y = stop_y = view.y + view.height // 2
66
46
67
33
        start_x = view.x + 1
47
        start_x = view.x + 1
73
34
        start_y = view.y + view.height / 2
48
        stop_x = start_x + self.panelWidth - 1
74
35
        stop_x = start_x + self.panelWidth + 1
49
75
36
        stop_y = start_y
50
        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
76
37
        touch.drag(start_x, start_y, stop_x, stop_y)
51
77
38
        self.shown.wait_for(True)
52
    @autopilot.logging.log_action(logger.debug)
78
53
    def click_dash_icon(self):
79
54
        if self.shown:
80
55
            dash_icon = self.select_single(
81
56
                'QQuickImage', objectName='dashItem')
82
57
            self.pointing_device.click_object(dash_icon)
83
58
        else:
84
59
            raise emulators.UnityEmulatorException('The launcher is closed.')
85
39
60
86
=== modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
87
--- tests/autopilot/unity8/shell/emulators/main_window.py	2014-07-09 13:16:20 +0000
88
+++ tests/autopilot/unity8/shell/emulators/main_window.py	2014-07-10 14:20:25 +0000
89
@@ -67,9 +67,6 @@
90
67
    def get_bottombar(self):
67
    def get_bottombar(self):
91
68
        return self.select_single("Bottombar")
68
        return self.select_single("Bottombar")
92
69
69
93
70
    def get_launcher(self):
94
71
        return self.select_single(Launcher)
95
72
96
73
    def get_pinPadLoader(self):
70
    def get_pinPadLoader(self):
97
74
        return self.select_single(
71
        return self.select_single(
98
75
            "QQuickLoader",
72
            "QQuickLoader",
99
@@ -134,3 +131,22 @@
100
134
    @autopilot_logging.log_action(logger.info)
131
    @autopilot_logging.log_action(logger.info)
101
135
    def search(self, query):
132
    def search(self, query):
102
136
        self.get_dash().enter_search_query(query)
133
        self.get_dash().enter_search_query(query)
103
134
104
135
    @autopilot_logging.log_action(logger.info)
105
136
    def show_dash_from_launcher(self):
106
137
        """Open the dash clicking the dash icon on the launcher."""
107
138
        launcher = self.open_launcher()
108
139
        launcher.click_dash_icon()
109
140
        return self.get_dash()
110
141
111
142
    @autopilot_logging.log_action(logger.info)
112
143
    def open_launcher(self):
113
144
        launcher = self._get_launcher()
114
145
        launcher.show()
115
146
        return launcher
116
147
117
148
    def _get_launcher(self):
118
149
        return self.select_single(Launcher)
119
150
120
151
    def is_launcher_open(self):
121
152
        return self._get_launcher().shown
122
137
153
123
=== modified file 'tests/autopilot/unity8/shell/tests/disabled_test_hud.py'
124
--- tests/autopilot/unity8/shell/tests/disabled_test_hud.py	2014-06-18 01:52:15 +0000
125
+++ tests/autopilot/unity8/shell/tests/disabled_test_hud.py	2014-07-10 14:20:25 +0000
126
@@ -184,12 +184,11 @@
127
184
        unity_proxy = self.launch_unity()
184
        unity_proxy = self.launch_unity()
128
185
        unlock_unity(unity_proxy)
185
        unlock_unity(unity_proxy)
129
186
        hud = self.main_window.get_hud()
186
        hud = self.main_window.get_hud()
130
187
        launcher = self.main_window.get_launcher()
131
188
187
132
189
        self._launch_test_app_from_app_screen()
188
        self._launch_test_app_from_app_screen()
133
190
189
134
191
        hud.show()
190
        hud.show()
136
192
        launcher.show()
191
        self.main_window.open_launcher()
137
193
192
138
194
        self.assertThat(hud.shown, Eventually(Equals(False)))
193
        self.assertThat(hud.shown, Eventually(Equals(False)))
139
195
194
140
196
195
141
=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
142
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-07-07 08:51:33 +0000
143
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-07-10 14:20:25 +0000
144
@@ -242,8 +242,8 @@
145
242
        # the shell)
242
        # the shell)
146
243
        time.sleep(1)
243
        time.sleep(1)
147
244
        self.main_window.show_dash_swiping()
244
        self.main_window.show_dash_swiping()
150
245
        launcher = self.main_window.get_launcher()
245
        self.assertThat(
151
246
        self.assertThat(launcher.shown, Eventually(Equals(False)))
246
            self.main_window.is_launcher_open, Eventually(Equals(False)))
152
247
247
153
248
        # verify and interact with the triggered snap-decision notification
248
        # verify and interact with the triggered snap-decision notification
154
249
        notify_list = self._get_notifications_list()
249
        notify_list = self._get_notifications_list()
Status:	Superseded
Proposed branch:	lp:~elopio/unity8/test_open_dash
Merge into:	lp:unity8
Prerequisite:	lp:~elopio/unity8/flake8
Diff against target:	154 lines (+64/-20) 5 files modified tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py (+8/-0) tests/autopilot/unity8/shell/emulators/launcher.py (+34/-13) tests/autopilot/unity8/shell/emulators/main_window.py (+19/-3) tests/autopilot/unity8/shell/tests/disabled_test_hud.py (+1/-2) tests/autopilot/unity8/shell/tests/test_notifications.py (+2/-2)
To merge this branch:	bzr merge lp:~elopio/unity8/test_open_dash
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-07-11
Albert Astals Cid (community)		2014-06-26	Needs Fixing on 2014-07-10
Review via email: mp+224553@code.launchpad.net