git.iko.soy/unity8
on xenial help sign in
Fix tests
694640fAlbert Astals
tests/qmltests/Dash/qml/FakeScopeView.qml−1
compare with xenial
unifiedsplit
@@ -23,7 +23,6 @@ GenericScopeView {
23 id: fakeScopeView
23 id: fakeScopeView
24
24
25 property alias backColor : back.color
25 property alias backColor : back.color
26− moving: listView.moving
27
26
28 onEndReached: {
27 onEndReached: {
29 if (scope != undefined && shell != undefined && shell.scopeStatus != undefined) {
28 if (scope != undefined && shell != undefined && shell.scopeStatus != undefined) {
tests/qmltests/Dash/tst_DashContent.qml+1−1
@@ -249,7 +249,7 @@ Item {
249
249
250 var startX = dashContentList.width/2;
250 var startX = dashContentList.width/2;
251 var startY = dashContentList.height/2;
251 var startY = dashContentList.height/2;
252− touchFlick(dashContentList, startX, startY, startX, startY - units.gu(800));
252+ touchFlick(dashContentList, startX, startY, startX, startY - units.gu(80));
253
253
254 tryCompare(dashContentList.currentItem, "moving", true);
254 tryCompare(dashContentList.currentItem, "moving", true);
255
255
tests/utils/modules/Unity/Test/UnityTestCase.qml+2
@@ -214,6 +214,8 @@ TestCase {
214
214
215 // speed is in pixels/second
215 // speed is in pixels/second
216 function touchFlick(item, x, y, toX, toY, beginTouch, endTouch, speed, iterations) {
216 function touchFlick(item, x, y, toX, toY, beginTouch, endTouch, speed, iterations) {
217+ // Make sure the item is rendered
218+ waitForRendering(item);
217
219
218 // Default to true for beginTouch if not present
220 // Default to true for beginTouch if not present
219 beginTouch = (beginTouch !== undefined) ? beginTouch : true
221 beginTouch = (beginTouch !== undefined) ? beginTouch : true