git.iko.soy/unity8
on xenial help sign in
fix shell tests
15e5bc1Michael Zanetti
tests/qmltests/tst_Shell.qml+21−21
compare with xenial
unifiedsplit
@@ -1424,7 +1424,7 @@ Rectangle {
1424
1424
1425 // Do a quick alt-tab and see if focus changes
1425 // Do a quick alt-tab and see if focus changes
1426 tryCompare(app3.session.surface, "activeFocus", true)
1426 tryCompare(app3.session.surface, "activeFocus", true)
1427− keyClick(Qt.Key_Tab, Qt.ControlModifier)
1427+ keyClick(Qt.Key_Tab, Qt.AltModifier)
1428 tryCompare(app2.session.surface, "activeFocus", true)
1428 tryCompare(app2.session.surface, "activeFocus", true)
1429
1429
1430 var desktopSpread = findChild(shell, "spread")
1430 var desktopSpread = findChild(shell, "spread")
@@ -1432,12 +1432,12 @@ Rectangle {
1432 tryCompare(desktopSpread, "state", "")
1432 tryCompare(desktopSpread, "state", "")
1433
1433
1434 // Just press Alt, make sure the spread comes up
1434 // Just press Alt, make sure the spread comes up
1435− keyPress(Qt.Key_Control);
1435+ keyPress(Qt.Key_Alt);
1436 keyClick(Qt.Key_Tab);
1436 keyClick(Qt.Key_Tab);
1437 tryCompare(desktopSpread, "state", "altTab")
1437 tryCompare(desktopSpread, "state", "altTab")
1438
1438
1439 // Release control, check if spread disappears
1439 // Release control, check if spread disappears
1440− keyRelease(Qt.Key_Control)
1440+ keyRelease(Qt.Key_Alt)
1441 tryCompare(desktopSpread, "state", "")
1441 tryCompare(desktopSpread, "state", "")
1442
1442
1443 // Focus should have switched back now
1443 // Focus should have switched back now
@@ -1465,7 +1465,7 @@ Rectangle {
1465 tryCompare(desktopSpread, "state", "")
1465 tryCompare(desktopSpread, "state", "")
1466
1466
1467 // Just press Alt, make sure the spread comes up
1467 // Just press Alt, make sure the spread comes up
1468− keyPress(Qt.Key_Control);
1468+ keyPress(Qt.Key_Alt);
1469 keyClick(Qt.Key_Tab);
1469 keyClick(Qt.Key_Tab);
1470 tryCompare(desktopSpread, "state", "altTab")
1470 tryCompare(desktopSpread, "state", "altTab")
1471 tryCompare(spreadRepeater, "highlightedIndex", 1)
1471 tryCompare(spreadRepeater, "highlightedIndex", 1)
@@ -1486,7 +1486,7 @@ Rectangle {
1486 tryCompare(spreadRepeater, "highlightedIndex", 0)
1486 tryCompare(spreadRepeater, "highlightedIndex", 0)
1487
1487
1488 // Release control, check if spread disappears
1488 // Release control, check if spread disappears
1489− keyRelease(Qt.Key_Control)
1489+ keyRelease(Qt.Key_Alt)
1490 tryCompare(desktopSpread, "state", "")
1490 tryCompare(desktopSpread, "state", "")
1491
1491
1492 // Make sure that after wrapping around once, we have the same one focused as at the beginning
1492 // Make sure that after wrapping around once, we have the same one focused as at the beginning
@@ -1499,7 +1499,7 @@ Rectangle {
1499 var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
1499 var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
1500 verify(spreadRepeater !== null);
1500 verify(spreadRepeater !== null);
1501
1501
1502− keyPress(Qt.Key_Control)
1502+ keyPress(Qt.Key_Alt)
1503 keyClick(Qt.Key_Tab);
1503 keyClick(Qt.Key_Tab);
1504 tryCompare(spreadRepeater, "highlightedIndex", 1);
1504 tryCompare(spreadRepeater, "highlightedIndex", 1);
1505
1505
@@ -1521,7 +1521,7 @@ Rectangle {
1521 keyClick(Qt.Key_Backtab);
1521 keyClick(Qt.Key_Backtab);
1522 tryCompare(spreadRepeater, "highlightedIndex", 1);
1522 tryCompare(spreadRepeater, "highlightedIndex", 1);
1523
1523
1524− keyRelease(Qt.Key_Control);
1524+ keyRelease(Qt.Key_Alt);
1525 }
1525 }
1526
1526
1527 function test_highlightFollowsMouse() {
1527 function test_highlightFollowsMouse() {
@@ -1530,7 +1530,7 @@ Rectangle {
1530 var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
1530 var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
1531 verify(spreadRepeater !== null);
1531 verify(spreadRepeater !== null);
1532
1532
1533− keyPress(Qt.Key_Control)
1533+ keyPress(Qt.Key_Alt)
1534 keyClick(Qt.Key_Tab);
1534 keyClick(Qt.Key_Tab);
1535
1535
1536 tryCompare(spreadRepeater, "highlightedIndex", 1);
1536 tryCompare(spreadRepeater, "highlightedIndex", 1);
@@ -1549,7 +1549,7 @@ Rectangle {
1549
1549
1550 verify(y < 4000);
1550 verify(y < 4000);
1551
1551
1552− keyRelease(Qt.Key_Control);
1552+ keyRelease(Qt.Key_Alt);
1553 }
1553 }
1554
1554
1555 function test_closeFromSpread() {
1555 function test_closeFromSpread() {
@@ -1558,7 +1558,7 @@ Rectangle {
1558 var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
1558 var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
1559 verify(spreadRepeater !== null);
1559 verify(spreadRepeater !== null);
1560
1560
1561− keyPress(Qt.Key_Control)
1561+ keyPress(Qt.Key_Alt)
1562 keyClick(Qt.Key_Tab);
1562 keyClick(Qt.Key_Tab);
1563
1563
1564 appRemovedSpy.clear();
1564 appRemovedSpy.clear();
@@ -1585,7 +1585,7 @@ Rectangle {
1585 tryCompare(appRemovedSpy, "count", 1)
1585 tryCompare(appRemovedSpy, "count", 1)
1586 compare(appRemovedSpy.signalArguments[0][0], closedAppId);
1586 compare(appRemovedSpy.signalArguments[0][0], closedAppId);
1587
1587
1588− keyRelease(Qt.Key_Control);
1588+ keyRelease(Qt.Key_Alt);
1589 }
1589 }
1590
1590
1591 function test_selectFromSpreadWithMouse_data() {
1591 function test_selectFromSpreadWithMouse_data() {
@@ -1605,7 +1605,7 @@ Rectangle {
1605 var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
1605 var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
1606 verify(spreadRepeater !== null);
1606 verify(spreadRepeater !== null);
1607
1607
1608− keyPress(Qt.Key_Control)
1608+ keyPress(Qt.Key_Alt)
1609 keyClick(Qt.Key_Tab);
1609 keyClick(Qt.Key_Tab);
1610
1610
1611 var focusAppId = ApplicationManager.get(2).appId;
1611 var focusAppId = ApplicationManager.get(2).appId;
@@ -1632,7 +1632,7 @@ Rectangle {
1632 tryCompare(stage, "state", "");
1632 tryCompare(stage, "state", "");
1633 tryCompare(ApplicationManager, "focusedApplicationId", focusAppId);
1633 tryCompare(ApplicationManager, "focusedApplicationId", focusAppId);
1634
1634
1635− keyRelease(Qt.Key_Control);
1635+ keyRelease(Qt.Key_Alt);
1636 }
1636 }
1637
1637
1638 function test_progressiveAutoScrolling() {
1638 function test_progressiveAutoScrolling() {
@@ -1641,7 +1641,7 @@ Rectangle {
1641 var appRepeater = findInvisibleChild(shell, "appRepeater");
1641 var appRepeater = findInvisibleChild(shell, "appRepeater");
1642 verify(appRepeater !== null);
1642 verify(appRepeater !== null);
1643
1643
1644− keyPress(Qt.Key_Control)
1644+ keyPress(Qt.Key_Alt)
1645 keyClick(Qt.Key_Tab);
1645 keyClick(Qt.Key_Tab);
1646
1646
1647 var spreadFlickable = findChild(shell, "spreadFlickable")
1647 var spreadFlickable = findChild(shell, "spreadFlickable")
@@ -1667,7 +1667,7 @@ Rectangle {
1667 }
1667 }
1668 tryCompare(spreadFlickable, "contentX", 0);
1668 tryCompare(spreadFlickable, "contentX", 0);
1669
1669
1670− keyRelease(Qt.Key_Control);
1670+ keyRelease(Qt.Key_Alt);
1671 }
1671 }
1672
1672
1673 // This makes sure the hoverMouseArea is set to invisible AND disabled
1673 // This makes sure the hoverMouseArea is set to invisible AND disabled
@@ -1679,13 +1679,13 @@ Rectangle {
1679 tryCompare(hoverMouseArea, "enabled", false)
1679 tryCompare(hoverMouseArea, "enabled", false)
1680 tryCompare(hoverMouseArea, "visible", false)
1680 tryCompare(hoverMouseArea, "visible", false)
1681
1681
1682− keyPress(Qt.Key_Control)
1682+ keyPress(Qt.Key_Alt)
1683 keyClick(Qt.Key_Tab);
1683 keyClick(Qt.Key_Tab);
1684
1684
1685 tryCompare(hoverMouseArea, "enabled", true)
1685 tryCompare(hoverMouseArea, "enabled", true)
1686 tryCompare(hoverMouseArea, "visible", true)
1686 tryCompare(hoverMouseArea, "visible", true)
1687
1687
1688− keyRelease(Qt.Key_Control)
1688+ keyRelease(Qt.Key_Alt)
1689
1689
1690 tryCompare(hoverMouseArea, "enabled", false)
1690 tryCompare(hoverMouseArea, "enabled", false)
1691 tryCompare(hoverMouseArea, "visible", false)
1691 tryCompare(hoverMouseArea, "visible", false)
@@ -1702,7 +1702,7 @@ Rectangle {
1702 var appRepeater = findInvisibleChild(shell, "appRepeater");
1702 var appRepeater = findInvisibleChild(shell, "appRepeater");
1703 verify(appRepeater !== null);
1703 verify(appRepeater !== null);
1704
1704
1705− keyPress(Qt.Key_Control)
1705+ keyPress(Qt.Key_Alt)
1706 keyClick(Qt.Key_Tab);
1706 keyClick(Qt.Key_Tab);
1707
1707
1708 tryCompare(spreadRepeater, "highlightedIndex", 1);
1708 tryCompare(spreadRepeater, "highlightedIndex", 1);
@@ -1723,7 +1723,7 @@ Rectangle {
1723
1723
1724 verify(y < 4000);
1724 verify(y < 4000);
1725
1725
1726− keyRelease(Qt.Key_Control);
1726+ keyRelease(Qt.Key_Alt);
1727 }
1727 }
1728
1728
1729 function test_focusAppFromLauncherExitsSpread() {
1729 function test_focusAppFromLauncherExitsSpread() {
@@ -1733,7 +1733,7 @@ Rectangle {
1733 var launcher = findChild(shell, "launcher");
1733 var launcher = findChild(shell, "launcher");
1734 var bfb = findChild(launcher, "buttonShowDashHome");
1734 var bfb = findChild(launcher, "buttonShowDashHome");
1735
1735
1736− keyPress(Qt.Key_Control)
1736+ keyPress(Qt.Key_Alt)
1737 keyClick(Qt.Key_Tab);
1737 keyClick(Qt.Key_Tab);
1738
1738
1739 tryCompare(desktopSpread, "state", "altTab")
1739 tryCompare(desktopSpread, "state", "altTab")
@@ -1747,7 +1747,7 @@ Rectangle {
1747
1747
1748 tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash")
1748 tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash")
1749
1749
1750− keyRelease(Qt.Key_Control);
1750+ keyRelease(Qt.Key_Alt);
1751 }
1751 }
1752
1752
1753 // regression test for http://pad.lv/1443319
1753 // regression test for http://pad.lv/1443319