git.iko.soy/unity8
on xenial help sign in
Make the DashContent::test_mainNavigation test more stable Fixes: #1450809
0da2368Albert Astals Cid
tests/qmltests/Dash/tst_DashContent.qml+7−2
compare with xenial
unifiedsplit
@@ -142,7 +142,7 @@ Item {
142
142
143 var startX = dashContentList.width/2;
143 var startX = dashContentList.width/2;
144 var startY = dashContentList.height/2;
144 var startY = dashContentList.height/2;
145− touchFlick(dashContentList, startX - units.gu(2), startY, startX, startY);
145+ touchFlick(dashContentList, startX - units.gu(4), startY, startX, startY);
146 tryCompare(categoryListView, "contentY", units.gu(15) - categoryListView.pageHeader.height);
146 tryCompare(categoryListView, "contentY", units.gu(15) - categoryListView.pageHeader.height);
147 }
147 }
148
148
@@ -153,7 +153,7 @@ Item {
153
153
154 tryCompare(scope, "status", Loader.Ready);
154 tryCompare(scope, "status", Loader.Ready);
155
155
156− var categoryListView = findChild(dashContentList, "categoryListView");
156+ var categoryListView = findChild(scope, "categoryListView");
157 categoryListView.contentY = units.gu(10);
157 categoryListView.contentY = units.gu(10);
158
158
159 compare(dashContentList.currentItem.item.objectName, "MockScope1")
159 compare(dashContentList.currentItem.item.objectName, "MockScope1")
@@ -353,6 +353,8 @@ Item {
353 compare(backButton.visible, true);
353 compare(backButton.visible, true);
354
354
355 tryCompare(navigationList1.navigation, "loaded", true);
355 tryCompare(navigationList1.navigation, "loaded", true);
356+ tryCompare(navigationList1, "implicitHeight", navigationList1.itemHeight * 10);
357+ tryCompare(navigationList1, "height", navigationList1.implicitHeight);
356 navigation = findChild(dashNavigationButton, "navigation1child2");
358 navigation = findChild(dashNavigationButton, "navigation1child2");
357 mouseClick(navigation);
359 mouseClick(navigation);
358 compare(dashNavigationButton.showList, false);
360 compare(dashNavigationButton.showList, false);
@@ -386,6 +388,9 @@ Item {
386 mouseClick(dashNavigationButton);
388 mouseClick(dashNavigationButton);
387 compare(dashNavigationButton.showList, true);
389 compare(dashNavigationButton.showList, true);
388 tryCompare(navigationListView.currentItem.navigation, "loaded", true);
390 tryCompare(navigationListView.currentItem.navigation, "loaded", true);
391+ var navigationList0 = findChild(dashNavigationButton, "navigation0");
392+ tryCompare(navigationList0, "implicitHeight", navigationList0.itemHeight * 8);
393+ tryCompare(navigationList0, "height", navigationList0.implicitHeight);
389 navigation = findChild(dashNavigationButton, "navigation0child2");
394 navigation = findChild(dashNavigationButton, "navigation0child2");
390 mouseClick(navigation);
395 mouseClick(navigation);
391 compare(dashNavigationButton.showList, true);
396 compare(dashNavigationButton.showList, true);