git.iko.soy/unity8
on xenial help sign in
fix dnd test
1ba7ec9Michael Zanetti
tests/qmltests/Launcher/tst_Launcher.qml+8−4
compare with xenial
unifiedsplit
@@ -285,12 +285,16 @@ Item {
285
285
286 function test_dragndrop(data) {
286 function test_dragndrop(data) {
287 revealer.dragLauncherIntoView();
287 revealer.dragLauncherIntoView();
288− var draggedItem = findChild(launcher, "launcherDelegate5")
288+ var draggedItem = findChild(launcher, "launcherDelegate4")
289 var item0 = findChild(launcher, "launcherDelegate0")
289 var item0 = findChild(launcher, "launcherDelegate0")
290 var fakeDragItem = findChild(launcher, "fakeDragItem")
290 var fakeDragItem = findChild(launcher, "fakeDragItem")
291 var initialItemHeight = draggedItem.height
291 var initialItemHeight = draggedItem.height
292− var item5 = LauncherModel.get(5).appId
293 var item4 = LauncherModel.get(4).appId
292 var item4 = LauncherModel.get(4).appId
293+ var item3 = LauncherModel.get(3).appId
294+
295+ var listView = findChild(launcher, "launcherListView");
296+ listView.flick(0, units.gu(200));
297+ tryCompare(listView, "flicking", false);
294
298
295 // Initial state
299 // Initial state
296 compare(draggedItem.itemOpacity, 1, "Item's opacity is not 1 at beginning")
300 compare(draggedItem.itemOpacity, 1, "Item's opacity is not 1 at beginning")
@@ -333,8 +337,8 @@ Item {
333 }
337 }
334
338
335 waitForRendering(draggedItem)
339 waitForRendering(draggedItem)
336− compare(LauncherModel.get(5).appId, item4)
340+ compare(LauncherModel.get(4).appId, item3)
337− compare(LauncherModel.get(4).appId, item5)
341+ compare(LauncherModel.get(3).appId, item4)
338 }
342 }
339
343
340 // Releasing and checking if initial values are restored
344 // Releasing and checking if initial values are restored