997eaf2 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Put the test in a different place so merges better

997eaf2Albert Astals Cid10 years ago

tests/qmltests/tst_Shell.qml+22−22

compare with xenial

unifiedsplit

@@ -2732,6 +2732,28 @@ Rectangle {

2732 keyRelease(Qt.Key_W, Qt.MetaModifier)

2733 }

2734

2735+ function test_launcherWindowResizeInteraction()

2736+ {

2737+ loadShell("desktop");

2738+ waitForRendering(shell)

2739+ shell.usageScenario = "desktop"

2740+ waitForRendering(shell)

2741+ swipeAwayGreeter();

2742+

2743+ var app1SurfaceId = topLevelSurfaceList.nextId;

2744+ var app1 = ApplicationManager.startApplication("dialer-app")

2745+ waitUntilAppWindowIsFullyLoaded(app1SurfaceId);

2746+

2747+ var launcherDelegate1 = findChild(shell, "launcherDelegate1");

2748+ mouseClick(launcherDelegate1, launcherDelegate1.width / 2, launcherDelegate1.height / 2, Qt.RightButton);

2749+

2750+ var appDelegate = findChild(shell, "appDelegate_" + app1SurfaceId);

2751+ mouseMove(shell, appDelegate.mapToItem(shell, 0, 0).x, launcherDelegate1.mapToItem(shell, 0, 0).y);

2752+

2753+ expectFail("", "Cursor should not change while launcher menu is open");

2754+ tryCompare(Mir, "cursorName", "left_side");

2755+ }

2756+

2735 function test_panelTitleShowsWhenGreeterNotShown_data() {

2757 function test_panelTitleShowsWhenGreeterNotShown_data() {

2736 return [

2758 return [

2737 {tag: "phone" },

2759 {tag: "phone" },

@@ -2779,27 +2801,5 @@ Rectangle {

2779 }

2801 }

2780 tryCompareFunction(function() { return drawer.visible; }, false);

2802 tryCompareFunction(function() { return drawer.visible; }, false);

2781 }

2803 }

2782−

2783− function test_launcherWindowResizeInteraction()

2784− {

2785− loadShell("desktop");

2786− waitForRendering(shell)

2787− shell.usageScenario = "desktop"

2788− waitForRendering(shell)

2789− swipeAwayGreeter();

2790−

2791− var app1SurfaceId = topLevelSurfaceList.nextId;

2792− var app1 = ApplicationManager.startApplication("dialer-app")

2793− waitUntilAppWindowIsFullyLoaded(app1SurfaceId);

2794−

2795− var launcherDelegate1 = findChild(shell, "launcherDelegate1");

2796− mouseClick(launcherDelegate1, launcherDelegate1.width / 2, launcherDelegate1.height / 2, Qt.RightButton);

2797−

2798− var appDelegate = findChild(shell, "appDelegate_" + app1SurfaceId);

2799− mouseMove(shell, appDelegate.mapToItem(shell, 0, 0).x, launcherDelegate1.mapToItem(shell, 0, 0).y);

2800−

2801− expectFail("", "Cursor should not change while launcher menu is open");

2802− tryCompare(Mir, "cursorName", "left_side");

2803− }

2804 }

2805}