on xenial help sign in
fix dnd test

flick the listview to its end to have a defined starting state before starting the test and use item 3 and 4 instead of 4 and 5

commit1ba7ec9b3a1583f3ff719159061b8600c6f8f8f2 authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 23 Aug 2013, 18:19 (13 years ago) parentcfda370
1 file changed+8−4
tests/qmltests/Launcher/tst_Launcher.qml+8−4
tests/qmltests/Launcher/tst_Launcher.qml+8−4
@@ -285,12 +285,16 @@ Item {
285285
286286 function test_dragndrop(data) {
287287 revealer.dragLauncherIntoView();
288− var draggedItem = findChild(launcher, "launcherDelegate5")
288+ var draggedItem = findChild(launcher, "launcherDelegate4")
289289 var item0 = findChild(launcher, "launcherDelegate0")
290290 var fakeDragItem = findChild(launcher, "fakeDragItem")
291291 var initialItemHeight = draggedItem.height
292− var item5 = LauncherModel.get(5).appId
293292 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);
294298
295299 // Initial state
296300 compare(draggedItem.itemOpacity, 1, "Item's opacity is not 1 at beginning")
@@ -333,8 +337,8 @@ Item {
333337 }
334338
335339 waitForRendering(draggedItem)
336− compare(LauncherModel.get(5).appId, item4)
337− compare(LauncherModel.get(4).appId, item5)
340+ compare(LauncherModel.get(4).appId, item3)
341+ compare(LauncherModel.get(3).appId, item4)
338342 }
339343
340344 // Releasing and checking if initial values are restored