@@ -311,7 +311,7 @@ Rectangle {
311311 tryCompare(listView, "contentY", -listView.topMargin, 5000, "Launcher did not start up with first item unfolded");
312312
313313 // Now do check that snapping is in fact enabled
314− compare(listView.snapMode, ListView.SnapToItem, "Snapping is not enabled");
314+ tryCompare(listView, "snapMode", ListView.SnapToItem, 5000, "Snapping is not enabled");
315315
316316 removeTimeConstraintsFromSwipeAreas(root);
317317
@@ -533,7 +533,7 @@ Rectangle {
533533 launcherListView.moveToIndex(i);
534534 waitForRendering(launcherListView);
535535 var delegate = findChild(launcherListView, "launcherDelegate" + i)
536− compare(findChild(delegate, "countEmblem").visible, LauncherModel.get(i).countVisible)
536+ tryCompare(findChild(delegate, "countEmblem"), "visible", LauncherModel.get(i).countVisible);
537537 // Intentionally allow type coercion (string/number)
538538 compare(findChild(delegate, "countLabel").text == LauncherModel.get(i).count, true)
539539 }
@@ -549,7 +549,7 @@ Rectangle {
549549 tryCompare(moveAnimation, "running", false);
550550
551551 var delegate = findChild(launcherListView, "launcherDelegate" + i)
552− compare(findChild(delegate, "progressOverlay").visible, LauncherModel.get(i).progress >= 0)
552+ tryCompare(findChild(delegate, "progressOverlay"), "visible", LauncherModel.get(i).progress >= 0);
553553 }
554554 }
555555
@@ -563,7 +563,7 @@ Rectangle {
563563 waitForRendering(launcherListView);
564564 tryCompare(moveAnimation, "running", false);
565565 var delegate = findChild(launcherListView, "launcherDelegate" + i)
566− compare(findChild(delegate, "focusedHighlight").visible, LauncherModel.get(i).focused)
566+ tryCompare(findChild(delegate, "focusedHighlight"), "visible", LauncherModel.get(i).focused);
567567 }
568568 }
569569
@@ -704,9 +704,8 @@ Rectangle {
704704 tryCompare(draggedItem, "height", units.gu(1))
705705 }
706706
707− waitForRendering(draggedItem)
708− compare(LauncherModel.get(4).appId, item3)
709− compare(LauncherModel.get(3).appId, item4)
707+ tryCompare(LauncherModel.get(4), "appId", item3);
708+ tryCompare(LauncherModel.get(3), "appId", item4);
710709 }
711710
712711 // Releasing and checking if initial values are restored
@@ -858,10 +857,8 @@ Rectangle {
858857
859858 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)
860859 tryCompare(draggedItem, "height", units.gu(1))
861−
862− waitForRendering(draggedItem)
863− compare(LauncherModel.get(4).appId, item3)
864− compare(LauncherModel.get(3).appId, item4)
860+ tryCompare(LauncherModel.get(4), "appId", item3);
861+ tryCompare(LauncherModel.get(3), "appId", item4);
865862
866863 // Releasing and checking if initial values are restored
867864 mouseRelease(launcher)
@@ -905,7 +902,7 @@ Rectangle {
905902 clickThroughTester.pressCount = 0;
906903 mouseClick(root, root.width / 2, units.gu(1));
907904 waitUntilLauncherDisappears();
908− verify(launcher.state == "");
905+ tryCompare(launcher, "state", "");
909906 compare(clickThroughTester.pressCount, 1);
910907
911908 // and repeat, as a test for regression in lpbug#1531339
@@ -914,7 +911,7 @@ Rectangle {
914911 clickThroughTester.pressCount = 0;
915912 mouseClick(root, root.width / 2, units.gu(1));
916913 waitUntilLauncherDisappears();
917− verify(launcher.state == "");
914+ tryCompare(launcher, "state", "");
918915 compare(clickThroughTester.pressCount, 1);
919916 }
920917
@@ -944,8 +941,8 @@ Rectangle {
944941 tryCompare(quickListShape, "opacity", 0.95);
945942 mouseRelease(draggedItem);
946943
947− verify(quickList.y >= units.gu(1));
948− verify(quickList.y + quickList.height + units.gu(1) <= launcher.height);
944+ tryVerify(function() {return (quickList.y >= units.gu(1))});
945+ tryVerify(function() {return (quickList.y + quickList.height + units.gu(1) <= launcher.height)});
949946 compare(quickList.width, units.gu(30));
950947
951948 // Click somewhere in the empty space to dismiss the quicklist
@@ -990,14 +987,14 @@ Rectangle {
990987 // QuickList needs to be closed when some clickable item is clicked
991988 tryCompare(quickListShape, "visible", false)
992989
993− compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")
994− compare(signalSpy.signalArguments[0][0], LauncherModel.get(5).appId)
990+ tryCompare(signalSpy, "count", 1, 5000, "Quicklist signal wasn't triggered");
991+ compare(signalSpy.signalArguments[0][0], LauncherModel.get(5).appId);
995992 compare(signalSpy.signalArguments[0][1], 2)
996993
997994 } else {
998995
999996 // QuickList must not be closed when a non-clickable item is clicked
1000− verify(quickListShape.visible, "QuickList must be visible")
997+ tryCompare(quickListShape, "visible", true, 5000, "QuickList must be visible");
1001998
1002999 compare(signalSpy.count, 0, "Quicklist signal must NOT be triggered when clicking a non-clickable item")
10031000
@@ -1052,13 +1049,13 @@ Rectangle {
10521049 verify(!!panel);
10531050
10541051 revealByEdgePush();
1055− compare(launcher.state, "visibleTemporary");
1052+ tryCompare(launcher, "state", "visibleTemporary");
10561053
10571054 // Now move the mouse away and make sure it hides in less than a second
10581055 mouseMove(root, root.width, root.height / 2)
10591056
10601057 // trigger the hide timer
1061− compare(fakeDismissTimer.running, true);
1058+ tryCompare(fakeDismissTimer, "running", true);
10621059 fakeDismissTimer.triggered();
10631060 tryCompare(panel, "x", 0);
10641061
@@ -1069,11 +1066,12 @@ Rectangle {
10691066 function test_progressChangeViaModel() {
10701067 dragLauncherIntoView();
10711068 var item = findChild(launcher, "launcherDelegate0")
1069+ var progress = findChild(item, "progressOverlay");
10721070 verify(item != undefined)
10731071 LauncherModel.setProgress(LauncherModel.get(0).appId, -1)
1074− compare(findChild(item, "progressOverlay").visible, false)
1072+ tryCompare(progress, "visible", false);
10751073 LauncherModel.setProgress(LauncherModel.get(0).appId, 20)
1076− compare(findChild(item, "progressOverlay").visible, true)
1074+ tryCompare(progress, "visible", true);
10771075 LauncherModel.setProgress(LauncherModel.get(0).appId, 0)
10781076 }
10791077
@@ -1101,7 +1099,7 @@ Rectangle {
11011099
11021100 function test_alertIgnoreFocusedApp() {
11031101 LauncherModel.setAlerting(LauncherModel.get(0).appId, true)
1104− compare(LauncherModel.get(0).alerting, false, "Focused app should not have the alert-state set")
1102+ compare(LauncherModel.get(0).alerting, false, "Focused app should not have the alert-state set");
11051103 }
11061104
11071105 function test_alertOnlyOnePeekingIcon() {
@@ -1291,7 +1289,7 @@ Rectangle {
12911289 keyClick(Qt.Key_Down); // Down to quicklist item 3
12921290 keyClick(Qt.Key_Enter); // Trigger it
12931291
1294− compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")
1292+ tryCompare(signalSpy, "count", 1, 5000, "Quicklist signal wasn't triggered");
12951293 compare(signalSpy.signalArguments[0][0], LauncherModel.get(1).appId)
12961294 compare(signalSpy.signalArguments[0][1], 3)
12971295 assertFocusOnIndex(-2);
@@ -1371,7 +1369,7 @@ Rectangle {
13711369
13721370 var delegate = findChild(launcher, "launcherDelegate" + i);
13731371 var surfacePipRepeater = findInvisibleChild(delegate, "surfacePipRepeater");
1374− compare(surfacePipRepeater.model, Math.min(3, LauncherModel.get(i).surfaceCount))
1372+ tryCompare(surfacePipRepeater, "model", Math.min(3, LauncherModel.get(i).surfaceCount));
13751373 }
13761374 }
13771375
@@ -1484,15 +1482,13 @@ Rectangle {
14841482
14851483 dragLauncherIntoView();
14861484 var launcherPanel = findChild(launcher, "launcherPanel");
1487− compare(launcherPanel.x, 0);
1488−
1489− launcher.available = true;
1485+ tryCompare(launcherPanel, "x", 0);
14901486 }
14911487
14921488 function test_launcherDisabledSetting() {
14931489 launcher.available = false;
14941490
1495− //We don't actually care that it's visible, so juct use dragLauncher() rather than dragLauncherIntoView()
1491+ //We don't actually care that it's visible, so just use dragLauncher() rather than dragLauncherIntoView()
14961492 dragLauncher();
14971493 var launcherPanel = findChild(launcher, "launcherPanel");
14981494 compare(launcherPanel.x, -launcherPanel.width);
@@ -1507,7 +1503,7 @@ Rectangle {
15071503 mouseMove(root, 1, root.height / 2);
15081504
15091505 // trigger the hide timer
1510− compare(fakeDismissTimer.running, true);
1506+ tryCompare(fakeDismissTimer, "running", true);
15111507 fakeDismissTimer.triggered();
15121508
15131509 compare(launcher.state, "visibleTemporary");
@@ -1565,12 +1561,12 @@ Rectangle {
15651561
15661562 // Open quickList
15671563 mouseClick(clickedItem, clickedItem.width / 2, clickedItem.height / 2, Qt.RightButton)
1568− verify(quickList, "state", "open")
1569− compare(quickList.selectedIndex, -1)
1564+ tryCompare(quickList, "state", "open");
1565+ tryCompare(quickList, "selectedIndex", -1);
15701566
15711567 var qEntry = findChild(launcher, "quickListEntry0");
15721568 mouseMove(qEntry, qEntry.width / 2 , qEntry.height / 2, 10);
1573− mouseMove(qEntry, qEntry.width / 2 + 1, qEntry.height / 2, 10);
1569+ mouseMove(qEntry, qEntry.width / 2 + 5, qEntry.height / 2, 10);
15741570
15751571 tryCompare(quickList, "selectedIndex", 0)
15761572