git.iko.soy/unity8
on xenial help sign in
Split up soreadDisabled tests
6cbdd9eNick Dedekind
tests/qmltests/tst_Shell.qml+41−8
compare with xenial
unifiedsplit
@@ -2737,14 +2737,14 @@ Rectangle {
2737 GSettingsController.setEnableIndicatorMenu(true);
2737 GSettingsController.setEnableIndicatorMenu(true);
2738 }
2738 }
2739
2739
2740− function test_spreadDisabled_data() {
2740+ function test_spreadDisabled_WithSwipe_data() {
2741 return [
2741 return [
2742 { tag: "enabled", spreadEnabled: true },
2742 { tag: "enabled", spreadEnabled: true },
2743 { tag: "disabled", spreadEnabled: false }
2743 { tag: "disabled", spreadEnabled: false }
2744 ];
2744 ];
2745 }
2745 }
2746
2746
2747− function test_spreadDisabled(data) {
2747+ function test_spreadDisabled_WithSwipe(data) {
2748 loadShell("phone");
2748 loadShell("phone");
2749 swipeAwayGreeter();
2749 swipeAwayGreeter();
2750 var stage = findChild(shell, "stage");
2750 var stage = findChild(shell, "stage");
@@ -2753,9 +2753,20 @@ Rectangle {
2753 // Try swiping
2753 // Try swiping
2754 touchFlick(shell, shell.width - 2, shell.height / 2, units.gu(1), shell.height / 2);
2754 touchFlick(shell, shell.width - 2, shell.height / 2, units.gu(1), shell.height / 2);
2755 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2755 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2756+ }
2756
2757
2757− stage.closeSpread();
2758+ function test_spreadDisabled_WithEdgePush_data() {
2758− tryCompare(stage, "state", "staged");
2759+ return [
2760+ { tag: "enabled", spreadEnabled: true },
2761+ { tag: "disabled", spreadEnabled: false }
2762+ ];
2763+ }
2764+
2765+ function test_spreadDisabled_WithEdgePush(data) {
2766+ loadShell("phone");
2767+ swipeAwayGreeter();
2768+ var stage = findChild(shell, "stage");
2769+ stage.spreadEnabled = data.spreadEnabled;
2759
2770
2760 // Try by edge push
2771 // Try by edge push
2761 var cursor = findChild(shell, "cursor");
2772 var cursor = findChild(shell, "cursor");
@@ -2765,18 +2776,40 @@ Rectangle {
2765 }
2776 }
2766 mouseMove(stage, stage.width - units.gu(5), units.gu(10));
2777 mouseMove(stage, stage.width - units.gu(5), units.gu(10));
2767 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2778 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2779+ }
2768
2780
2769− stage.closeSpread();
2781+ function test_spreadDisabled_WithAltTab_data() {
2770− tryCompare(stage, "state", "staged");
2782+ return [
2783+ { tag: "enabled", spreadEnabled: true },
2784+ { tag: "disabled", spreadEnabled: false }
2785+ ];
2786+ }
2787+
2788+ function test_spreadDisabled_WithAltTab(data) {
2789+ loadShell("phone");
2790+ swipeAwayGreeter();
2791+ var stage = findChild(shell, "stage");
2792+ stage.spreadEnabled = data.spreadEnabled;
2771
2793
2772 // Try by alt+tab
2794 // Try by alt+tab
2773 keyPress(Qt.Key_Alt);
2795 keyPress(Qt.Key_Alt);
2774 keyClick(Qt.Key_Tab);
2796 keyClick(Qt.Key_Tab);
2775 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2797 tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
2776 keyRelease(Qt.Key_Alt);
2798 keyRelease(Qt.Key_Alt);
2799+ }
2800+
2801+ function test_spreadDisabled_WithSuperW_data() {
2802+ return [
2803+ { tag: "enabled", spreadEnabled: true },
2804+ { tag: "disabled", spreadEnabled: false }
2805+ ];
2806+ }
2777
2807
2778− stage.closeSpread();
2808+ function test_spreadDisabled_WithSuperW(data) {
2779− tryCompare(stage, "state", "staged");
2809+ loadShell("phone");
2810+ swipeAwayGreeter();
2811+ var stage = findChild(shell, "stage");
2812+ stage.spreadEnabled = data.spreadEnabled;
2780
2813
2781 // Try by Super+W
2814 // Try by Super+W
2782 keyPress(Qt.Key_W, Qt.MetaModifier)
2815 keyPress(Qt.Key_W, Qt.MetaModifier)