05cc690 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix test

05cc690Albert Astals12 years ago

qml/Dash/DashNavigation.qml+2

compare with xenial

unifiedsplit

@@ -74,6 +74,7 @@ Item {

75 DashNavigationButton {

76 id: altNavigationButton

77+ objectName: "altNavigationButton"

77 height: root.height

78 height: root.height

78 width: navigationButton.visible ? root.width / 2 : root.width

79 width: navigationButton.visible ? root.width / 2 : root.width

79 scope: root.scope

80 scope: root.scope

@@ -84,6 +85,7 @@ Item {

85 DashNavigationButton {

86 DashNavigationButton {

86 id: navigationButton

87 id: navigationButton

88+ objectName: "navigationButton"

87 height: root.height

89 height: root.height

88 width: altNavigationButton.visible ? root.width / 2 : root.width

90 width: altNavigationButton.visible ? root.width / 2 : root.width

89 x: altNavigationButton.visible ? root.width / 2 : 0

91 x: altNavigationButton.visible ? root.width / 2 : 0

tests/qmltests/Dash/tst_DashContent.qml+46−45

@@ -270,51 +270,52 @@ Item {

270 tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);

271 var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");

272 tryCompare(dashNavigation, "visible", true);

273+ var dashNavigationButton = findChild(dashContentList.currentItem, "navigationButton");

273− compare(dashNavigation.showList, false);

274+ compare(dashNavigationButton.showList, false);

274− waitForRendering(dashNavigation);

275+ waitForRendering(dashNavigationButton);

275− mouseClick(dashNavigation, 0, 0);

276+ mouseClick(dashNavigationButton, 0, 0);

276− compare(dashNavigation.showList, true);

277+ compare(dashNavigationButton.showList, true);

277

278

278− var navigationListView = findChild(dashNavigation, "navigationListView");

279+ var navigationListView = findChild(dashNavigationButton, "navigationListView");

279 compare(navigationListView.count, 1);

280 compare(navigationListView.count, 1);

280 tryCompare(navigationListView.currentItem.navigation, "loaded", true);

281 tryCompare(navigationListView.currentItem.navigation, "loaded", true);

281

282

282 waitForRendering(navigationListView);

283 waitForRendering(navigationListView);

283 waitForRendering(navigationListView.currentItem);

284 waitForRendering(navigationListView.currentItem);

284

285

285− var allButton = findChild(dashNavigation, "allButton");

286+ var allButton = findChild(dashNavigationButton, "allButton");

286 compare(allButton.visible, false);

287 compare(allButton.visible, false);

287

288

288− var navigation = findChild(dashNavigation, "navigation0child3");

289+ var navigation = findChild(dashNavigationButton, "navigation0child3");

289 mouseClick(navigation, 0, 0);

290 mouseClick(navigation, 0, 0);

290− compare(dashNavigation.showList, false);

291+ compare(dashNavigationButton.showList, false);

291− tryCompare(dashNavigation.currentNavigation, "navigationId", "middle3");

292+ tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle3");

292 tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");

293 tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");

293

294

294− mouseClick(dashNavigation, 0, 0);

295+ mouseClick(dashNavigationButton, 0, 0);

295− compare(dashNavigation.showList, true);

296+ compare(dashNavigationButton.showList, true);

296 waitForRendering(navigationListView);

297 waitForRendering(navigationListView);

297 waitForRendering(navigationListView.currentItem);

298 waitForRendering(navigationListView.currentItem);

298 compare(allButton.visible, true);

299 compare(allButton.visible, true);

299

300

300 mouseClick(allButton, 0, 0);

301 mouseClick(allButton, 0, 0);

301− compare(dashNavigation.showList, false);

302+ compare(dashNavigationButton.showList, false);

302− tryCompare(dashNavigation.currentNavigation, "navigationId", "root");

303+ tryCompare(dashNavigationButton.currentNavigation, "navigationId", "root");

303 tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");

304 tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");

304

305

305− mouseClick(dashNavigation, 0, 0);

306+ mouseClick(dashNavigationButton, 0, 0);

306− compare(dashNavigation.showList, true);

307+ compare(dashNavigationButton.showList, true);

307 waitForRendering(navigationListView);

308 waitForRendering(navigationListView);

308 waitForRendering(navigationListView.currentItem);

309 waitForRendering(navigationListView.currentItem);

309 compare(allButton.visible, false);

310 compare(allButton.visible, false);

310

311

311− navigation = findChild(dashNavigation, "navigation0child2");

312+ navigation = findChild(dashNavigationButton, "navigation0child2");

312 mouseClick(navigation, 0, 0);

313 mouseClick(navigation, 0, 0);

313− compare(dashNavigation.showList, true);

314+ compare(dashNavigationButton.showList, true);

314− tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

315+ tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");

315 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");

316 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");

316

317

317− var navigationList1 = findChild(dashNavigation, "navigation1");

318+ var navigationList1 = findChild(dashNavigationButton, "navigation1");

318 allButton = findChild(navigationList1, "allButton");

319 allButton = findChild(navigationList1, "allButton");

319 var backButton = findChild(findChild(navigationList1, "navigation1"), "backButton");

320 var backButton = findChild(findChild(navigationList1, "navigation1"), "backButton");

320 compare(allButton.visible, true);

321 compare(allButton.visible, true);

@@ -323,61 +324,61 @@ Item {

323 tryCompare(navigationListView, "contentX", navigationList1.x);

324 tryCompare(navigationListView, "contentX", navigationList1.x);

324 waitForRendering(navigationListView);

325 waitForRendering(navigationListView);

325 mouseClick(allButton, 0, 0);

326 mouseClick(allButton, 0, 0);

326− compare(dashNavigation.showList, false);

327+ compare(dashNavigationButton.showList, false);

327− tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

328+ tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");

328 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");

329 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");

329

330

330− mouseClick(dashNavigation, 0, 0);

331+ mouseClick(dashNavigationButton, 0, 0);

331− compare(dashNavigation.showList, true);

332+ compare(dashNavigationButton.showList, true);

332 waitForRendering(navigationListView);

333 waitForRendering(navigationListView);

333 waitForRendering(navigationListView.currentItem);

334 waitForRendering(navigationListView.currentItem);

334 compare(allButton.visible, true);

335 compare(allButton.visible, true);

335 compare(backButton.visible, true);

336 compare(backButton.visible, true);

336

337

337 tryCompare(navigationList1.navigation, "loaded", true);

338 tryCompare(navigationList1.navigation, "loaded", true);

338− navigation = findChild(dashNavigation, "navigation1child2");

339+ navigation = findChild(dashNavigationButton, "navigation1child2");

339 mouseClick(navigation, 0, 0);

340 mouseClick(navigation, 0, 0);

340− compare(dashNavigation.showList, false);

341+ compare(dashNavigationButton.showList, false);

341− tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle22");

342+ tryCompare(dashNavigationButton.currentNavigation, "navigationId", "childmiddle22");

342 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");

343 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");

343

344

344− mouseClick(dashNavigation, 0, 0);

345+ mouseClick(dashNavigationButton, 0, 0);

345− compare(dashNavigation.showList, true);

346+ compare(dashNavigationButton.showList, true);

346 waitForRendering(navigationListView);

347 waitForRendering(navigationListView);

347 waitForRendering(navigationListView.currentItem);

348 waitForRendering(navigationListView.currentItem);

348

349

349 tryCompare(navigationList1.navigation, "loaded", true);

350 tryCompare(navigationList1.navigation, "loaded", true);

350− navigation = findChild(dashNavigation, "navigation1child3");

351+ navigation = findChild(dashNavigationButton, "navigation1child3");

351 mouseClick(navigation, 0, 0);

352 mouseClick(navigation, 0, 0);

352− compare(dashNavigation.showList, false);

353+ compare(dashNavigationButton.showList, false);

353− tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle23");

354+ tryCompare(dashNavigationButton.currentNavigation, "navigationId", "childmiddle23");

354 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");

355 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");

355

356

356− mouseClick(dashNavigation, 0, 0);

357+ mouseClick(dashNavigationButton, 0, 0);

357− compare(dashNavigation.showList, true);

358+ compare(dashNavigationButton.showList, true);

358 waitForRendering(navigationListView);

359 waitForRendering(navigationListView);

359 waitForRendering(navigationListView.currentItem);

360 waitForRendering(navigationListView.currentItem);

360 mouseClick(backButton, 0, 0);

361 mouseClick(backButton, 0, 0);

361

362

362− tryCompare(dashNavigation.currentNavigation, "navigationId", "root");

363+ tryCompare(dashNavigationButton.currentNavigation, "navigationId", "root");

363 tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");

364 tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");

364− compare(dashNavigation.showList, true);

365+ compare(dashNavigationButton.showList, true);

365− mouseClick(dashNavigation, 0, 0);

366+ mouseClick(dashNavigationButton, 0, 0);

366− compare(dashNavigation.showList, false);

367+ compare(dashNavigationButton.showList, false);

367

368

368− mouseClick(dashNavigation, 0, 0);

369+ mouseClick(dashNavigationButton, 0, 0);

369− compare(dashNavigation.showList, true);

370+ compare(dashNavigationButton.showList, true);

370 tryCompare(navigationListView.currentItem.navigation, "loaded", true);

371 tryCompare(navigationListView.currentItem.navigation, "loaded", true);

371− navigation = findChild(dashNavigation, "navigation0child2");

372+ navigation = findChild(dashNavigationButton, "navigation0child2");

372 mouseClick(navigation, 0, 0);

373 mouseClick(navigation, 0, 0);

373− compare(dashNavigation.showList, true);

374+ compare(dashNavigationButton.showList, true);

374− navigationList1 = findChild(dashNavigation, "navigation1");

375+ navigationList1 = findChild(dashNavigationButton, "navigation1");

375 compare(navigationList1.navigation.loaded, false);

376 compare(navigationList1.navigation.loaded, false);

376− tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

377+ tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");

377 allButton = findChild(navigationList1, "allButton");

378 allButton = findChild(navigationList1, "allButton");

378− tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

379+ tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");

379 mouseClick(allButton, 0, 0);

380 mouseClick(allButton, 0, 0);

380− tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

381+ tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");

381 }

382 }

383 }

383}

384}