a9ffaee · unity8 · git.iko.soy

311 tryCompare(listView, "contentY", -listView.topMargin, 5000, "Launcher did not start up with first item unfolded");

312

313 // 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");

315

316 removeTimeConstraintsFromSwipeAreas(root);

317

533 launcherListView.moveToIndex(i);

534 waitForRendering(launcherListView);

535 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);

537 // Intentionally allow type coercion (string/number)

538 compare(findChild(delegate, "countLabel").text == LauncherModel.get(i).count, true)

539 }

549 tryCompare(moveAnimation, "running", false);

550

551 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);

553 }

554 }

555

563 waitForRendering(launcherListView);

564 tryCompare(moveAnimation, "running", false);

565 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);

567 }

568 }

569

704 tryCompare(draggedItem, "height", units.gu(1))

705 }

706

707− waitForRendering(draggedItem)

708− compare(LauncherModel.get(4).appId, item3)

707+ tryCompare(LauncherModel.get(4), "appId", item3);

709− compare(LauncherModel.get(3).appId, item4)

708+ tryCompare(LauncherModel.get(3), "appId", item4);

710 }

709 }

711

710

712 // Releasing and checking if initial values are restored

711 // Releasing and checking if initial values are restored

858

857

859 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)

858 tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)

860 tryCompare(draggedItem, "height", units.gu(1))

859 tryCompare(draggedItem, "height", units.gu(1))

861−

862− waitForRendering(draggedItem)

863− compare(LauncherModel.get(4).appId, item3)

860+ tryCompare(LauncherModel.get(4), "appId", item3);

864− compare(LauncherModel.get(3).appId, item4)

861+ tryCompare(LauncherModel.get(3), "appId", item4);

865

862

866 // Releasing and checking if initial values are restored

863 // Releasing and checking if initial values are restored

867 mouseRelease(launcher)

864 mouseRelease(launcher)

905 clickThroughTester.pressCount = 0;

902 clickThroughTester.pressCount = 0;

906 mouseClick(root, root.width / 2, units.gu(1));

903 mouseClick(root, root.width / 2, units.gu(1));

907 waitUntilLauncherDisappears();

904 waitUntilLauncherDisappears();

908− verify(launcher.state == "");

905+ tryCompare(launcher, "state", "");

909 compare(clickThroughTester.pressCount, 1);

906 compare(clickThroughTester.pressCount, 1);

910

907

911 // and repeat, as a test for regression in lpbug#1531339

908 // and repeat, as a test for regression in lpbug#1531339

914 clickThroughTester.pressCount = 0;

911 clickThroughTester.pressCount = 0;

915 mouseClick(root, root.width / 2, units.gu(1));

912 mouseClick(root, root.width / 2, units.gu(1));

916 waitUntilLauncherDisappears();

913 waitUntilLauncherDisappears();

917− verify(launcher.state == "");

914+ tryCompare(launcher, "state", "");

918 compare(clickThroughTester.pressCount, 1);

915 compare(clickThroughTester.pressCount, 1);

919 }

916 }

920

917

944 tryCompare(quickListShape, "opacity", 0.95);

941 tryCompare(quickListShape, "opacity", 0.95);

945 mouseRelease(draggedItem);

942 mouseRelease(draggedItem);

946

943

947− verify(quickList.y >= units.gu(1));

944+ tryVerify(function() {return (quickList.y >= units.gu(1))});

948− verify(quickList.y + quickList.height + units.gu(1) <= launcher.height);

945+ tryVerify(function() {return (quickList.y + quickList.height + units.gu(1) <= launcher.height)});

949 compare(quickList.width, units.gu(30));

946 compare(quickList.width, units.gu(30));

950

947

951 // Click somewhere in the empty space to dismiss the quicklist

948 // Click somewhere in the empty space to dismiss the quicklist

990 // QuickList needs to be closed when some clickable item is clicked

987 // QuickList needs to be closed when some clickable item is clicked

991 tryCompare(quickListShape, "visible", false)

988 tryCompare(quickListShape, "visible", false)

992

989

993− compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")

990+ tryCompare(signalSpy, "count", 1, 5000, "Quicklist signal wasn't triggered");

994− compare(signalSpy.signalArguments[0][0], LauncherModel.get(5).appId)

991+ compare(signalSpy.signalArguments[0][0], LauncherModel.get(5).appId);

995 compare(signalSpy.signalArguments[0][1], 2)

992 compare(signalSpy.signalArguments[0][1], 2)

996

993

997 } else {

994 } else {

998

995

999 // QuickList must not be closed when a non-clickable item is clicked

996 // 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");

1001

998

1002 compare(signalSpy.count, 0, "Quicklist signal must NOT be triggered when clicking a non-clickable item")

999 compare(signalSpy.count, 0, "Quicklist signal must NOT be triggered when clicking a non-clickable item")

1003

1000

1052 verify(!!panel);

1049 verify(!!panel);

1053

1050

1054 revealByEdgePush();

1051 revealByEdgePush();

1055− compare(launcher.state, "visibleTemporary");

1052+ tryCompare(launcher, "state", "visibleTemporary");

1056

1053

1057 // Now move the mouse away and make sure it hides in less than a second

1054 // Now move the mouse away and make sure it hides in less than a second

1058 mouseMove(root, root.width, root.height / 2)

1055 mouseMove(root, root.width, root.height / 2)

1059

1056

1060 // trigger the hide timer

1057 // trigger the hide timer

1061− compare(fakeDismissTimer.running, true);

1058+ tryCompare(fakeDismissTimer, "running", true);

1062 fakeDismissTimer.triggered();

1059 fakeDismissTimer.triggered();

1063 tryCompare(panel, "x", 0);

1060 tryCompare(panel, "x", 0);

1064

1061

1069 function test_progressChangeViaModel() {

1066 function test_progressChangeViaModel() {

1070 dragLauncherIntoView();

1067 dragLauncherIntoView();

1071 var item = findChild(launcher, "launcherDelegate0")

1068 var item = findChild(launcher, "launcherDelegate0")

1069+ var progress = findChild(item, "progressOverlay");

1072 verify(item != undefined)

1070 verify(item != undefined)

1073 LauncherModel.setProgress(LauncherModel.get(0).appId, -1)

1071 LauncherModel.setProgress(LauncherModel.get(0).appId, -1)

1074− compare(findChild(item, "progressOverlay").visible, false)

1072+ tryCompare(progress, "visible", false);

1075 LauncherModel.setProgress(LauncherModel.get(0).appId, 20)

1073 LauncherModel.setProgress(LauncherModel.get(0).appId, 20)

1076− compare(findChild(item, "progressOverlay").visible, true)

1074+ tryCompare(progress, "visible", true);

1077 LauncherModel.setProgress(LauncherModel.get(0).appId, 0)

1075 LauncherModel.setProgress(LauncherModel.get(0).appId, 0)

1078 }

1076 }

1079

1077

1101

1099

1102 function test_alertIgnoreFocusedApp() {

1100 function test_alertIgnoreFocusedApp() {

1103 LauncherModel.setAlerting(LauncherModel.get(0).appId, true)

1101 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");

1105 }

1103 }

1106

1104

1107 function test_alertOnlyOnePeekingIcon() {

1105 function test_alertOnlyOnePeekingIcon() {

1291 keyClick(Qt.Key_Down); // Down to quicklist item 3

1289 keyClick(Qt.Key_Down); // Down to quicklist item 3

1292 keyClick(Qt.Key_Enter); // Trigger it

1290 keyClick(Qt.Key_Enter); // Trigger it

1293

1291

1294− compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")

1292+ tryCompare(signalSpy, "count", 1, 5000, "Quicklist signal wasn't triggered");

1295 compare(signalSpy.signalArguments[0][0], LauncherModel.get(1).appId)

1293 compare(signalSpy.signalArguments[0][0], LauncherModel.get(1).appId)

1296 compare(signalSpy.signalArguments[0][1], 3)

1294 compare(signalSpy.signalArguments[0][1], 3)

1297 assertFocusOnIndex(-2);

1295 assertFocusOnIndex(-2);

1371

1369

1372 var delegate = findChild(launcher, "launcherDelegate" + i);

1370 var delegate = findChild(launcher, "launcherDelegate" + i);

1373 var surfacePipRepeater = findInvisibleChild(delegate, "surfacePipRepeater");

1371 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));

1375 }

1373 }

1376 }

1374 }

1377

1375

1484

1482

1485 dragLauncherIntoView();

1483 dragLauncherIntoView();

1486 var launcherPanel = findChild(launcher, "launcherPanel");

1484 var launcherPanel = findChild(launcher, "launcherPanel");

1487− compare(launcherPanel.x, 0);

1485+ tryCompare(launcherPanel, "x", 0);

1488−

1489− launcher.available = true;

1490 }

1486 }

1491

1487

1492 function test_launcherDisabledSetting() {

1488 function test_launcherDisabledSetting() {

1493 launcher.available = false;

1489 launcher.available = false;

1494

1490

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()

1496 dragLauncher();

1492 dragLauncher();

1497 var launcherPanel = findChild(launcher, "launcherPanel");

1493 var launcherPanel = findChild(launcher, "launcherPanel");

1498 compare(launcherPanel.x, -launcherPanel.width);

1494 compare(launcherPanel.x, -launcherPanel.width);

1507 mouseMove(root, 1, root.height / 2);

1503 mouseMove(root, 1, root.height / 2);

1508

1504

1509 // trigger the hide timer

1505 // trigger the hide timer

1510− compare(fakeDismissTimer.running, true);

1506+ tryCompare(fakeDismissTimer, "running", true);

1511 fakeDismissTimer.triggered();

1507 fakeDismissTimer.triggered();

1512

1508

1513 compare(launcher.state, "visibleTemporary");

1509 compare(launcher.state, "visibleTemporary");

1565

1561

1566 // Open quickList

1562 // Open quickList

1567 mouseClick(clickedItem, clickedItem.width / 2, clickedItem.height / 2, Qt.RightButton)

1563 mouseClick(clickedItem, clickedItem.width / 2, clickedItem.height / 2, Qt.RightButton)

1568− verify(quickList, "state", "open")

1564+ tryCompare(quickList, "state", "open");

1569− compare(quickList.selectedIndex, -1)

1565+ tryCompare(quickList, "selectedIndex", -1);

1570

1566

1571 var qEntry = findChild(launcher, "quickListEntry0");

1567 var qEntry = findChild(launcher, "quickListEntry0");

1572 mouseMove(qEntry, qEntry.width / 2 , qEntry.height / 2, 10);

1568 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);

1574

1570

1575 tryCompare(quickList, "selectedIndex", 0)

1571 tryCompare(quickList, "selectedIndex", 0)

1576

1572