git.iko.soy/unity8
on xenial help sign in
Adapt test
93a63d1Albert Astals
tests/qmltests/Dash/tst_GenericScopeView.qml+12−9
compare with xenial
unifiedsplit
@@ -61,8 +61,8 @@ Item {
61 property Item header: findChild(genericScopeView, "scopePageHeader")
61 property Item header: findChild(genericScopeView, "scopePageHeader")
62
62
63 function init() {
63 function init() {
64− genericScopeView.scope = scopes.getScope(1)
64+ genericScopeView.scope = scopes.getScope(2);
65− shell.width = units.gu(120)
65+ shell.width = units.gu(120);
66 genericScopeView.categoryView.positionAtBeginning();
66 genericScopeView.categoryView.positionAtBeginning();
67 waitForRendering(genericScopeView.categoryView);
67 waitForRendering(genericScopeView.categoryView);
68 }
68 }
@@ -88,13 +88,13 @@ Item {
88
88
89 function test_showDash() {
89 function test_showDash() {
90 testCase.previewListView.open = true;
90 testCase.previewListView.open = true;
91− scopes.getScope(1).showDash();
91+ genericScopeView.scope.showDash();
92 tryCompare(testCase.previewListView, "open", false);
92 tryCompare(testCase.previewListView, "open", false);
93 }
93 }
94
94
95 function test_hideDash() {
95 function test_hideDash() {
96 testCase.previewListView.open = true;
96 testCase.previewListView.open = true;
97− scopes.getScope(1).hideDash();
97+ genericScopeView.scope.hideDash();
98 tryCompare(testCase.previewListView, "open", false);
98 tryCompare(testCase.previewListView, "open", false);
99 }
99 }
100
100
@@ -111,8 +111,9 @@ Item {
111
111
112 function test_changeScope() {
112 function test_changeScope() {
113 genericScopeView.scope.searchQuery = "test"
113 genericScopeView.scope.searchQuery = "test"
114− genericScopeView.scope = scopes.getScope(2)
114+ var originalScopeId = genericScopeView.scope.id;
115− genericScopeView.scope = scopes.getScope(1)
115+ genericScopeView.scope = scopes.getScope(originalScopeId + 1)
116+ genericScopeView.scope = scopes.getScope(originalScopeId)
116 tryCompare(genericScopeView.scope, "searchQuery", "test")
117 tryCompare(genericScopeView.scope, "searchQuery", "test")
117 }
118 }
118
119
@@ -198,6 +199,8 @@ Item {
198 openPreview(4, 0);
199 openPreview(4, 0);
199
200
200 compare(testCase.previewListView.count, 12, "There should only be 12 items in preview.");
201 compare(testCase.previewListView.count, 12, "There should only be 12 items in preview.");
202+
203+ closePreview();
201 }
204 }
202
205
203 function test_narrow_delegate_ranges_expand() {
206 function test_narrow_delegate_ranges_expand() {
@@ -232,7 +235,7 @@ Item {
232 }
235 }
233
236
234 function test_single_category_expansion() {
237 function test_single_category_expansion() {
235− genericScopeView.scope = scopes.getScope(4);
238+ genericScopeView.scope = scopes.getScope(3);
236
239
237 tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);
240 tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);
238 var category = findChild(genericScopeView, "dashCategory0")
241 var category = findChild(genericScopeView, "dashCategory0")
@@ -329,8 +332,8 @@ Item {
329 function test_header_style_data() {
332 function test_header_style_data() {
330 return [
333 return [
331 { tag: "Default", index: 0, foreground: "grey", background: "", logo: "" },
334 { tag: "Default", index: 0, foreground: "grey", background: "", logo: "" },
332− { tag: "Foreground", index: 2, foreground: "yellow", background: "", logo: "" },
335+ { tag: "Foreground", index: 1, foreground: "yellow", background: "", logo: "" },
333− { tag: "Logo+Background", index: 3, foreground: "grey", background: "gradient:///lightgrey/grey",
336+ { tag: "Logo+Background", index: 2, foreground: "grey", background: "gradient:///lightgrey/grey",
334 logo: Qt.resolvedUrl("../Components/tst_PageHeader/logo-ubuntu-orange.svg") },
337 logo: Qt.resolvedUrl("../Components/tst_PageHeader/logo-ubuntu-orange.svg") },
335 ];
338 ];
336 }
339 }