1
=== modified file 'tests/autopilot/unity8/shell/__init__.py'
2
--- tests/autopilot/unity8/shell/__init__.py	2015-01-21 13:50:14 +0000
3
+++ tests/autopilot/unity8/shell/__init__.py	2015-02-17 15:42:02 +0000
4
@@ -27,6 +27,7 @@
5
27
27
6
28
logger = logging.getLogger(__name__)
28
logger = logging.getLogger(__name__)
7
29
29
8
30
9
30
def disable_qml_mocking(fn):
31
def disable_qml_mocking(fn):
10
31
    """Simple decorator that disables the QML mocks from being loaded."""
32
    """Simple decorator that disables the QML mocks from being loaded."""
11
32
    @wraps(fn)
33
    @wraps(fn)
12
33
34
13
=== modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
14
--- tests/autopilot/unity8/shell/emulators/main_window.py	2015-01-21 04:11:36 +0000
15
+++ tests/autopilot/unity8/shell/emulators/main_window.py	2015-02-17 15:42:02 +0000
16
@@ -174,3 +174,20 @@
17
174
            'PinPadButton',
174
            'PinPadButton',
18
175
            objectName='pinPadButton{}'.format(button_id)
175
            objectName='pinPadButton{}'.format(button_id)
19
176
        )
176
        )
20
177
21
178
    @autopilot_logging.log_action(logger.info)
22
179
    def wait_for_notification(self):
23
180
        """Wait for a notification dialog to appear.
24
181
25
182
        :return: An object for the notification dialog data.
26
183
        :raise StateNotFoundError: if the timeout expires when the
27
184
        notification has not appeared.
28
185
29
186
        """
30
187
        notify_list = self.select_single('Notifications',
31
188
                                         objectName='notificationList')
32
189
        visible_notification = notify_list.wait_select_single('Notification',
33
190
                                                              visible=True)
34
191
        return {'summary': visible_notification.summary,
35
192
                'body': visible_notification.body,
36
193
                'iconSource': visible_notification.iconSource}
37
177
194
38
=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
39
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-10-31 10:08:38 +0000
40
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2015-02-17 15:42:02 +0000
41
@@ -701,3 +701,22 @@
42
701
        self.assertThat(get_notification, Eventually(NotEquals(None)))
701
        self.assertThat(get_notification, Eventually(NotEquals(None)))
43
702
        self._assert_notification(
702
        self._assert_notification(
44
703
            get_notification(), summary, body, False, False, 1.0)
703
            get_notification(), summary, body, False, False, 1.0)
45
704
46
705
    def test_notification_helper(self):
47
706
        """ use the create notification script to get a notification dialog.
48
707
        Check that the arguments passed to the script match the fields. """
49
708
50
709
        unity_proxy = self.launch_unity()
51
710
        unlock_unity(unity_proxy)
52
711
53
712
        summary = 'Helper summary'
54
713
        body = 'Helper body'
55
714
56
715
        notification = shell.create_ephemeral_notification(summary, body)
57
716
        notification.show()
58
717
59
718
        notification_data = self.main_window.wait_for_notification()
60
719
61
720
        self.assertThat(notification_data['summary'],
62
721
                        Eventually(Equals(summary)))
63
722
        self.assertThat(notification_data['body'], Eventually(Equals(body)))
Status:	Merged
Approved by:	Albert Astals Cid on 2015-02-18
Approved revision:	1597
Merged at revision:	1624
Proposed branch:	lp:~paulliu/unity8/notification_helper
Merge into:	lp:unity8
Diff against target:	63 lines (+37/-0) 3 files modified tests/autopilot/unity8/shell/__init__.py (+1/-0) tests/autopilot/unity8/shell/emulators/main_window.py (+17/-0) tests/autopilot/unity8/shell/tests/test_notifications.py (+19/-0)
To merge this branch:	bzr merge lp:~paulliu/unity8/notification_helper
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2015-02-10	Approve on 2015-02-18
Allan LeSage (community)			Approve on 2015-02-18
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-02-17
Leo Arias (community)			Approve on 2015-02-17
Review via email: mp+249211@code.launchpad.net