0af68ff · unity8 · git.iko.soy

tests/qmltests/Dash/Previews/tst_Preview.qml+1−1

@@ -113,7 +113,7 @@ Rectangle {

113

114 // Scroll down

115 var previewListRow0 = findChild(preview, "previewListRow0");

116− tryTouchFlickToYEnd(previewListRow0, previewListRow0.width / 2, units.gu(20), previewListRow0.width / 2, units.gu(1));

116+ flickToYEnd(previewListRow0);

117

118 // Click on the combo

119 var widget = findChild(preview, "widget-21");

tests/qmltests/Dash/tst_Dash.qml+1−1

@@ -497,7 +497,7 @@ Item {

497 tryCompare(subPageLoader, "x", 0);

498 tryCompare(findChild(dashTempScopeItem, "categoryListView"), "visible", false);

499 var previewListRow0 = findChild(subPageLoader, "previewListRow0");

500− tryTouchFlickToYEnd(previewListRow0, previewListRow0.width / 2, units.gu(20), previewListRow0.width / 2, units.gu(1));

500+ flickToYEnd(previewListRow0);

501 var widget = findChild(subPageLoader, "widget-21");

502 var initialWidgetHeight = widget.height;

503 var openButton = findChild(widget, "buttonopen_click");

tests/utils/modules/Unity/Test/UnityTestCase.qml+5−2

@@ -221,10 +221,13 @@ TestCase {

221 }

222 }

223

224− function tryTouchFlickToYEnd(item, x, y, toX, toY) {

224+ function flickToYEnd(item) {

225 var i = 0;

226+ var x = item.width / 2;

227+ var y = item.height - units.gu(1);

228+ var toY = units.gu(1);

226 while (i < 5 && !item.atYEnd) {

229 while (i < 5 && !item.atYEnd) {

227− touchFlick(item, x, y, toX, toY);

230+ touchFlick(item, x, y, x, toY);

228 tryCompare(item, "moving", false);

231 tryCompare(item, "moving", false);

229 ++i;

232 ++i;

230 }

233 }