git.iko.soy/unity8
on xenial help sign in
Try to make this more reliable on slow machines
12e5d0cAlbert Astals
tests/qmltests/Dash/tst_DashContent.qml+14−5
compare with xenial
unifiedsplit
@@ -242,18 +242,27 @@ Item {
242 tryCompare(scopesModel.get(2), "isActive", data.active2);
242 tryCompare(scopesModel.get(2), "isActive", data.active2);
243 }
243 }
244
244
245− function test_hswipe_disabled_vswipe() {
245+ function checkFlickMovingAndNotInteractive()
246+ {
246 var dashContentList = findChild(dashContent, "dashContentList");
247 var dashContentList = findChild(dashContent, "dashContentList");
247
248
248− tryCompare(dashContentList, "interactive", true);
249+ if (dashContentList.currentItem.moving && !dashContentList.interactive)
250+ return true;
249
251
250 var startX = dashContentList.width/2;
252 var startX = dashContentList.width/2;
251 var startY = dashContentList.height/2;
253 var startY = dashContentList.height/2;
252− touchFlick(dashContentList, startX, startY, startX, startY - units.gu(80));
254+ touchFlick(dashContentList, startX, startY, startX, startY - units.gu(40));
255+
256+ return dashContentList.currentItem.moving && !dashContentList.interactive;
257+ }
258+
253
259
260+ function test_hswipe_disabled_vswipe() {
261+ var dashContentList = findChild(dashContent, "dashContentList");
262+
254− tryCompare(dashContentList.currentItem, "moving", true);
263+ tryCompare(dashContentList, "interactive", true);
255
264
256− compare(dashContentList.interactive, false);
265+ tryCompareFunction(checkFlickMovingAndNotInteractive, true);
257 }
266 }
258 }
267 }
259}
268}