on xenial help sign in
fix shell tests
commit15e5bc1332b7e331317abdbfc65e399a70599b74 authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 7 Dec 2015, 18:16 (11 years ago) parentde49278
1 file changed+21−21
tests/qmltests/tst_Shell.qml+21−21
tests/qmltests/tst_Shell.qml+21−21
@@ -1424,7 +1424,7 @@ Rectangle {
14241424
14251425 // Do a quick alt-tab and see if focus changes
14261426 tryCompare(app3.session.surface, "activeFocus", true)
1427− keyClick(Qt.Key_Tab, Qt.ControlModifier)
1427+ keyClick(Qt.Key_Tab, Qt.AltModifier)
14281428 tryCompare(app2.session.surface, "activeFocus", true)
14291429
14301430 var desktopSpread = findChild(shell, "spread")
@@ -1432,12 +1432,12 @@ Rectangle {
14321432 tryCompare(desktopSpread, "state", "")
14331433
14341434 // Just press Alt, make sure the spread comes up
1435− keyPress(Qt.Key_Control);
1435+ keyPress(Qt.Key_Alt);
14361436 keyClick(Qt.Key_Tab);
14371437 tryCompare(desktopSpread, "state", "altTab")
14381438
14391439 // Release control, check if spread disappears
1440− keyRelease(Qt.Key_Control)
1440+ keyRelease(Qt.Key_Alt)
14411441 tryCompare(desktopSpread, "state", "")
14421442
14431443 // Focus should have switched back now
@@ -1465,7 +1465,7 @@ Rectangle {
14651465 tryCompare(desktopSpread, "state", "")
14661466
14671467 // Just press Alt, make sure the spread comes up
1468− keyPress(Qt.Key_Control);
1468+ keyPress(Qt.Key_Alt);
14691469 keyClick(Qt.Key_Tab);
14701470 tryCompare(desktopSpread, "state", "altTab")
14711471 tryCompare(spreadRepeater, "highlightedIndex", 1)
@@ -1486,7 +1486,7 @@ Rectangle {
14861486 tryCompare(spreadRepeater, "highlightedIndex", 0)
14871487
14881488 // Release control, check if spread disappears
1489− keyRelease(Qt.Key_Control)
1489+ keyRelease(Qt.Key_Alt)
14901490 tryCompare(desktopSpread, "state", "")
14911491
14921492 // Make sure that after wrapping around once, we have the same one focused as at the beginning
@@ -1499,7 +1499,7 @@ Rectangle {
14991499 var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
15001500 verify(spreadRepeater !== null);
15011501
1502− keyPress(Qt.Key_Control)
1502+ keyPress(Qt.Key_Alt)
15031503 keyClick(Qt.Key_Tab);
15041504 tryCompare(spreadRepeater, "highlightedIndex", 1);
15051505
@@ -1521,7 +1521,7 @@ Rectangle {
15211521 keyClick(Qt.Key_Backtab);
15221522 tryCompare(spreadRepeater, "highlightedIndex", 1);
15231523
1524− keyRelease(Qt.Key_Control);
1524+ keyRelease(Qt.Key_Alt);
15251525 }
15261526
15271527 function test_highlightFollowsMouse() {
@@ -1530,7 +1530,7 @@ Rectangle {
15301530 var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
15311531 verify(spreadRepeater !== null);
15321532
1533− keyPress(Qt.Key_Control)
1533+ keyPress(Qt.Key_Alt)
15341534 keyClick(Qt.Key_Tab);
15351535
15361536 tryCompare(spreadRepeater, "highlightedIndex", 1);
@@ -1549,7 +1549,7 @@ Rectangle {
15491549
15501550 verify(y < 4000);
15511551
1552− keyRelease(Qt.Key_Control);
1552+ keyRelease(Qt.Key_Alt);
15531553 }
15541554
15551555 function test_closeFromSpread() {
@@ -1558,7 +1558,7 @@ Rectangle {
15581558 var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
15591559 verify(spreadRepeater !== null);
15601560
1561− keyPress(Qt.Key_Control)
1561+ keyPress(Qt.Key_Alt)
15621562 keyClick(Qt.Key_Tab);
15631563
15641564 appRemovedSpy.clear();
@@ -1585,7 +1585,7 @@ Rectangle {
15851585 tryCompare(appRemovedSpy, "count", 1)
15861586 compare(appRemovedSpy.signalArguments[0][0], closedAppId);
15871587
1588− keyRelease(Qt.Key_Control);
1588+ keyRelease(Qt.Key_Alt);
15891589 }
15901590
15911591 function test_selectFromSpreadWithMouse_data() {
@@ -1605,7 +1605,7 @@ Rectangle {
16051605 var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
16061606 verify(spreadRepeater !== null);
16071607
1608− keyPress(Qt.Key_Control)
1608+ keyPress(Qt.Key_Alt)
16091609 keyClick(Qt.Key_Tab);
16101610
16111611 var focusAppId = ApplicationManager.get(2).appId;
@@ -1632,7 +1632,7 @@ Rectangle {
16321632 tryCompare(stage, "state", "");
16331633 tryCompare(ApplicationManager, "focusedApplicationId", focusAppId);
16341634
1635− keyRelease(Qt.Key_Control);
1635+ keyRelease(Qt.Key_Alt);
16361636 }
16371637
16381638 function test_progressiveAutoScrolling() {
@@ -1641,7 +1641,7 @@ Rectangle {
16411641 var appRepeater = findInvisibleChild(shell, "appRepeater");
16421642 verify(appRepeater !== null);
16431643
1644− keyPress(Qt.Key_Control)
1644+ keyPress(Qt.Key_Alt)
16451645 keyClick(Qt.Key_Tab);
16461646
16471647 var spreadFlickable = findChild(shell, "spreadFlickable")
@@ -1667,7 +1667,7 @@ Rectangle {
16671667 }
16681668 tryCompare(spreadFlickable, "contentX", 0);
16691669
1670− keyRelease(Qt.Key_Control);
1670+ keyRelease(Qt.Key_Alt);
16711671 }
16721672
16731673 // This makes sure the hoverMouseArea is set to invisible AND disabled
@@ -1679,13 +1679,13 @@ Rectangle {
16791679 tryCompare(hoverMouseArea, "enabled", false)
16801680 tryCompare(hoverMouseArea, "visible", false)
16811681
1682− keyPress(Qt.Key_Control)
1682+ keyPress(Qt.Key_Alt)
16831683 keyClick(Qt.Key_Tab);
16841684
16851685 tryCompare(hoverMouseArea, "enabled", true)
16861686 tryCompare(hoverMouseArea, "visible", true)
16871687
1688− keyRelease(Qt.Key_Control)
1688+ keyRelease(Qt.Key_Alt)
16891689
16901690 tryCompare(hoverMouseArea, "enabled", false)
16911691 tryCompare(hoverMouseArea, "visible", false)
@@ -1702,7 +1702,7 @@ Rectangle {
17021702 var appRepeater = findInvisibleChild(shell, "appRepeater");
17031703 verify(appRepeater !== null);
17041704
1705− keyPress(Qt.Key_Control)
1705+ keyPress(Qt.Key_Alt)
17061706 keyClick(Qt.Key_Tab);
17071707
17081708 tryCompare(spreadRepeater, "highlightedIndex", 1);
@@ -1723,7 +1723,7 @@ Rectangle {
17231723
17241724 verify(y < 4000);
17251725
1726− keyRelease(Qt.Key_Control);
1726+ keyRelease(Qt.Key_Alt);
17271727 }
17281728
17291729 function test_focusAppFromLauncherExitsSpread() {
@@ -1733,7 +1733,7 @@ Rectangle {
17331733 var launcher = findChild(shell, "launcher");
17341734 var bfb = findChild(launcher, "buttonShowDashHome");
17351735
1736− keyPress(Qt.Key_Control)
1736+ keyPress(Qt.Key_Alt)
17371737 keyClick(Qt.Key_Tab);
17381738
17391739 tryCompare(desktopSpread, "state", "altTab")
@@ -1747,7 +1747,7 @@ Rectangle {
17471747
17481748 tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash")
17491749
1750− keyRelease(Qt.Key_Control);
1750+ keyRelease(Qt.Key_Alt);
17511751 }
17521752
17531753 // regression test for http://pad.lv/1443319