631c1ed · unity8 · git.iko.soy

git.iko.soy/unity8

Adapt test_mainNavigation to the new ui/ux

commit631c1ed4c3d6cd450602bd0d29b81fdba6ad373b authorAlbert Astals Cid <albert.astals@canonical.com> dateMon 28 Sep 2015, 16:13 (11 years ago) parent105bcc3

5 files changed+70−70

compare with xenial

unifiedsplit

qml/Dash/DashNavigation.qml+3−1 qml/Dash/DashNavigationHeader.qml+1−1 qml/Dash/GenericScopeView.qml+1 qml/Dash/PageHeader.qml+3−3 tests/qmltests/Dash/tst_DashContent.qml+62−65

qml/Dash/DashNavigation.qml+3−1

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

6363 // parentNavigationId: the parent navigation Id

6464 }

6565 delegate: DashNavigationHeader {

66+ objectName: "dashNavigationHeader" + index

6667 height: index == 0 && headersModel.count > 1 ? 0 : units.gu(5)

6768 width: parent.width

6869

@@ -91,11 +92,12 @@ Item {

9192 }

9293

9394 onTextClicked: {

94− root.leafClicked();

9595 scope.setNavigationState(navigationId);

9696

9797 var popsNeeded = headersModel.count - index - 1;

9898 pop(popsNeeded);

99+

100+ root.leafClicked();

99101 }

100102 }

101103 }

qml/Dash/DashNavigationHeader.qml+1−1

@@ -33,6 +33,7 @@ Row {

3333

3434 ListItem.Standard {

3535 id: backImageItem

36+ objectName: "backButton"

3637 height: parent.height

3738 width: height

3839 showDivider: false

@@ -50,7 +51,6 @@ Row {

5051

5152 ListItem.Standard {

5253 id: textItem

53− objectName: "allButton"

5454 height: parent.height

5555 showDivider: false

5656

qml/Dash/GenericScopeView.qml+1

@@ -647,6 +647,7 @@ FocusScope {

647647

648648 PageHeaderExtraPanel {

649649 id: peExtraPanel

650+ objectName: "peExtraPanel"

650651 width: parent.width >= units.gu(60) ? units.gu(40) : parent.width

651652 anchors {

652653 top: categoryView.pageHeader.bottom

qml/Dash/PageHeader.qml+3−3

@@ -77,6 +77,9 @@ Item {

7777 } else if (!keepFocus) {

7878 unfocus();

7979 }

80+ if (!searchTextField.text && !root.navigationTag) {

81+ headerContainer.showSearch = false;

82+ }

8083 }

8184

8285 function resetSearch(keepFocus) {

@@ -122,9 +125,6 @@ Item {

122125 visible: headerContainer.showSearch

123126 onPressed: {

124127 closePopup(/* keepFocus */false);

125− if (!searchTextField.text && !root.navigationTag) {

126− headerContainer.showSearch = false;

127− }

128128 mouse.accepted = false;

129129 }

130130 }

tests/qmltests/Dash/tst_DashContent.qml+62−65

@@ -284,14 +284,14 @@ Item {

284284 var dashContentList = findChild(dashContent, "dashContentList");

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

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

287− tryCompare(dashNavigation, "visible", true);

288− var dashNavigationButton = findChild(dashContentList.currentItem, "navigationButton");

289− compare(dashNavigationButton.showList, false);

290− waitForRendering(dashNavigationButton);

291− mouseClick(dashNavigationButton);

292− compare(dashNavigationButton.showList, true);

293−

294− var navigationListView = findChild(dashNavigationButton, "navigationListView");

287+ var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");

288+ var searchButton = findChild(dashContentList.currentItem, "search_header_button");

289+ var searchTextField = findChild(dashContentList.currentItem, "searchTextField");

290+ compare(peExtraPanel.visible, false);

291+ mouseClick(searchButton);

292+ tryCompare(peExtraPanel, "visible", true);

293+

294+ var navigationListView = findChild(dashNavigation, "navigationListView");

295295 tryCompareFunction(function() {

296296 return navigationListView.currentItem &&

297297 navigationListView.currentItem.navigation &&

@@ -300,107 +300,104 @@ Item {

300300 waitForRendering(navigationListView);

301301 waitForRendering(navigationListView.currentItem);

302302

303− var allButton = findChild(dashNavigationButton, "allButton");

304− compare(allButton.visible, false);

305−

306− var navigation = findChild(dashNavigationButton, "navigation0child3");

303+ var navigation = findChild(dashNavigation, "navigation0child3");

307304 mouseClick(navigation);

308− compare(dashNavigationButton.showList, false);

309− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle3");

305+ compare(peExtraPanel.visible, false);

306+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle3");

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

311308

312− mouseClick(dashNavigationButton);

313− compare(dashNavigationButton.showList, true);

309+ mouseClick(searchTextField);

310+ tryCompare(peExtraPanel, "visible", true);

314311 waitForRendering(navigationListView);

315312 waitForRendering(navigationListView.currentItem);

316− compare(allButton.visible, true);

317313

318− mouseClick(allButton);

319− compare(dashNavigationButton.showList, false);

320− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "root");

314+ var header0 = findChild(dashNavigation, "dashNavigationHeader0");

315+ compare(header0.backVisible, false);

316+ mouseClick(header0);

317+ compare(peExtraPanel.visible, false);

318+ tryCompare(dashNavigation.currentNavigation, "navigationId", "root");

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

322320

323− mouseClick(dashNavigationButton);

324− compare(dashNavigationButton.showList, true);

321+ var headerContainer = findChild(dashContentList.currentItem, "headerContainer");

322+ tryCompare(headerContainer, "contentY", headerContainer.height);

323+ mouseClick(searchButton);

324+ tryCompare(peExtraPanel, "visible", true);

325325 waitForRendering(navigationListView);

326326 waitForRendering(navigationListView.currentItem);

327− compare(allButton.visible, false);

328327

329− navigation = findChild(dashNavigationButton, "navigation0child2");

328+ navigation = findChild(dashNavigation, "navigation0child2");

330329 mouseClick(navigation);

331− compare(dashNavigationButton.showList, true);

332− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");

330+ compare(peExtraPanel.visible, true);

331+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

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

334333

335− var navigationList1 = findChild(dashNavigationButton, "navigation1");

336− allButton = findChild(navigationList1, "allButton");

337− var backButton = findChild(findChild(navigationList1, "navigation1"), "backButton");

338− compare(allButton.visible, true);

339− compare(backButton.visible, true);

334+ var navigationList1 = findChild(dashNavigation, "navigation1");

335+ var header1 = findChild(dashNavigation, "dashNavigationHeader1");

336+ compare(header0.height, 0);

337+ compare(header1.backVisible, true);

340338

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

342340 waitForRendering(navigationListView);

343− mouseClick(allButton);

344− compare(dashNavigationButton.showList, false);

345− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");

341+ mouseClick(header1);

342+ compare(peExtraPanel.visible, false);

343+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

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

347345

348− mouseClick(dashNavigationButton);

349− compare(dashNavigationButton.showList, true);

346+ mouseClick(searchTextField);

347+ tryCompare(peExtraPanel, "visible", true);

350348 waitForRendering(navigationListView);

351349 waitForRendering(navigationListView.currentItem);

352− compare(allButton.visible, true);

353− compare(backButton.visible, true);

350+ compare(header0.height, 0);

351+ compare(header1.backVisible, true);

354352

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

356− tryCompare(navigationList1, "implicitHeight", navigationList1.itemHeight * 10);

354+ tryCompare(navigationList1, "implicitHeight", navigationList1.itemHeight * 8);

357355 tryCompare(navigationList1, "height", navigationList1.implicitHeight);

358− navigation = findChild(dashNavigationButton, "navigation1child2");

356+ navigation = findChild(dashNavigation, "navigation1child2");

359357 mouseClick(navigation);

360− compare(dashNavigationButton.showList, false);

361− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "childmiddle22");

358+ compare(peExtraPanel.visible, false);

359+ tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle22");

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

363361

364− mouseClick(dashNavigationButton);

365− compare(dashNavigationButton.showList, true);

362+ mouseClick(searchTextField);

363+ tryCompare(peExtraPanel, "visible", true);

366364 waitForRendering(navigationListView);

367365 waitForRendering(navigationListView.currentItem);

368366

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

370− navigation = findChild(dashNavigationButton, "navigation1child3");

368+ navigation = findChild(dashNavigation, "navigation1child3");

371369 mouseClick(navigation);

372− compare(dashNavigationButton.showList, false);

373− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "childmiddle23");

370+ compare(peExtraPanel.visible, false);

371+ tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle23");

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

375373

376− mouseClick(dashNavigationButton);

377− compare(dashNavigationButton.showList, true);

374+ mouseClick(searchTextField);

375+ tryCompare(peExtraPanel, "visible", true);

378376 waitForRendering(navigationListView);

379377 waitForRendering(navigationListView.currentItem);

380− mouseClick(backButton);

378+ mouseClick(findChild(header1, "backButton"));

381379

382− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "root");

380+ tryCompare(dashNavigation.currentNavigation, "navigationId", "root");

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

384− compare(dashNavigationButton.showList, true);

385− mouseClick(dashNavigationButton);

386− compare(dashNavigationButton.showList, false);

382+ compare(peExtraPanel.visible, true);

383+ mouseClick(header0);

384+ compare(peExtraPanel.visible, false);

387385

388− mouseClick(dashNavigationButton);

389− compare(dashNavigationButton.showList, true);

386+ tryCompare(headerContainer, "contentY", headerContainer.height);

387+ mouseClick(searchButton);

388+ tryCompare(peExtraPanel, "visible", true);

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

391− var navigationList0 = findChild(dashNavigationButton, "navigation0");

390+ var navigationList0 = findChild(dashNavigation, "navigation0");

392391 tryCompare(navigationList0, "implicitHeight", navigationList0.itemHeight * 8);

393392 tryCompare(navigationList0, "height", navigationList0.implicitHeight);

394− navigation = findChild(dashNavigationButton, "navigation0child2");

393+ navigation = findChild(dashNavigation, "navigation0child2");

395394 mouseClick(navigation);

396− compare(dashNavigationButton.showList, true);

397− navigationList1 = findChild(dashNavigationButton, "navigation1");

395+ compare(peExtraPanel.visible, true);

396+ navigationList1 = findChild(dashNavigation, "navigation1");

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

399− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");

400− allButton = findChild(navigationList1, "allButton");

401− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");

402− mouseClick(allButton);

403− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");

398+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

399+ mouseClick(header0);

400+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");

404401 }

405402

406403 function test_searchHint() {