git.iko.soy/unity8
on xenial help sign in
Adapt test_mainNavigation to the new ui/ux
631c1edAlbert Astals Cid
qml/Dash/DashNavigation.qml+3−1
compare with xenial
unifiedsplit
@@ -63,6 +63,7 @@ Item {
63 // parentNavigationId: the parent navigation Id
63 // parentNavigationId: the parent navigation Id
64 }
64 }
65 delegate: DashNavigationHeader {
65 delegate: DashNavigationHeader {
66+ objectName: "dashNavigationHeader" + index
66 height: index == 0 && headersModel.count > 1 ? 0 : units.gu(5)
67 height: index == 0 && headersModel.count > 1 ? 0 : units.gu(5)
67 width: parent.width
68 width: parent.width
68
69
@@ -91,11 +92,12 @@ Item {
91 }
92 }
92
93
93 onTextClicked: {
94 onTextClicked: {
94− root.leafClicked();
95 scope.setNavigationState(navigationId);
95 scope.setNavigationState(navigationId);
96
96
97 var popsNeeded = headersModel.count - index - 1;
97 var popsNeeded = headersModel.count - index - 1;
98 pop(popsNeeded);
98 pop(popsNeeded);
99+
100+ root.leafClicked();
99 }
101 }
100 }
102 }
101 }
103 }
qml/Dash/DashNavigationHeader.qml+1−1
@@ -33,6 +33,7 @@ Row {
33
33
34 ListItem.Standard {
34 ListItem.Standard {
35 id: backImageItem
35 id: backImageItem
36+ objectName: "backButton"
36 height: parent.height
37 height: parent.height
37 width: height
38 width: height
38 showDivider: false
39 showDivider: false
@@ -50,7 +51,6 @@ Row {
50
51
51 ListItem.Standard {
52 ListItem.Standard {
52 id: textItem
53 id: textItem
53− objectName: "allButton"
54 height: parent.height
54 height: parent.height
55 showDivider: false
55 showDivider: false
56
56
qml/Dash/GenericScopeView.qml+1
@@ -647,6 +647,7 @@ FocusScope {
647
647
648 PageHeaderExtraPanel {
648 PageHeaderExtraPanel {
649 id: peExtraPanel
649 id: peExtraPanel
650+ objectName: "peExtraPanel"
650 width: parent.width >= units.gu(60) ? units.gu(40) : parent.width
651 width: parent.width >= units.gu(60) ? units.gu(40) : parent.width
651 anchors {
652 anchors {
652 top: categoryView.pageHeader.bottom
653 top: categoryView.pageHeader.bottom
qml/Dash/PageHeader.qml+3−3
@@ -77,6 +77,9 @@ Item {
77 } else if (!keepFocus) {
77 } else if (!keepFocus) {
78 unfocus();
78 unfocus();
79 }
79 }
80+ if (!searchTextField.text && !root.navigationTag) {
81+ headerContainer.showSearch = false;
82+ }
80 }
83 }
81
84
82 function resetSearch(keepFocus) {
85 function resetSearch(keepFocus) {
@@ -122,9 +125,6 @@ Item {
122 visible: headerContainer.showSearch
125 visible: headerContainer.showSearch
123 onPressed: {
126 onPressed: {
124 closePopup(/* keepFocus */false);
127 closePopup(/* keepFocus */false);
125− if (!searchTextField.text && !root.navigationTag) {
126− headerContainer.showSearch = false;
127− }
128 mouse.accepted = false;
128 mouse.accepted = false;
129 }
129 }
130 }
130 }
tests/qmltests/Dash/tst_DashContent.qml+62−65
@@ -284,14 +284,14 @@ Item {
284 var dashContentList = findChild(dashContent, "dashContentList");
284 var dashContentList = findChild(dashContent, "dashContentList");
285 tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
285 tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
286 var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
286 var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
287− tryCompare(dashNavigation, "visible", true);
287+ var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
288− var dashNavigationButton = findChild(dashContentList.currentItem, "navigationButton");
288+ var searchButton = findChild(dashContentList.currentItem, "search_header_button");
289− compare(dashNavigationButton.showList, false);
289+ var searchTextField = findChild(dashContentList.currentItem, "searchTextField");
290− waitForRendering(dashNavigationButton);
290+ compare(peExtraPanel.visible, false);
291− mouseClick(dashNavigationButton);
291+ mouseClick(searchButton);
292− compare(dashNavigationButton.showList, true);
292+ tryCompare(peExtraPanel, "visible", true);
293−
293+
294− var navigationListView = findChild(dashNavigationButton, "navigationListView");
294+ var navigationListView = findChild(dashNavigation, "navigationListView");
295 tryCompareFunction(function() {
295 tryCompareFunction(function() {
296 return navigationListView.currentItem &&
296 return navigationListView.currentItem &&
297 navigationListView.currentItem.navigation &&
297 navigationListView.currentItem.navigation &&
@@ -300,107 +300,104 @@ Item {
300 waitForRendering(navigationListView);
300 waitForRendering(navigationListView);
301 waitForRendering(navigationListView.currentItem);
301 waitForRendering(navigationListView.currentItem);
302
302
303− var allButton = findChild(dashNavigationButton, "allButton");
304− compare(allButton.visible, false);
305−
306− var navigation = findChild(dashNavigationButton, "navigation0child3");
303+ var navigation = findChild(dashNavigation, "navigation0child3");
307 mouseClick(navigation);
304 mouseClick(navigation);
308− compare(dashNavigationButton.showList, false);
305+ compare(peExtraPanel.visible, false);
309− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle3");
306+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle3");
310 tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
307 tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
311
308
312− mouseClick(dashNavigationButton);
309+ mouseClick(searchTextField);
313− compare(dashNavigationButton.showList, true);
310+ tryCompare(peExtraPanel, "visible", true);
314 waitForRendering(navigationListView);
311 waitForRendering(navigationListView);
315 waitForRendering(navigationListView.currentItem);
312 waitForRendering(navigationListView.currentItem);
316− compare(allButton.visible, true);
317
313
314+ var header0 = findChild(dashNavigation, "dashNavigationHeader0");
315+ compare(header0.backVisible, false);
318− mouseClick(allButton);
316+ mouseClick(header0);
319− compare(dashNavigationButton.showList, false);
317+ compare(peExtraPanel.visible, false);
320− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "root");
318+ tryCompare(dashNavigation.currentNavigation, "navigationId", "root");
321 tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
319 tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
322
320
323− mouseClick(dashNavigationButton);
321+ var headerContainer = findChild(dashContentList.currentItem, "headerContainer");
324− compare(dashNavigationButton.showList, true);
322+ tryCompare(headerContainer, "contentY", headerContainer.height);
323+ mouseClick(searchButton);
324+ tryCompare(peExtraPanel, "visible", true);
325 waitForRendering(navigationListView);
325 waitForRendering(navigationListView);
326 waitForRendering(navigationListView.currentItem);
326 waitForRendering(navigationListView.currentItem);
327− compare(allButton.visible, false);
328
327
329− navigation = findChild(dashNavigationButton, "navigation0child2");
328+ navigation = findChild(dashNavigation, "navigation0child2");
330 mouseClick(navigation);
329 mouseClick(navigation);
331− compare(dashNavigationButton.showList, true);
330+ compare(peExtraPanel.visible, true);
332− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");
331+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
333 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
332 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
334
333
335− var navigationList1 = findChild(dashNavigationButton, "navigation1");
334+ var navigationList1 = findChild(dashNavigation, "navigation1");
336− allButton = findChild(navigationList1, "allButton");
335+ var header1 = findChild(dashNavigation, "dashNavigationHeader1");
337− var backButton = findChild(findChild(navigationList1, "navigation1"), "backButton");
336+ compare(header0.height, 0);
338− compare(allButton.visible, true);
337+ compare(header1.backVisible, true);
339− compare(backButton.visible, true);
340
338
341 tryCompare(navigationListView, "contentX", navigationList1.x);
339 tryCompare(navigationListView, "contentX", navigationList1.x);
342 waitForRendering(navigationListView);
340 waitForRendering(navigationListView);
343− mouseClick(allButton);
341+ mouseClick(header1);
344− compare(dashNavigationButton.showList, false);
342+ compare(peExtraPanel.visible, false);
345− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");
343+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
346 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
344 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
347
345
348− mouseClick(dashNavigationButton);
346+ mouseClick(searchTextField);
349− compare(dashNavigationButton.showList, true);
347+ tryCompare(peExtraPanel, "visible", true);
350 waitForRendering(navigationListView);
348 waitForRendering(navigationListView);
351 waitForRendering(navigationListView.currentItem);
349 waitForRendering(navigationListView.currentItem);
352− compare(allButton.visible, true);
350+ compare(header0.height, 0);
353− compare(backButton.visible, true);
351+ compare(header1.backVisible, true);
354
352
355 tryCompare(navigationList1.navigation, "loaded", true);
353 tryCompare(navigationList1.navigation, "loaded", true);
356− tryCompare(navigationList1, "implicitHeight", navigationList1.itemHeight * 10);
354+ tryCompare(navigationList1, "implicitHeight", navigationList1.itemHeight * 8);
357 tryCompare(navigationList1, "height", navigationList1.implicitHeight);
355 tryCompare(navigationList1, "height", navigationList1.implicitHeight);
358− navigation = findChild(dashNavigationButton, "navigation1child2");
356+ navigation = findChild(dashNavigation, "navigation1child2");
359 mouseClick(navigation);
357 mouseClick(navigation);
360− compare(dashNavigationButton.showList, false);
358+ compare(peExtraPanel.visible, false);
361− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "childmiddle22");
359+ tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle22");
362 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
360 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
363
361
364− mouseClick(dashNavigationButton);
362+ mouseClick(searchTextField);
365− compare(dashNavigationButton.showList, true);
363+ tryCompare(peExtraPanel, "visible", true);
366 waitForRendering(navigationListView);
364 waitForRendering(navigationListView);
367 waitForRendering(navigationListView.currentItem);
365 waitForRendering(navigationListView.currentItem);
368
366
369 tryCompare(navigationList1.navigation, "loaded", true);
367 tryCompare(navigationList1.navigation, "loaded", true);
370− navigation = findChild(dashNavigationButton, "navigation1child3");
368+ navigation = findChild(dashNavigation, "navigation1child3");
371 mouseClick(navigation);
369 mouseClick(navigation);
372− compare(dashNavigationButton.showList, false);
370+ compare(peExtraPanel.visible, false);
373− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "childmiddle23");
371+ tryCompare(dashNavigation.currentNavigation, "navigationId", "childmiddle23");
374 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
372 tryCompare(navigationListView.currentItem.navigation, "navigationId", "middle2");
375
373
376− mouseClick(dashNavigationButton);
374+ mouseClick(searchTextField);
377− compare(dashNavigationButton.showList, true);
375+ tryCompare(peExtraPanel, "visible", true);
378 waitForRendering(navigationListView);
376 waitForRendering(navigationListView);
379 waitForRendering(navigationListView.currentItem);
377 waitForRendering(navigationListView.currentItem);
380− mouseClick(backButton);
378+ mouseClick(findChild(header1, "backButton"));
381
379
382− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "root");
380+ tryCompare(dashNavigation.currentNavigation, "navigationId", "root");
383 tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
381 tryCompare(navigationListView.currentItem.navigation, "navigationId", "root");
384− compare(dashNavigationButton.showList, true);
382+ compare(peExtraPanel.visible, true);
385− mouseClick(dashNavigationButton);
383+ mouseClick(header0);
386− compare(dashNavigationButton.showList, false);
384+ compare(peExtraPanel.visible, false);
387
385
388− mouseClick(dashNavigationButton);
386+ tryCompare(headerContainer, "contentY", headerContainer.height);
389− compare(dashNavigationButton.showList, true);
387+ mouseClick(searchButton);
388+ tryCompare(peExtraPanel, "visible", true);
390 tryCompare(navigationListView.currentItem.navigation, "loaded", true);
389 tryCompare(navigationListView.currentItem.navigation, "loaded", true);
391− var navigationList0 = findChild(dashNavigationButton, "navigation0");
390+ var navigationList0 = findChild(dashNavigation, "navigation0");
392 tryCompare(navigationList0, "implicitHeight", navigationList0.itemHeight * 8);
391 tryCompare(navigationList0, "implicitHeight", navigationList0.itemHeight * 8);
393 tryCompare(navigationList0, "height", navigationList0.implicitHeight);
392 tryCompare(navigationList0, "height", navigationList0.implicitHeight);
394− navigation = findChild(dashNavigationButton, "navigation0child2");
393+ navigation = findChild(dashNavigation, "navigation0child2");
395 mouseClick(navigation);
394 mouseClick(navigation);
396− compare(dashNavigationButton.showList, true);
395+ compare(peExtraPanel.visible, true);
397− navigationList1 = findChild(dashNavigationButton, "navigation1");
396+ navigationList1 = findChild(dashNavigation, "navigation1");
398 compare(navigationList1.navigation.loaded, false);
397 compare(navigationList1.navigation.loaded, false);
399− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");
400− allButton = findChild(navigationList1, "allButton");
401− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");
398+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
402− mouseClick(allButton);
399+ mouseClick(header0);
403− tryCompare(dashNavigationButton.currentNavigation, "navigationId", "middle2");
400+ tryCompare(dashNavigation.currentNavigation, "navigationId", "middle2");
404 }
401 }
405
402
406 function test_searchHint() {
403 function test_searchHint() {