1
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
2
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-04-16 21:13:39 +0000
3
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-05-16 08:50:05 +0000
4
@@ -68,15 +68,19 @@
5
68
    def _get_top_container(self):
68
    def _get_top_container(self):
6
69
        """Return the top-most container with a globalRect."""
69
        """Return the top-most container with a globalRect."""
7
70
        root = self.get_root_instance()
70
        root = self.get_root_instance()
17
71
        containers = [root]
71
        parent = self.get_parent()
18
72
        while len(containers) == 1:
72
        top_container = None
19
73
            try:
73
        while parent.id != root.id:
20
74
                containers[0].globalRect
74
            if hasattr(parent, 'globalRect'):
21
75
                return containers[0]
75
                top_container = parent
22
76
            except AttributeError:
76
23
77
                containers = containers[0].get_children()
77
            parent = parent.get_parent()
24
78
78
25
79
        raise _common.ToolkitException("Couldn't find the top-most container.")
79
        if top_container is None:
26
80
            raise _common.ToolkitException(
27
81
                "Couldn't find the top-most container.")
28
82
        else:
29
83
            return top_container
30
80
84
31
81
    def _is_child_visible(self, child, containers):
85
    def _is_child_visible(self, child, containers):
32
82
        """Check if the center of the child is visible.
86
        """Check if the center of the child is visible.
33
83
87
34
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py'
35
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	1970-01-01 00:00:00 +0000
36
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2014-05-16 08:50:05 +0000
37
@@ -0,0 +1,60 @@
38
1
# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
39
2
#
40
3
# Copyright (C) 2014 Canonical Ltd.
41
4
#
42
5
# This program is free software; you can redistribute it and/or modify
43
6
# it under the terms of the GNU Lesser General Public License as published by
44
7
# the Free Software Foundation; version 3.
45
8
#
46
9
# This program is distributed in the hope that it will be useful,
47
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
48
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
49
12
# GNU Lesser General Public License for more details.
50
13
#
51
14
# You should have received a copy of the GNU Lesser General Public License
52
15
# along with this program. If not, see <http://www.gnu.org/licenses/>.
53
16
54
17
55
18
import testtools
56
19
57
20
import ubuntuuitoolkit
58
21
59
22
60
23
class FlickableTestCase(testtools.TestCase):
61
24
62
25
    def test_get_unity_top_container(self):
63
26
        """Test that we can get the top cointainer in Unity."""
64
27
        # This tests bug http://pad.lv/1314390
65
28
        # On Unity, the top container is not the first child as it is in all
66
29
        # the apps that have a MainView. This makes the first implementation of
67
30
        # _get_top_container fail. Instead of going from the top looking for
68
31
        # a container, we should start from the flickable until we find the
69
32
        # top-most container.
70
33
        # FIXME we are faking the QML tree because we have no way to launch
71
34
        # the app with a tree like the one in Unity8. kalikiana has a branch
72
35
        # with an alternate launcher that will let us clean this test.
73
36
        # --elopio - 2014-05-15.
74
37
        RootClass = type('obj', (object,), {'id': 'root'})
75
38
        mock_root_instance = RootClass()
76
39
        # We consider a container is an object with a globalRect.
77
40
        MockNonContainerClass = type('obj', (object,), {})
78
41
        mock_non_container = MockNonContainerClass()
79
42
        MockContainerClass = type(
80
43
            'obj', (object,), {'id': 'container', 'globalRect': 'dummy'})
81
44
        mock_container = MockContainerClass()
82
45
        mock_container.get_parent = lambda: mock_root_instance
83
46
84
47
        # The root instance has two children. This exposes the bug.
85
48
        mock_root_instance.get_children = lambda: [
86
49
            mock_non_container, mock_container]
87
50
88
51
        dummy_state = {'id': '10'}
89
52
        flickable = ubuntuuitoolkit.Flickable(
90
53
            dummy_state, '/dummy'.encode(), 'dummy')
91
54
92
55
        flickable.get_root_instance = lambda: mock_root_instance
93
56
        # The top container of the flickable is its immediate parent.
94
57
        flickable.get_parent = lambda: mock_container
95
58
96
59
        top_container = flickable._get_top_container()
97
60
        self.assertEqual(top_container, mock_container)
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-05-17
Tim Peeters			Approve on 2014-05-15
Cris Dywan		2014-04-29	Needs Information on 2014-05-06
Allan LeSage (community)			Approve on 2014-05-05
Review via email: mp+217693@code.launchpad.net