@@ -104,9 +104,11 @@ Item {
104104
105105 var indicatorRow = findChild(indicators, "indicatorRow")
106106 verify(indicatorRow !== undefined)
107+ var indicatorRowItems = findChild(indicatorRow, "indicatorRowItems");
108+ verify(indicatorRowItems !== undefined)
107109
108− for (var i = 0; i < indicatorRow.row.count; i++) {
109− var indicatorItem = findChild(indicatorRow.row, "item" + i);
110+ for (var i = 0; i < indicatorRowItems.count; i++) {
111+ var indicatorItem = findChild(indicatorRowItems, "item" + i);
110112
111113 if (!indicatorItem.visible)
112114 continue;
@@ -164,8 +166,8 @@ Item {
164166 }
165167
166168 function init_invisible_indicator(identifier) {
167− tryCompareFunction(function() { return findChild(indicators, identifier+"-widget") !== undefined }, true);
168− var item = findChild(indicators, identifier+"-widget");
169+ tryCompareFunction(function() { return findChild(indicators, identifier+"-delegate") !== undefined }, true);
170+ var item = findChild(indicators, identifier+"-delegate");
169171
170172 item.enabled = false;
171173 }
@@ -183,32 +185,36 @@ Item {
183185 indicators.show();
184186
185187 var indicatorTabs = findChild(indicators, "tabs");
186− var indicatorRow = findChild(indicators, "indicatorRow");
188+ var indicatorRowItems = findChild(indicators, "indicatorRowItems");
187189
188190
191+ var count = data.visible.length
189192 for (var i = 0; i< data.visible.length; i++) {
190− if (data.visible[i] === false)
193+ if (data.visible[i] === false) {
191194 init_invisible_indicator("indicator-fake" + (i + 1));
195+ count--;
196+ }
192197 }
193198
199+ tryCompare(indicatorRowItems, "count", count);
200+
194201 for (i = 0; i < data.visible.length; i++) {
195− var shouldBeVisible = data.visible[i];
202+ var widgetName = "indicator-fake" + (i + 1 + "-widget");
203+ var pageName = "indicator-fake" + (i + 1 + "-page");
196204
197− // check item visibility
198− var indicatorItem = findChild(indicatorRow.row, "item" + i);
199− verify(indicatorItem !== undefined);
200− tryCompare(indicatorItem, "visible", shouldBeVisible);
205+ // check for item
206+ tryCompareFunction(function() { return findChild(indicatorRowItems, widgetName) !== undefined }, data.visible[i]);
201207
202− // check tab visibility
203− tryCompareFunction(function() { return findChild(indicatorTabs, "indicator-fake" + (i + 1)) !== undefined }, shouldBeVisible);
208+ // check for tab
209+ tryCompareFunction(function() { return findChild(indicatorTabs, pageName) !== undefined }, data.visible[i]);
204210 }
205211 }
206212
207213 function test_indicator_visible_correct_tabs_data() { return [
208− {tag: "current-first", currentIndex: 0, visible: [false, true, true, true, true], expected: 1 },
209− {tag: "current-last", currentIndex: 4, visible: [true, true, true, true, false], expected: 3 },
210− {tag: "after", currentIndex: 0, visible: [true, false, true, true, true], expected: 0 },
211− {tag: "before", currentIndex: 1, visible: [false, true, true, true, true], expected: 1 }];
214+ {tag: "current-first", currentIndex: 0, visible: [false, true, true, true, true], expectedIndex: 0, expectedTab: "indicator-fake2" },
215+ {tag: "current-last", currentIndex: 4, visible: [true, true, true, true, false], expectedIndex: 3, expectedTab: "indicator-fake4" },
216+ {tag: "after", currentIndex: 0, visible: [true, false, true, true, true], expectedIndex: 0, expectedTab: "indicator-fake1" },
217+ {tag: "before", currentIndex: 1, visible: [false, true, true, true, true], expectedIndex: 1, expectedTab: "indicator-fake2" }];
212218 }
213219
214220 function test_indicator_visible_correct_tabs(data) {
@@ -221,15 +227,16 @@ Item {
221227 tryCompare(indicators, "fullyOpened", true);
222228
223229 for (var i = 0; i< data.visible.length; i++) {
224− if (data.visible[i] === false)
230+ if (data.visible[i] === false) {
225231 init_invisible_indicator("indicator-fake" + (i + 1));
232+ }
226233 }
227234
228235 // check for current selected item
229− tryCompare(indicatorRow, "currentItemIndex", data.expected);
236+ tryCompare(indicatorRow, "currentItemIndex", data.expectedIndex);
230237
231238 // check for current selected tab
232− tryCompareFunction(function() { return findChild(indicatorTabs, "indicator-fake" + (data.expected + 1)) === indicatorTabs.selectedTab }, true);
239+ tryCompareFunction(function() { return findChild(indicatorTabs, data.expectedTab) === indicatorTabs.selectedTab }, true);
233240
234241 }
235242 }