f612b65 · unity8 · git.iko.soy

git.iko.soy/unity8

Fixed tests for change to findChild

commitf612b65e48a519a587898396360dc32729873092 authorNick Dedekind <nicholas.dedekind@gmail.com> dateWed 15 Jan 2014, 11:29 (13 years ago) parent2c9da66

3 files changed+16−16

compare with xenial

unifiedsplit

tests/qmltests/Panel/tst_Indicators.qml+2−2 tests/qmltests/Panel/tst_MenuContent.qml+2−2 tests/qmltests/Panel/tst_Panel.qml+12−12

tests/qmltests/Panel/tst_Indicators.qml+2−2

@@ -164,7 +164,7 @@ Item {

164164 }

165165

166166 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);

168168 var item = findChild(indicators, identifier+"-widget");

169169

170170 item.enabled = false;

@@ -198,7 +198,7 @@ Item {

198198 var indicatorItem = rowRepeater.itemAt(i);

199199 tryCompare(indicatorItem, "visible", shouldBeVisible);

200200 // 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);

202202 }

203203 }

204204

tests/qmltests/Panel/tst_MenuContent.qml+2−2

@@ -103,13 +103,13 @@ Item {

103103

104104 function selected_tab_equals_test_tab() {

105105 var currentTab = menu_content_test.findChild(menuContent, "tabs").selectedTab

106− if (currentTab == undefined) {

106+ if (currentTab === null) {

107107 console.log("selected tab undefined");

108108 return false;

109109 }

110110

111111 var testTab = menu_content_test.findChild(menuContent, testTabObjectName);

112− if (testTab == undefined) {

112+ if (testTab === null) {

113113 console.log("test_tab " + testTabObjectName + " undefined");

114114 return false;

115115 }

tests/qmltests/Panel/tst_Panel.qml+12−12

@@ -66,16 +66,16 @@ Item {

6666

6767 function get_indicator_item(index) {

6868 var rowRepeater = findChild(panel.indicators, "rowRepeater");

69− verify(rowRepeater != undefined);

69+ verify(rowRepeater !== null);

7070 return rowRepeater.itemAt(index);

7171 }

7272

7373 function get_indicator_item_position(index) {

7474 var indicatorRow = findChild(panel.indicators, "indicatorRow");

75− verify(indicatorRow != undefined);

75+ verify(indicatorRow !== null);

7676

7777 var indicatorItem = get_indicator_item(index);

78− verify(indicatorItem != undefined);

78+ verify(indicatorItem !== null);

7979

8080 return panel.mapFromItem(indicatorItem, indicatorItem.width/2, indicatorItem.height/2);

8181 }

@@ -120,7 +120,7 @@ Item {

120120 // no hint animation when fullscreen

121121 compare(panel.indicators.y, -panel.panelHeight);

122122 var indicatorRow = findChild(panel.indicators, "indicatorRow");

123− verify(indicatorRow != undefined);

123+ verify(indicatorRow !== null);

124124 compare(indicatorRow.y, 0);

125125 compare(panel.indicators.height, panel.indicators.panelHeight);

126126 compare(panel.indicators.partiallyOpened, false,

@@ -145,13 +145,13 @@ Item {

145145 }

146146

147147 var indicatorRow = findChild(panel.indicators, "indicatorRow");

148− verify(indicatorRow != undefined);

148+ verify(indicatorRow !== null);

149149

150150 var rowRepeater = findChild(panel.indicators, "rowRepeater");

151− verify(indicatorRow != undefined);

151+ verify(indicatorRow !== null);

152152

153153 var menuContent = findChild(panel.indicators, "menuContent");

154− verify(indicatorRow != undefined);

154+ verify(indicatorRow !== null);

155155

156156 // Wait for the indicators to get into position.

157157 // (switches between normal and fullscreen modes are animated)

@@ -205,7 +205,7 @@ Item {

205205 panel.searchVisible = true;

206206

207207 var searchIndicator = findChild(panel, "search");

208− verify(searchIndicator != undefined);

208+ verify(searchIndicator !== null);

209209

210210 tap(searchIndicator, 1, 1);

211211

@@ -218,7 +218,7 @@ Item {

218218 panel.searchVisible = false;

219219

220220 var searchIndicator = findChild(panel, "search");

221− verify(searchIndicator != undefined);

221+ verify(searchIndicator !== null);

222222

223223 tap(searchIndicator, 1, 1);

224224

@@ -234,14 +234,14 @@ Item {

234234 panel.searchVisible = false;

235235

236236 var indicatorRow = findChild(panel.indicators, "indicatorRow");

237− verify(indicatorRow != undefined);

237+ verify(indicatorRow !== null);

238238

239239 var rowRepeater = findChild(panel.indicators, "rowRepeater");

240− verify(indicatorRow != undefined);

240+ verify(indicatorRow !== null);

241241

242242 // Get the first indicator

243243 var indicatorItemFirst = get_indicator_item(0);

244− verify(indicatorItemFirst != undefined);

244+ verify(indicatorItemFirst !== undefined);

245245

246246 var indicatorItemCoordFirst = get_indicator_item_position(0);

247247 var indicatorItemCoordNext = get_indicator_item_position(indicatorRow.count - 1);