1
=== modified file 'tests/autopilot/gallery_app/emulators/toolbar.py'
2
--- tests/autopilot/gallery_app/emulators/toolbar.py	2013-11-03 22:47:55 +0000
3
+++ tests/autopilot/gallery_app/emulators/toolbar.py	2014-04-04 16:55:41 +0000
4
@@ -1,5 +1,5 @@
5
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 -*-
7
2
# Copyright 2013 Canonical
2
# Copyright 2013, 2014 Canonical
8
3
#
3
#
9
4
# This program is free software: you can redistribute it and/or modify it
4
# This program is free software: you can redistribute it and/or modify it
10
5
# under the terms of the GNU General Public License version 3, as published
5
# under the terms of the GNU General Public License version 3, as published
11
@@ -15,6 +15,38 @@
12
15
class Toolbar(toolkit_emulators.Toolbar):
15
class Toolbar(toolkit_emulators.Toolbar):
13
16
    """An emulator class that makes it easy to interact with the tool bar"""
16
    """An emulator class that makes it easy to interact with the tool bar"""
14
17
17
15
18
    def click_button(self, object_name):
16
19
        """Click a button of the toolbar.
17
20
18
21
        The toolbar should be opened before clicking the button, or an
19
22
        exception will be raised. If the toolbar is closed for some reason
20
23
        (e.g., timer finishes) after moving the mouse cursor and before
21
24
        clicking the button, it is re-opened automatically by this function.
22
25
23
26
        Overriden from the toolkit because of bug http://pad.lv/1302706
24
27
        TODO remove this method once that bug is fixed on the toolkit.
25
28
        --elopio - 2014-04-04
26
29
27
30
        :parameter object_name: The QML objectName property of the button.
28
31
        :raise ToolkitEmulatorException: If there is no button with that object
29
32
            name.
30
33
31
34
        """
32
35
        # ensure the toolbar is open
33
36
        if not self.opened:
34
37
            raise toolkit_emulators.ToolkitEmulatorException(
35
38
                'Toolbar must be opened before calling click_button().')
36
39
        try:
37
40
            button = self._get_button(object_name)
38
41
        except StateNotFoundError:
39
42
            raise toolkit_emulators.ToolkitEmulatorException(
40
43
                'Button with objectName "{0}" not found.'.format(object_name))
41
44
        self.pointing_device.move_to_object(button)
42
45
        # ensure the toolbar is still open (may have closed due to timeout)
43
46
        self.open()
44
47
        # click the button
45
48
        self.pointing_device.click_object(button)
46
49
47
18
    def click_custom_button(self, object_name):
50
    def click_custom_button(self, object_name):
48
19
        try:
51
        try:
49
20
            button = self.select_single('Button', objectName=object_name)
52
            button = self.select_single('Button', objectName=object_name)
Reviewer	Review Type	Date Requested	Status
Bill Filler (community)		2014-04-04	Approve on 2014-04-08
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-04-07
Review via email: mp+214310@code.launchpad.net