@@ -36,7 +36,6 @@ Item {
3636 Dash {
3737 id: dash
3838 anchors.fill: parent
39− showScopeOnLoaded: "MockScope2"
4039 }
4140
4241 UT.UnityTestCase {
@@ -80,27 +79,6 @@ Item {
8079 return get_scope_data()
8180 }
8281
83− function test_show_scope_on_load(data) {
84− var dashContentList = findChild(dash, "dashContentList");
85−
86− dash.showScopeOnLoaded = data.tag
87− scopes.clear();
88− tryCompare(dashContentList, "count", 0);
89− scopes.load();
90− tryCompare(scopes, "loaded", true);
91− tryCompare(dashContentList, "count", 6);
92−
93− verify(dashContentList != undefined);
94− if (data.visualIndex == -1) {
95− tryCompare(dashContentList, "currentIndex", 0);
96− expectFail(data.tag, "non favorite scopes should not be visble in the scopes model");
97− compare(dashContentList.currentItem.scopeId, data.tag); // this should fail
98− } else {
99− tryCompare(dashContentList, "currentIndex", data.visualIndex);
100− compare(dashContentList.currentItem.scopeId, data.tag);
101− }
102− }
103−
10482 function test_dash_overview_show_select_same_favorite() {
10583 // Show the overview
10684 touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, dash.height - units.gu(18));
@@ -314,7 +292,9 @@ Item {
314292 mouseFlick(dash, startX, startY, stopX, stopY);
315293 compare(dashContentList.currentIndex, 2, "Could not flick to scope id 2");
316294 var dashCommunicatorService = findInvisibleChild(dash, "dashCommunicatorService");
317− dashCommunicatorService.mockSetCurrentScope("clickscope", true, false);
295+ dashCommunicatorService.mockSetCurrentScope(0, true, false);
296+ tryCompare(dashContentList, "currentIndex", 0)
297+ dashCommunicatorService.mockSetCurrentScope(1, true, false);
318298 tryCompare(dashContentList, "currentIndex", 1)
319299 }
320300