05cc690 · unity8 · git.iko.soy

git.iko.soy/unity8

Fix test

commit05cc690ab466409a7b4bb924a4308cfac8687fee authorAlbert Astals <albert.astals@canonical.com> dateMon 4 Aug 2014, 15:46 (12 years ago) parent101b5a9

2 files changed+48−45

compare with xenial

unifiedsplit

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

qml/Dash/DashNavigation.qml+2

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

7474

7575 DashNavigationButton {

7676 id: altNavigationButton

77+ objectName: "altNavigationButton"

7778 height: root.height

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

7980 scope: root.scope

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

8485

8586 DashNavigationButton {

8687 id: navigationButton

88+ objectName: "navigationButton"

8789 height: root.height

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

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

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

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

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

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

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

273− compare(dashNavigation.showList, false);

274− waitForRendering(dashNavigation);

275− mouseClick(dashNavigation, 0, 0);

276− compare(dashNavigation.showList, true);

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

274+ compare(dashNavigationButton.showList, false);

275+ waitForRendering(dashNavigationButton);

276+ mouseClick(dashNavigationButton, 0, 0);

277+ compare(dashNavigationButton.showList, true);

277278

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

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

279280 compare(navigationListView.count, 1);

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

281282

282283 waitForRendering(navigationListView);

283284 waitForRendering(navigationListView.currentItem);

284285

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

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

286287 compare(allButton.visible, false);

287288

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

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

289290 mouseClick(navigation, 0, 0);

290− compare(dashNavigation.showList, false);

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

291+ compare(dashNavigationButton.showList, false);

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

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

293294

294− mouseClick(dashNavigation, 0, 0);

295− compare(dashNavigation.showList, true);

295+ mouseClick(dashNavigationButton, 0, 0);

296+ compare(dashNavigationButton.showList, true);

296297 waitForRendering(navigationListView);

297298 waitForRendering(navigationListView.currentItem);

298299 compare(allButton.visible, true);

299300

300301 mouseClick(allButton, 0, 0);

301− compare(dashNavigation.showList, false);

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

302+ compare(dashNavigationButton.showList, false);

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

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

304305

305− mouseClick(dashNavigation, 0, 0);

306− compare(dashNavigation.showList, true);

306+ mouseClick(dashNavigationButton, 0, 0);

307+ compare(dashNavigationButton.showList, true);

307308 waitForRendering(navigationListView);

308309 waitForRendering(navigationListView.currentItem);

309310 compare(allButton.visible, false);

310311

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

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

312313 mouseClick(navigation, 0, 0);

313− compare(dashNavigation.showList, true);

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

314+ compare(dashNavigationButton.showList, true);

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

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

316317

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

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

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

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

320321 compare(allButton.visible, true);

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

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

324325 waitForRendering(navigationListView);

325326 mouseClick(allButton, 0, 0);

326− compare(dashNavigation.showList, false);

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

327+ compare(dashNavigationButton.showList, false);

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

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

329330

330− mouseClick(dashNavigation, 0, 0);

331− compare(dashNavigation.showList, true);

331+ mouseClick(dashNavigationButton, 0, 0);

332+ compare(dashNavigationButton.showList, true);

332333 waitForRendering(navigationListView);

333334 waitForRendering(navigationListView.currentItem);

334335 compare(allButton.visible, true);

335336 compare(backButton.visible, true);

336337

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

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

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

339340 mouseClick(navigation, 0, 0);

340− compare(dashNavigation.showList, false);

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

341+ compare(dashNavigationButton.showList, false);

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

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

343344

344− mouseClick(dashNavigation, 0, 0);

345− compare(dashNavigation.showList, true);

345+ mouseClick(dashNavigationButton, 0, 0);

346+ compare(dashNavigationButton.showList, true);

346347 waitForRendering(navigationListView);

347348 waitForRendering(navigationListView.currentItem);

348349

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

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

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

351352 mouseClick(navigation, 0, 0);

352− compare(dashNavigation.showList, false);

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

353+ compare(dashNavigationButton.showList, false);

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

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

355356

356− mouseClick(dashNavigation, 0, 0);

357− compare(dashNavigation.showList, true);

357+ mouseClick(dashNavigationButton, 0, 0);

358+ compare(dashNavigationButton.showList, true);

358359 waitForRendering(navigationListView);

359360 waitForRendering(navigationListView.currentItem);

360361 mouseClick(backButton, 0, 0);

361362

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

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

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

364− compare(dashNavigation.showList, true);

365− mouseClick(dashNavigation, 0, 0);

366− compare(dashNavigation.showList, false);

365+ compare(dashNavigationButton.showList, true);

366+ mouseClick(dashNavigationButton, 0, 0);

367+ compare(dashNavigationButton.showList, false);

367368

368− mouseClick(dashNavigation, 0, 0);

369− compare(dashNavigation.showList, true);

369+ mouseClick(dashNavigationButton, 0, 0);

370+ compare(dashNavigationButton.showList, true);

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

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

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

372373 mouseClick(navigation, 0, 0);

373− compare(dashNavigation.showList, true);

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

374+ compare(dashNavigationButton.showList, true);

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

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

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

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

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

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

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

379380 mouseClick(allButton, 0, 0);

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

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

381382 }

382383 }

383384}