@@ -85,7 +85,10 @@ Item {
8585
8686 dash.setCurrentScope(data.tag, true /* animate */, false /* reset */);
8787 compare(dashContent.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
88− compare(tabbar.selectedIndex, data.shouldBeVisible ? data.visualIndex : current_index);
88+
89+ var dashContentList = findChild(dash, "dashContentList");
90+ var expectedTitle = dashContentList.model.get(data.shouldBeVisible ? data.visualIndex : current_index).title
91+ compare(tabbar.title, expectedTitle);
8992 }
9093
9194 function test_show_scope_on_load_data() {
@@ -109,26 +112,5 @@ Item {
109112 verify(dashContentList != undefined);
110113 tryCompare(dashContentList, "currentIndex", data.visualIndex);
111114 }
112−
113− function test_dash_bar_set_index_connection_data() {
114− return get_scope_data()
115− }
116−
117− function test_dash_bar_set_index_connection(data) {
118− if (data.shouldBeVisible == false) {
119− console.log("Not testing " + data.tag + ": not visible");
120− return;
121− }
122− // wait for scopes to load
123− tryCompare(scopes, "loaded", true);
124−
125− var tabbar = findChild(dash, "tabbar");
126− verify(tabbar != undefined)
127− var dashContent = findChild(dash, "dashContent");
128− var current_index = dashContent.currentIndex;
129−
130− tabbar.model.selectedIndex = data.visualIndex;
131− compare(dashContent.currentIndex, data.shouldBeVisible ? data.visualIndex : current_index);
132− }
133115 }
134116}