git.iko.soy/unity8
on xenial help sign in
Remove dependencies on clickscope.
1341e04Rodney Dawes
debian/control−2
compare with xenial
unifiedsplit
@@ -141,7 +141,6 @@ Depends: dmz-cursor-theme,
141Recommends: indicator-keyboard,
141Recommends: indicator-keyboard,
142 indicator-session,
142 indicator-session,
143 unity-greeter-session-broadcast,
143 unity-greeter-session-broadcast,
144− unity-scope-click,
145Suggests: unity-scope-mediascanner2,
144Suggests: unity-scope-mediascanner2,
146Breaks: indicator-network (<< 0.5.1+14.10.20141014),
145Breaks: indicator-network (<< 0.5.1+14.10.20141014),
147 ubuntu-touch-session (<< 0.107),
146 ubuntu-touch-session (<< 0.107),
@@ -191,7 +190,6 @@ Depends: autopilot-qt5 (>= 1.4),
191 python3-gi,
190 python3-gi,
192 qttestability-autopilot (>= 1.4),
191 qttestability-autopilot (>= 1.4),
193 ubuntu-ui-toolkit-autopilot (>= 1.3.2030),
192 ubuntu-ui-toolkit-autopilot (>= 1.3.2030),
194− unity-scope-click,
195 unity8 (= ${source:Version}),
193 unity8 (= ${source:Version}),
196 unity8-tests (= ${source:Version}),
194 unity8-tests (= ${source:Version}),
197 url-dispatcher-tools,
195 url-dispatcher-tools,
tests/autopilot/unity8/dash.py+1−17
@@ -48,23 +48,7 @@ class Dash(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
48 self.dash_content_list = self.wait_select_single(
48 self.dash_content_list = self.wait_select_single(
49 'QQuickListView', objectName='dashContentList')
49 'QQuickListView', objectName='dashContentList')
50
50
51− def get_applications_grid(self):
52− get_grid = self.get_scope('clickscope').wait_select_single(
53− 'CardGrid', objectName='local')
54− return get_grid
55−
56− def get_application_icon(self, text):
57− """Returns a 'Tile' icon that has the text 'text' from the application
58− grid.
59−
60− :param text: String containing the text of the icon to search for.
61−
62− """
63− app_grid = self.get_applications_grid()
64− resp_grid = app_grid.wait_select_single('ResponsiveGridView')
65− return resp_grid.select_single('Tile', text=text)
66−
67− def get_scope(self, scope_name='clickscope'):
51+ def get_scope(self, scope_name):
68 return self.dash_content_list.wait_select_single(
52 return self.dash_content_list.wait_select_single(
69 'QQuickLoader', scopeId=scope_name)
53 'QQuickLoader', scopeId=scope_name)
70
54
tests/autopilot/unity8/shell/tests/test_helpers.py−49
@@ -99,12 +99,6 @@ class DashHelperTestCase(tests.DashBaseTestCase):
99 self._assert_scope_is_opened(scope, scope_id)
99 self._assert_scope_is_opened(scope, scope_id)
100 self.assertIsInstance(scope, dash_helpers.GenericScopeView)
100 self.assertIsInstance(scope, dash_helpers.GenericScopeView)
101
101
102− def test_open_applications_scope(self):
103− scope_id = 'clickscope'
104− scope = self.dash.open_scope(scope_id)
105− self._assert_scope_is_opened(scope, scope_id)
106− self.assertIsInstance(scope, dash_helpers.GenericScopeView)
107−
108
102
109class GenericScopeViewHelperTestCase(tests.DashBaseTestCase):
103class GenericScopeViewHelperTestCase(tests.DashBaseTestCase):
110
104
@@ -122,46 +116,3 @@ class GenericScopeViewHelperTestCase(tests.DashBaseTestCase):
122 """Open an item that requires swiping to make it visible."""
116 """Open an item that requires swiping to make it visible."""
123 preview = self.generic_scope.open_preview('2', 'Title.2.0')
117 preview = self.generic_scope.open_preview('2', 'Title.2.0')
124 self.assertIsInstance(preview, dash_helpers.Preview)
118 self.assertIsInstance(preview, dash_helpers.Preview)
125−
126−
127−class DashAppsHelperTestCase(tests.DashBaseTestCase):
128−
129− available_applications = [
130− 'Title.2.0', 'Title.2.1', 'Title.2.2', 'Title.2.3', 'Title.2.4',
131− 'Title.2.5', 'Title.2.6', 'Title.2.7', 'Title.2.8', 'Title.2.9',
132− 'Title.2.10', 'Title.2.11', 'Title.2.12', 'Title.2.13', 'Title.2.14',
133− 'Title.2.15', 'Title.2.16', 'Title.2.17', 'Title.2.18']
134−
135− def setUp(self):
136− # Set up the fake scopes before launching unity.
137− self.useFixture(fixture_setup.FakeScopes())
138− super().setUp()
139− self.applications_scope = self.dash.open_scope('clickscope')
140−
141− def test_get_applications_should_return_correct_applications(self):
142− category = '2'
143− category_element = self.applications_scope._get_category_element(
144− category)
145− list_view = self.dash.get_scope('clickscope')\
146− .select_single(dash_helpers.ListViewWithPageHeader)
147− expected_apps_count = self._get_number_of_application_slots(category)
148− expected_applications = self.available_applications[
149− :expected_apps_count]
150− x_center = list_view.globalRect.x + list_view.width / 2
151− y_center = list_view.globalRect.y + list_view.height / 2
152− y_diff = (
153− category_element.y - list_view.height + category_element.height
154− )
155− list_view._slow_drag(x_center, x_center, y_center, y_center - y_diff)
156− applications = self.applications_scope.get_applications(category)
157− self.assertEqual(expected_applications, applications)
158−
159− def _get_number_of_application_slots(self, category):
160− category_element = self.applications_scope._get_category_element(
161− category)
162− cardgrid = category_element.select_single('CardGrid')
163− if (category_element.expanded):
164− return cardgrid.select_single('QQuickGridView').count
165− else:
166− return cardgrid.collapsedRows \
167− * cardgrid.select_single('ResponsiveGridView').columns