git.iko.soy/unity8
on xenial help sign in
Fixed tests
commite1221156d291fd2c85b343b4293d76dd5824771a authorNick Dedekind <nicholas.dedekind@gmail.com> dateWed 30 Jul 2014, 17:01 (12 years ago) parent5981d57
8 files changed+88−82
compare with xenial
unifiedsplit
qml/Panel/Indicators.qml+1−1 qml/Panel/Indicators/MenuItemFactory.qml+2−1 qml/Panel/Indicators/MessageMenuItemFactory.qml+14−14 qml/Panel/MenuContent.qml+6−3 tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+16−13 tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+25−26 tests/qmltests/Panel/tst_Indicators.qml+10−10 tests/qmltests/Panel/tst_MenuContent.qml+14−14
qml/Panel/Indicators.qml+1−1
@@ -210,7 +210,7 @@ Showable {
210210 Rectangle {
211211 id: handle
212212
213− color: menuContent.backgroundColor
213+ color: menuContent.color
214214
215215 anchors {
216216 left: parent.left
qml/Panel/Indicators/MenuItemFactory.qml+2−1
@@ -476,7 +476,7 @@ Item {
476476 property var extendedData: menuData && menuData.ext || undefined
477477
478478 text: menuData && menuData.label || ""
479− iconSource: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_app.svg")
479+ iconSource: getExtendedProperty(extendedData, "icon", "image://theme/message")
480480 count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
481481 enabled: menuData && menuData.sensitive || false
482482 removable: true
@@ -722,6 +722,7 @@ Item {
722722
723723 component: Component {
724724 Button {
725+ objectName: "buttonSectionMenuControl"
725726 text: getExtendedProperty(extendedData, "xCanonicalExtraLabel", "")
726727
727728 onClicked: {
qml/Panel/Indicators/MessageMenuItemFactory.qml+14−14
@@ -85,20 +85,20 @@ Item {
8585 time: timeFormatter.timeString
8686 body: getExtendedProperty(extendedData, "xCanonicalText", "")
8787 // icons
88− avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")
89− icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
88+ avatar: getExtendedProperty(extendedData, "icon", "image://theme/contact")
89+ icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "image://theme/message")
9090 // actions
9191 enabled: menuData && menuData.sensitive || false
9292 removable: !selected
9393 selected: messageFactoryItem.selected
9494
95− onAppActivated: {
95+ onIconActivated: {
9696 menuModel.activate(menuIndex, true);
9797 }
9898 onDismissed: {
9999 menuModel.activate(menuIndex, false);
100100 }
101− onClicked: {
101+ onTriggered: {
102102 if (selected) {
103103 menuDeselected();
104104 } else {
@@ -128,15 +128,15 @@ Item {
128128 body: getExtendedProperty(extendedData, "xCanonicalText", "")
129129 replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
130130 // icons
131− avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")
132− icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
131+ avatar: getExtendedProperty(extendedData, "icon", "image://theme/contact")
132+ icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "image://theme/message")
133133 // actions
134134 replyEnabled: replyAction.valid && replyAction.enabled
135135 enabled: menuData && menuData.sensitive || false
136136 removable: !selected
137137 selected: messageFactoryItem.selected
138138
139− onAppActivated: {
139+ onIconActivated: {
140140 menuModel.activate(menuIndex, true);
141141 }
142142 onDismissed: {
@@ -145,7 +145,7 @@ Item {
145145 onReplied: {
146146 replyAction.activate(value);
147147 }
148− onClicked: {
148+ onTriggered: {
149149 if (selected) {
150150 menuDeselected();
151151 } else {
@@ -181,28 +181,28 @@ Item {
181181 actionButtonText: getExtendedProperty(activateActionDescription, "label", "Call back")
182182 replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
183183 // icons
184− avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")
185− icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
184+ avatar: getExtendedProperty(extendedData, "icon", "image://theme/contact")
185+ icon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "image://theme/missed-call")
186186 // actions
187− activateEnabled: activateAction.valid && activateAction.enabled
187+ actionEnabled: activateAction.valid && activateAction.enabled
188188 replyEnabled: replyAction.valid && replyAction.enabled
189189 enabled: menuData && menuData.sensitive || false
190190 removable: !selected
191191 selected: messageFactoryItem.selected
192192
193− onAppActivated: {
193+ onIconActivated: {
194194 menuModel.activate(menuIndex, true);
195195 }
196196 onDismissed: {
197197 menuModel.activate(menuIndex, false);
198198 }
199− onActivated: {
199+ onActionActivated: {
200200 activateAction.activate();
201201 }
202202 onReplied: {
203203 replyAction.activate(value);
204204 }
205− onClicked: {
205+ onTriggered: {
206206 if (selected) {
207207 menuDeselected();
208208 } else {
qml/Panel/MenuContent.qml+6−3
@@ -30,7 +30,7 @@ Rectangle {
3030 readonly property alias currentMenuIndex: listViewHeader.currentIndex
3131 color: "#221e1c" // FIXME not in palette yet
3232 property int contentReleaseInterval: 20000
33− property real headerHeight: listViewHeader
33+ property real headerHeight: listViewHeader.height
3434
3535 width: units.gu(40)
3636 height: units.gu(42)
@@ -52,7 +52,7 @@ Rectangle {
5252
5353 ListView {
5454 id: listViewHeader
55− objectName: "indicatorsListViewHeader"
55+ objectName: "indicatorsHeaderListView"
5656 model: content.indicatorsModel
5757 clip: true
5858
@@ -69,6 +69,7 @@ Rectangle {
6969 snapMode: ListView.SnapOneItem
7070 highlightRangeMode: ListView.StrictlyEnforceRange
7171 boundsBehavior: Flickable.StopAtBounds
72+ cacheBuffer: 1073741823
7273
7374 delegate: PageHeader {
7475 width: ListView.view.width
@@ -92,7 +93,7 @@ Rectangle {
9293
9394 ListView {
9495 id: listViewContent
95− objectName: "indicatorsListViewContent"
96+ objectName: "indicatorsContentListView"
9697 anchors {
9798 left: parent.left
9899 right: parent.right
@@ -106,11 +107,13 @@ Rectangle {
106107 interactive: false
107108 highlightMoveDuration: 0
108109 orientation: ListView.Horizontal
110+ cacheBuffer: 1073741823
109111
110112 delegate: Loader {
111113 id: loader
112114 width: ListView.view.width
113115 height: ListView.view.height
116+ objectName: identifier
114117
115118 source: pageSource
116119 asynchronous: true
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+16−13
@@ -367,9 +367,9 @@ Item {
367367 function test_create_alarmMenu_data() {
368368 return [
369369 {label: "testLabel1", enabled: true, icon: "file:///testIcon1", color: Qt.rgba(0, 0, 0, 0),
370− time: new Date(2014, 04, 14).getTime()*1000, timeFormat: "%a %d %b %l:%M %p"},
370+ time: new Date(2014, 04, 14), timeFormat: "%a %d %b %l:%M %p"},
371371 {label: "testLabel2", enabled: false, icon: "file:///testIcon2", color: Qt.rgba(1, 0, 0, 0),
372− time: new Date(2015, 12, 31).getTime()*1000, timeFormat: "%A" },
372+ time: new Date(2015, 11, 31), timeFormat: "%A" },
373373 ];
374374 }
375375
@@ -379,11 +379,11 @@ Item {
379379 menuData.sensitive = data.enabled;
380380 menuData.icon = data.icon;
381381 menuData.ext = {
382− 'xCanonicalTime': data.time,
382+ 'xCanonicalTime': data.time.getTime() / 1000,
383383 'xCanonicalTimeFormat': data.timeFormat
384384 };
385385 timeFormatter.format = data.timeFormat;
386− timeFormatter.time = data.time;
386+ timeFormatter.time = data.time.getTime() / 1000;
387387
388388 loader.data = menuData;
389389 loader.sourceComponent = factory.load(menuData);
@@ -399,9 +399,9 @@ Item {
399399 function test_create_appointmentMenu_data() {
400400 return [
401401 {label: "testLabel1", enabled: true, icon: "file:///testIcon1", color: Qt.rgba(0, 0, 0, 0),
402− time: new Date(2014, 04, 14).getTime()*1000, timeFormat: "%a %d %b %l:%M %p"},
402+ time: new Date(2014, 04, 14), timeFormat: "%a %d %b %l:%M %p"},
403403 {label: "testLabel2", enabled: false, icon: "file:///testIcon2", color: Qt.rgba(1, 0, 0, 0),
404− time: new Date(2015, 12, 31).getTime()*1000, timeFormat: "%A" },
404+ time: new Date(2015, 11, 31), timeFormat: "%A" },
405405 ];
406406 }
407407
@@ -412,11 +412,11 @@ Item {
412412 menuData.icon = data.icon;
413413 menuData.ext = {
414414 'xCanonicalColor': data.colour,
415− 'xCanonicalTime': data.time,
415+ 'xCanonicalTime': data.time.getTime() / 1000,
416416 'xCanonicalTimeFormat': data.timeFormat
417417 };
418418 timeFormatter.format = data.timeFormat;
419− timeFormatter.time = data.time;
419+ timeFormatter.time = data.time.getTime() / 1000;
420420
421421 loader.data = menuData;
422422 loader.sourceComponent = factory.load(menuData);
@@ -487,7 +487,10 @@ Item {
487487 compare(loader.item.text, data.label, "Label does not match data");
488488 compare(loader.item.iconSource, data.icon, "Icon does not match data");
489489 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
490− compare(loader.item.control.text, data.buttonText, "Button text does not match data");
490+
491+ var button = findChild(loader.item, "buttonSectionMenuControl");
492+ verify(button !== null);
493+ compare(button.text, data.buttonText, "Button text does not match data");
491494 }
492495
493496 function test_create_wifiSection_data() {
@@ -513,8 +516,8 @@ Item {
513516
514517 function test_create_accessPoint_data() {
515518 return [
516− {label: "testLabel1", enabled: true, checked: false, secure: true, adHoc: false },
517− {label: "testLabel2", enabled: false, checked: true, secure: false, adHoc: true },
519+ {label: "testLabel1", enabled: true, active: false, secure: true, adHoc: false },
520+ {label: "testLabel2", enabled: false, active: true, secure: false, adHoc: true },
518521 ];
519522 }
520523
@@ -522,7 +525,7 @@ Item {
522525 menuData.type = "unity.widgets.systemsettings.tablet.accesspoint";
523526 menuData.label = data.label;
524527 menuData.sensitive = data.enabled;
525− menuData.isToggled = data.checked;
528+ menuData.isToggled = data.active;
526529 menuData.ext = {
527530 'xCanonicalWifiApStrengthAction': "action::strength",
528531 'xCanonicalWifiApIsSecure': data.secure,
@@ -538,7 +541,7 @@ Item {
538541 compare(loader.item.strengthAction.name, "action::strength", "Strength action incorrect");
539542 compare(loader.item.secure, data.secure, "Secure does not match data");
540543 compare(loader.item.adHoc, data.adHoc, "AdHoc does not match data");
541− compare(loader.item.checked, data.checked, "Checked does not match data");
544+ compare(loader.item.active, data.active, "Checked does not match data");
542545 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
543546 }
544547
tests/qmltests/Panel/Indicators/tst_MessageMenuItemFactory.qml+25−26
@@ -32,9 +32,8 @@ Item {
3232 menuIndex: 0
3333 }
3434
35− Utils.TimeFormatter {
35+ Utils.RelativeTimeFormatter {
3636 id: timeFormatter
37− format: "hh:mm - MMM dd"
3837 }
3938
4039 UT.UnityTestCase {
@@ -73,8 +72,8 @@ Item {
7372
7473 function test_create_simpleTextmessage_data() {
7574 return [
76− { title: "Title1", time: new Date(2013, 10, 10).getTime()*1000, message: "This is a text message 1", avatar: "file:///avatar1", appIcon: "file:///appIcon1", enabled: true},
77− { title: "Title2", time: new Date(2014, 12, 10).getTime()*1000, message: "This is a text message 2", avatar: "file:///avatar2", appIcon: "file:///appIcon2", enabled: false},
75+ { title: "Title1", time: new Date(2013, 10, 10), body: "This is a text message 1", avatar: "file:///avatar1", icon: "file:///appIcon1", enabled: true},
76+ { title: "Title2", time: new Date(2014, 12, 10), body: "This is a text message 2", avatar: "file:///avatar2", icon: "file:///appIcon2", enabled: false},
7877 ];
7978 }
8079
@@ -83,13 +82,13 @@ Item {
8382 menuData.label = data.title;
8483 menuData.sensitive = data.enabled;
8584 menuData.ext = {
86− 'xCanonicalTime': data.time,
87− 'xCanonicalText': data.message,
85+ 'xCanonicalTime': data.time.getTime()*1000,
86+ 'xCanonicalText': data.body,
8887 'icon': data.avatar,
89− 'xCanonicalAppIcon': data.appIcon,
88+ 'xCanonicalAppIcon': data.icon,
9089 };
9190 factory.menuData = menuData;
92− timeFormatter.time = data.time;
91+ timeFormatter.time = data.time.getTime()/1000;
9392
9493 var loader = findChild(factory, "loader");
9594 verify(loader !== undefined);
@@ -97,16 +96,16 @@ Item {
9796 tryCompare(loader.item, "objectName", "simpleTextMessage");
9897 compare(loader.item.title, data.title, "Title does not match data");
9998 compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
100− compare(loader.item.message, data.message, "Message does not match data");
99+ compare(loader.item.body, data.body, "Message does not match data");
101100 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
102− compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
101+ compare(loader.item.icon, data.icon, "App icon does not match data");
103102 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
104103 }
105104
106105 function test_create_textmessage_data() {
107106 return [
108− { title: "Title1", time: new Date(2013, 10, 10).getTime()*1000, message: "This is a text message 1", avatar: "file:///avatar1", appIcon: "file:///appIcon1", enabled: true},
109− { title: "Title2", time: new Date(2014, 12, 10).getTime()*1000, message: "This is a text message 2", avatar: "file:///avatar2", appIcon: "file:///appIcon2", enabled: false},
107+ { title: "Title1", time: new Date(2013, 10, 10), body: "This is a text message 1", avatar: "file:///avatar1", icon: "file:///appIcon1", enabled: true},
108+ { title: "Title2", time: new Date(2014, 12, 10), body: "This is a text message 2", avatar: "file:///avatar2", icon: "file:///appIcon2", enabled: false},
110109 ];
111110 }
112111
@@ -115,10 +114,10 @@ Item {
115114 menuData.label = data.title;
116115 menuData.sensitive = data.enabled;
117116 menuData.ext = {
118− 'xCanonicalTime': data.time,
119− 'xCanonicalText': data.message,
117+ 'xCanonicalTime': data.time.getTime()*1000,
118+ 'xCanonicalText': data.body,
120119 'icon': data.avatar,
121− 'xCanonicalAppIcon': data.appIcon,
120+ 'xCanonicalAppIcon': data.icon,
122121 'xCanonicalMessageActions': [{
123122 'parameter-type': "s",
124123 'name': "action::reply",
@@ -127,7 +126,7 @@ Item {
127126 ]
128127 };
129128 factory.menuData = menuData;
130− timeFormatter.time = data.time;
129+ timeFormatter.time = data.time.getTime()/1000;
131130
132131 var loader = findChild(factory, "loader");
133132 verify(loader !== undefined);
@@ -135,17 +134,17 @@ Item {
135134 tryCompare(loader.item, "objectName", "textMessage");
136135 compare(loader.item.title, data.title, "Title does not match data");
137136 compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
138− compare(loader.item.message, data.message, "Message does not match data");
137+ compare(loader.item.body, data.body, "Message does not match data");
139138 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
140− compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
139+ compare(loader.item.icon, data.icon, "App icon does not match data");
141140 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
142141 }
143142
144143
145144 function test_create_snapDecision_data() {
146145 return [
147− { title: "Title1", time: new Date(2013, 10, 10).getTime()*1000, message: "This is a text message 1", avatar: "file:///avatar1", appIcon: "file:///appIcon1", enabled: true},
148− { title: "Title2", time: new Date(2014, 12, 10).getTime()*1000, message: "This is a text message 2", avatar: "file:///avatar2", appIcon: "file:///appIcon2", enabled: false},
146+ { title: "Title1", time: new Date(2013, 10, 10), body: "This is a text message 1", avatar: "file:///avatar1", icon: "file:///appIcon1", enabled: true},
147+ { title: "Title2", time: new Date(2014, 12, 10), body: "This is a text message 2", avatar: "file:///avatar2", icon: "file:///appIcon2", enabled: false},
149148 ];
150149 }
151150
@@ -154,10 +153,10 @@ Item {
154153 menuData.label = data.title;
155154 menuData.sensitive = data.enabled;
156155 menuData.ext = {
157− 'xCanonicalTime': data.time,
158− 'xCanonicalText': data.message,
156+ 'xCanonicalTime': data.time.getTime()*1000,
157+ 'xCanonicalText': data.body,
159158 'icon': data.avatar,
160− 'xCanonicalAppIcon': data.appIcon,
159+ 'xCanonicalAppIcon': data.icon,
161160 'xCanonicalMessageActions': [{
162161 'name': "action::callback",
163162 'label': "Callback1"
@@ -169,7 +168,7 @@ Item {
169168 ]
170169 };
171170 factory.menuData = menuData;
172− timeFormatter.time = data.time;
171+ timeFormatter.time = data.time.getTime()/1000;
173172
174173 var loader = findChild(factory, "loader");
175174 verify(loader !== undefined);
@@ -177,9 +176,9 @@ Item {
177176 tryCompare(loader.item, "objectName", "snapDecision");
178177 compare(loader.item.title, data.title, "Title does not match data");
179178 compare(loader.item.time, timeFormatter.timeString, "Time does not match data");
180− compare(loader.item.message, data.message, "Message does not match data");
179+ compare(loader.item.body, data.body, "Message does not match data");
181180 compare(loader.item.avatar, data.avatar, "Avatar does not match data");
182− compare(loader.item.appIcon, data.appIcon, "App icon does not match data");
181+ compare(loader.item.icon, data.icon, "App icon does not match data");
183182 compare(loader.item.enabled, data.enabled, "Enabled does not match data");
184183 }
185184
tests/qmltests/Panel/tst_Indicators.qml+10−10
@@ -173,7 +173,7 @@ Item {
173173 function test_row_visible_menuContent_visible(data) {
174174 indicators.show();
175175
176− var indicatorTabs = findChild(indicators, "tabs");
176+ var contentListView = findChild(indicators, "indicatorsContentListView");
177177 var indicatorRowItems = findChild(indicators, "indicatorRowItems");
178178
179179 var count = data.visible.length
@@ -194,19 +194,19 @@ Item {
194194 tryCompareFunction(function() { return findChild(indicatorRowItems, widgetName) !== null }, data.visible[i]);
195195
196196 // check for tab
197− tryCompareFunction(function() { return findChild(indicatorTabs, pageName) !== null }, data.visible[i]);
197+ tryCompareFunction(function() { return findChild(contentListView, pageName) !== null }, data.visible[i]);
198198 }
199199 }
200200
201− function test_indicator_visible_correct_tabs_data() { return [
202− {tag: "current-first", currentIndex: 0, visible: [false, true, true, true, true], expectedIndex: 0, expectedTab: "indicator-fake2" },
203− {tag: "current-last", currentIndex: 4, visible: [true, true, true, true, false], expectedIndex: 3, expectedTab: "indicator-fake4" },
204− {tag: "after", currentIndex: 0, visible: [true, false, true, true, true], expectedIndex: 0, expectedTab: "indicator-fake1" },
205− {tag: "before", currentIndex: 1, visible: [false, true, true, true, true], expectedIndex: 1, expectedTab: "indicator-fake2" }];
201+ function test_indicator_visible_correct_menu_data() { return [
202+ {tag: "current-first", currentIndex: 0, visible: [false, true, true, true, true], expectedIndex: 0, expextedMenu: "indicator-fake2" },
203+ {tag: "current-last", currentIndex: 4, visible: [true, true, true, true, false], expectedIndex: 3, expextedMenu: "indicator-fake4" },
204+ {tag: "after", currentIndex: 0, visible: [true, false, true, true, true], expectedIndex: 0, expextedMenu: "indicator-fake1" },
205+ {tag: "before", currentIndex: 1, visible: [false, true, true, true, true], expectedIndex: 1, expextedMenu: "indicator-fake2" }];
206206 }
207207
208− function test_indicator_visible_correct_tabs(data) {
209− var indicatorTabs = findChild(indicators, "tabs");
208+ function test_indicator_visible_correct_menu(data) {
209+ var contentListView = findChild(indicators, "indicatorsContentListView");
210210 var indicatorRow = findChild(indicators, "indicatorRow");
211211
212212 indicators.show();
@@ -223,7 +223,7 @@ Item {
223223 tryCompare(indicatorRow, "currentItemIndex", data.expectedIndex);
224224
225225 // check for current selected tab
226− tryCompareFunction(function() { return findChild(indicatorTabs, data.expectedTab) === indicatorTabs.selectedTab }, true);
226+ tryCompareFunction(function() { return findChild(contentListView, data.expextedMenu) === contentListView.currentItem }, true);
227227
228228 }
229229 }
tests/qmltests/Panel/tst_MenuContent.qml+14−14
@@ -91,22 +91,22 @@ Item {
9191 return "indicator-fake" + (index + 1) + "-page";
9292 }
9393
94− property string testTabObjectName : ""
94+ property string testItemObjectName : ""
9595
96− function selected_tab_equals_test_tab() {
97− var currentTab = menu_content_test.findChild(menuContent, "tabs").selectedTab
98− if (currentTab === null) {
99− console.log("selected tab undefined");
96+ function current_item_equals_test_item() {
97+ var currentItem = menu_content_test.findChild(menuContent, "indicatorsContentListView").currentItem
98+ if (currentItem === null) {
99+ console.log("current item undefined");
100100 return false;
101101 }
102102
103− var testTab = menu_content_test.findChild(menuContent, testTabObjectName);
104− if (testTab === null) {
105− console.log("test_tab " + testTabObjectName + " undefined");
103+ var testItem = menu_content_test.findChild(menuContent, testItemObjectName);
104+ if (testItem === null) {
105+ console.log("testItem " + testItemObjectName + " undefined");
106106 return false;
107107 }
108108
109− return testTab == currentTab;
109+ return testItem === currentItem;
110110 }
111111
112112 UT.UnityTestCase {
@@ -125,17 +125,17 @@ Item {
125125 var menuCount = indicatorsModel.count;
126126 verify(menuCount > 0, "Menu count should be greater than zero");
127127
128− var tabs = menu_content_test.findChild(menuContent, "tabs")
128+ var listView = menu_content_test.findChild(menuContent, "indicatorsContentListView")
129+ verify(listView !== null)
129130
130131 // Loop over twice to test jump between last and first.
131132 for (var i = 0; i < menuCount*2; i++) {
132−
133133 var menuIndex = i%menuCount;
134134
135135 activate_content(menuIndex);
136− testTabObjectName = indicatorsModel.data(menuIndex, Indicators.IndicatorsModelRole.Identifier);
137− compare(tabs.selectedTabIndex, menuIndex, "Current tab index does not match selected tab index");
138− tryCompareFunction(selected_tab_equals_test_tab, true);
136+ testItemObjectName = indicatorsModel.data(menuIndex, Indicators.IndicatorsModelRole.Identifier);
137+ compare(listView.currentIndex, menuIndex, "Current tab index does not match selected tab index");
138+ tryCompareFunction(current_item_equals_test_item, true);
139139 }
140140 }
141141