git.iko.soy/unity8
on xenial help sign in
Fixed tests for change to findChild
f612b65Nick Dedekind
tests/qmltests/Panel/tst_Indicators.qml+2−2
compare with xenial
unifiedsplit
@@ -164,7 +164,7 @@ Item {
164 }
164 }
165
165
166 function init_invisible_indicator(identifier) {
166 function init_invisible_indicator(identifier) {
167− tryCompareFunction(function() { return findChild(indicators, identifier+"-widget") !== undefined }, true);
167+ tryCompareFunction(function() { return findChild(indicators, identifier+"-widget") !== null }, true);
168 var item = findChild(indicators, identifier+"-widget");
168 var item = findChild(indicators, identifier+"-widget");
169
169
170 item.enabled = false;
170 item.enabled = false;
@@ -198,7 +198,7 @@ Item {
198 var indicatorItem = rowRepeater.itemAt(i);
198 var indicatorItem = rowRepeater.itemAt(i);
199 tryCompare(indicatorItem, "visible", shouldBeVisible);
199 tryCompare(indicatorItem, "visible", shouldBeVisible);
200 // check tab visibility
200 // check tab visibility
201− tryCompareFunction(function() { return findChild(indicatorTabs, "indicator-fake" + (i + 1)) !== undefined }, shouldBeVisible);
201+ tryCompareFunction(function() { return findChild(indicatorTabs, "indicator-fake" + (i + 1)) !== null }, shouldBeVisible);
202 }
202 }
203 }
203 }
204
204
tests/qmltests/Panel/tst_MenuContent.qml+2−2
@@ -103,13 +103,13 @@ Item {
103
103
104 function selected_tab_equals_test_tab() {
104 function selected_tab_equals_test_tab() {
105 var currentTab = menu_content_test.findChild(menuContent, "tabs").selectedTab
105 var currentTab = menu_content_test.findChild(menuContent, "tabs").selectedTab
106− if (currentTab == undefined) {
106+ if (currentTab === null) {
107 console.log("selected tab undefined");
107 console.log("selected tab undefined");
108 return false;
108 return false;
109 }
109 }
110
110
111 var testTab = menu_content_test.findChild(menuContent, testTabObjectName);
111 var testTab = menu_content_test.findChild(menuContent, testTabObjectName);
112− if (testTab == undefined) {
112+ if (testTab === null) {
113 console.log("test_tab " + testTabObjectName + " undefined");
113 console.log("test_tab " + testTabObjectName + " undefined");
114 return false;
114 return false;
115 }
115 }
tests/qmltests/Panel/tst_Panel.qml+12−12
@@ -66,16 +66,16 @@ Item {
66
66
67 function get_indicator_item(index) {
67 function get_indicator_item(index) {
68 var rowRepeater = findChild(panel.indicators, "rowRepeater");
68 var rowRepeater = findChild(panel.indicators, "rowRepeater");
69− verify(rowRepeater != undefined);
69+ verify(rowRepeater !== null);
70 return rowRepeater.itemAt(index);
70 return rowRepeater.itemAt(index);
71 }
71 }
72
72
73 function get_indicator_item_position(index) {
73 function get_indicator_item_position(index) {
74 var indicatorRow = findChild(panel.indicators, "indicatorRow");
74 var indicatorRow = findChild(panel.indicators, "indicatorRow");
75− verify(indicatorRow != undefined);
75+ verify(indicatorRow !== null);
76
76
77 var indicatorItem = get_indicator_item(index);
77 var indicatorItem = get_indicator_item(index);
78− verify(indicatorItem != undefined);
78+ verify(indicatorItem !== null);
79
79
80 return panel.mapFromItem(indicatorItem, indicatorItem.width/2, indicatorItem.height/2);
80 return panel.mapFromItem(indicatorItem, indicatorItem.width/2, indicatorItem.height/2);
81 }
81 }
@@ -120,7 +120,7 @@ Item {
120 // no hint animation when fullscreen
120 // no hint animation when fullscreen
121 compare(panel.indicators.y, -panel.panelHeight);
121 compare(panel.indicators.y, -panel.panelHeight);
122 var indicatorRow = findChild(panel.indicators, "indicatorRow");
122 var indicatorRow = findChild(panel.indicators, "indicatorRow");
123− verify(indicatorRow != undefined);
123+ verify(indicatorRow !== null);
124 compare(indicatorRow.y, 0);
124 compare(indicatorRow.y, 0);
125 compare(panel.indicators.height, panel.indicators.panelHeight);
125 compare(panel.indicators.height, panel.indicators.panelHeight);
126 compare(panel.indicators.partiallyOpened, false,
126 compare(panel.indicators.partiallyOpened, false,
@@ -145,13 +145,13 @@ Item {
145 }
145 }
146
146
147 var indicatorRow = findChild(panel.indicators, "indicatorRow");
147 var indicatorRow = findChild(panel.indicators, "indicatorRow");
148− verify(indicatorRow != undefined);
148+ verify(indicatorRow !== null);
149
149
150 var rowRepeater = findChild(panel.indicators, "rowRepeater");
150 var rowRepeater = findChild(panel.indicators, "rowRepeater");
151− verify(indicatorRow != undefined);
151+ verify(indicatorRow !== null);
152
152
153 var menuContent = findChild(panel.indicators, "menuContent");
153 var menuContent = findChild(panel.indicators, "menuContent");
154− verify(indicatorRow != undefined);
154+ verify(indicatorRow !== null);
155
155
156 // Wait for the indicators to get into position.
156 // Wait for the indicators to get into position.
157 // (switches between normal and fullscreen modes are animated)
157 // (switches between normal and fullscreen modes are animated)
@@ -205,7 +205,7 @@ Item {
205 panel.searchVisible = true;
205 panel.searchVisible = true;
206
206
207 var searchIndicator = findChild(panel, "search");
207 var searchIndicator = findChild(panel, "search");
208− verify(searchIndicator != undefined);
208+ verify(searchIndicator !== null);
209
209
210 tap(searchIndicator, 1, 1);
210 tap(searchIndicator, 1, 1);
211
211
@@ -218,7 +218,7 @@ Item {
218 panel.searchVisible = false;
218 panel.searchVisible = false;
219
219
220 var searchIndicator = findChild(panel, "search");
220 var searchIndicator = findChild(panel, "search");
221− verify(searchIndicator != undefined);
221+ verify(searchIndicator !== null);
222
222
223 tap(searchIndicator, 1, 1);
223 tap(searchIndicator, 1, 1);
224
224
@@ -234,14 +234,14 @@ Item {
234 panel.searchVisible = false;
234 panel.searchVisible = false;
235
235
236 var indicatorRow = findChild(panel.indicators, "indicatorRow");
236 var indicatorRow = findChild(panel.indicators, "indicatorRow");
237− verify(indicatorRow != undefined);
237+ verify(indicatorRow !== null);
238
238
239 var rowRepeater = findChild(panel.indicators, "rowRepeater");
239 var rowRepeater = findChild(panel.indicators, "rowRepeater");
240− verify(indicatorRow != undefined);
240+ verify(indicatorRow !== null);
241
241
242 // Get the first indicator
242 // Get the first indicator
243 var indicatorItemFirst = get_indicator_item(0);
243 var indicatorItemFirst = get_indicator_item(0);
244− verify(indicatorItemFirst != undefined);
244+ verify(indicatorItemFirst !== undefined);
245
245
246 var indicatorItemCoordFirst = get_indicator_item_position(0);
246 var indicatorItemCoordFirst = get_indicator_item_position(0);
247 var indicatorItemCoordNext = get_indicator_item_position(indicatorRow.count - 1);
247 var indicatorItemCoordNext = get_indicator_item_position(indicatorRow.count - 1);