git.iko.soy/unity8
on xenial help sign in
Keep refactoring tst_Shell, reduce race conditions
54de862Dalton Durst
tests/qmltests/tst_Shell.qml+53−62
compare with xenial
unifiedsplit
@@ -574,7 +574,12 @@ Rectangle {
574 WindowStateStorage.clear();
574 WindowStateStorage.clear();
575 }
575 }
576
576
577− function loadShell(formFactor) {
577+ function loadShell(formFactor, apps) {
578+
579+ if (apps === undefined) {
580+ apps = 0
581+ }
582+
578 shellLoader.state = formFactor;
583 shellLoader.state = formFactor;
579 shellLoader.active = true;
584 shellLoader.active = true;
580 tryCompare(shellLoader, "status", Loader.Ready);
585 tryCompare(shellLoader, "status", Loader.Ready);
@@ -582,6 +587,7 @@ Rectangle {
582 tryCompare(shell, "waitingOnGreeter", false); // reset by greeter when ready
587 tryCompare(shell, "waitingOnGreeter", false); // reset by greeter when ready
583
588
584 sessionSpy.target = shell.greeter;
589 sessionSpy.target = shell.greeter;
590+ shell.usageScenario = formFactor;
585
591
586 var launcher = findChild(shell, "launcher");
592 var launcher = findChild(shell, "launcher");
587 verify(!!launcher);
593 verify(!!launcher);
@@ -598,19 +604,8 @@ Rectangle {
598 topLevelSurfaceList = findInvisibleChild(shell, "topLevelSurfaceList");
604 topLevelSurfaceList = findInvisibleChild(shell, "topLevelSurfaceList");
599 verify(topLevelSurfaceList);
605 verify(topLevelSurfaceList);
600 stage = findChild(shell, "stage");
606 stage = findChild(shell, "stage");
601− }
602
607
603− function loadDesktopShellWithApps(apps) {
608+ addApps(apps);
604−
605− if (apps == undefined) {
606− apps = 7
607− }
608−
609− loadShell("desktop");
610− waitForRendering(shell)
611− shell.usageScenario = "desktop"
612− waitForRendering(shell)
613− addApps(apps)
614 }
609 }
615
610
616 function addApps(count) {
611 function addApps(count) {
@@ -781,6 +776,7 @@ Rectangle {
781
776
782 function setLightDMMockMode(mode) {
777 function setLightDMMockMode(mode) {
783 LightDMController.userMode = mode;
778 LightDMController.userMode = mode;
779+ waitForRendering(root);
784 }
780 }
785
781
786 function dragToCloseIndicatorsPanel() {
782 function dragToCloseIndicatorsPanel() {
@@ -1140,7 +1136,7 @@ Rectangle {
1140 }
1136 }
1141
1137
1142 function test_focusRequestedHidesIndicators() {
1138 function test_focusRequestedHidesIndicators() {
1143− loadShell("phone");
1139+ loadShell("phone", 1);
1144 swipeAwayGreeter();
1140 swipeAwayGreeter();
1145 var indicators = findChild(shell, "indicators");
1141 var indicators = findChild(shell, "indicators");
1146
1142
@@ -1298,7 +1294,7 @@ Rectangle {
1298 }
1294 }
1299
1295
1300 function test_customBackground() {
1296 function test_customBackground() {
1301− loadDesktopShellWithApps(0);
1297+ loadShell("desktop", 0);
1302
1298
1303 var wallpaperResolver = findInvisibleChild(shell, "wallpaperResolver");
1299 var wallpaperResolver = findInvisibleChild(shell, "wallpaperResolver");
1304 var greeter = findChild(shell, "greeter");
1300 var greeter = findChild(shell, "greeter");
@@ -1311,7 +1307,7 @@ Rectangle {
1311 }
1307 }
1312
1308
1313 function test_cachedBackground() {
1309 function test_cachedBackground() {
1314− loadDesktopShellWithApps(0);
1310+ loadShell("desktop", 0);
1315
1311
1316 var greeter = findChild(shell, "greeter");
1312 var greeter = findChild(shell, "greeter");
1317 verify(!greeter.hasCustomBackground);
1313 verify(!greeter.hasCustomBackground);
@@ -1409,8 +1405,8 @@ Rectangle {
1409 }
1405 }
1410
1406
1411 function test_tabletLogin(data) {
1407 function test_tabletLogin(data) {
1412− setLightDMMockMode("full");
1413 loadShell("tablet");
1408 loadShell("tablet");
1409+ setLightDMMockMode("full");
1414
1410
1415 selectUser(data.user);
1411 selectUser(data.user);
1416
1412
@@ -1433,8 +1429,8 @@ Rectangle {
1433 }
1429 }
1434
1430
1435 function test_appLaunchDuringGreeter(data) {
1431 function test_appLaunchDuringGreeter(data) {
1436− setLightDMMockMode("full");
1437 loadShell("tablet");
1432 loadShell("tablet");
1433+ setLightDMMockMode("full");
1438
1434
1439 selectUser(data.user)
1435 selectUser(data.user)
1440
1436
@@ -1450,9 +1446,9 @@ Rectangle {
1450 }
1446 }
1451
1447
1452 function test_manualLoginFlow() {
1448 function test_manualLoginFlow() {
1449+ loadShell("desktop");
1453 LightDMController.showManualLoginHint = true;
1450 LightDMController.showManualLoginHint = true;
1454 setLightDMMockMode("full");
1451 setLightDMMockMode("full");
1455− loadShell("desktop");
1456
1452
1457 var i = selectUser("*other");
1453 var i = selectUser("*other");
1458 var greeter = findChild(shell, "greeter");
1454 var greeter = findChild(shell, "greeter");
@@ -1478,7 +1474,7 @@ Rectangle {
1478 }
1474 }
1479
1475
1480 function test_terminalShortcut() {
1476 function test_terminalShortcut() {
1481− loadDesktopShellWithApps(0);
1477+ loadShell("desktop", 0);
1482
1478
1483 // not running, should start
1479 // not running, should start
1484 keyClick(Qt.Key_T, Qt.ControlModifier|Qt.AltModifier);
1480 keyClick(Qt.Key_T, Qt.ControlModifier|Qt.AltModifier);
@@ -1575,7 +1571,6 @@ Rectangle {
1575
1571
1576 function test_altTabSwitchesFocus(data) {
1572 function test_altTabSwitchesFocus(data) {
1577 loadShell(data.shellType);
1573 loadShell(data.shellType);
1578− shell.usageScenario = data.shellType;
1579 waitForRendering(root)
1574 waitForRendering(root)
1580
1575
1581 var desktopStage = findChild(shell, "stage");
1576 var desktopStage = findChild(shell, "stage");
@@ -1612,7 +1607,7 @@ Rectangle {
1612 }
1607 }
1613
1608
1614 function test_altTabWrapAround() {
1609 function test_altTabWrapAround() {
1615− loadDesktopShellWithApps(7);
1610+ loadShell("desktop", 7);
1616
1611
1617 var stage = findChild(shell, "stage");
1612 var stage = findChild(shell, "stage");
1618 verify(stage !== null)
1613 verify(stage !== null)
@@ -1657,7 +1652,7 @@ Rectangle {
1657 }
1652 }
1658
1653
1659 function test_altBackTabNavigation() {
1654 function test_altBackTabNavigation() {
1660− loadDesktopShellWithApps(5);
1655+ loadShell("desktop", 7);
1661
1656
1662 var spreadItem = findChild(shell, "spreadItem");
1657 var spreadItem = findChild(shell, "spreadItem");
1663 verify(spreadItem !== null);
1658 verify(spreadItem !== null);
@@ -1688,7 +1683,7 @@ Rectangle {
1688 }
1683 }
1689
1684
1690 function test_highlightFollowsMouse() {
1685 function test_highlightFollowsMouse() {
1691− loadDesktopShellWithApps(7)
1686+ loadShell("desktop", 7);
1692
1687
1693 var spreadItem = findChild(shell, "spreadItem");
1688 var spreadItem = findChild(shell, "spreadItem");
1694 verify(spreadItem !== null);
1689 verify(spreadItem !== null);
@@ -1716,7 +1711,7 @@ Rectangle {
1716 }
1711 }
1717
1712
1718 function test_closeFromSpread() {
1713 function test_closeFromSpread() {
1719− loadDesktopShellWithApps(4)
1714+ loadShell("desktop", 4);
1720
1715
1721 var appRepeater = findInvisibleChild(shell, "appRepeater");
1716 var appRepeater = findInvisibleChild(shell, "appRepeater");
1722 verify(appRepeater !== null);
1717 verify(appRepeater !== null);
@@ -1766,7 +1761,7 @@ Rectangle {
1766 }
1761 }
1767
1762
1768 function test_selectFromSpreadWithMouse(data) {
1763 function test_selectFromSpreadWithMouse(data) {
1769− loadDesktopShellWithApps(4)
1764+ loadShell("desktop", 4);
1770
1765
1771 var stage = findChild(shell, "stage");
1766 var stage = findChild(shell, "stage");
1772 var spreadItem = findChild(stage, "spreadItem");
1767 var spreadItem = findChild(stage, "spreadItem");
@@ -1805,7 +1800,7 @@ Rectangle {
1805 }
1800 }
1806
1801
1807 function test_progressiveAutoScrolling() {
1802 function test_progressiveAutoScrolling() {
1808− loadDesktopShellWithApps(7)
1803+ loadShell("desktop", 7);
1809
1804
1810 var appRepeater = findInvisibleChild(shell, "appRepeater");
1805 var appRepeater = findInvisibleChild(shell, "appRepeater");
1811 var launcherPanel = findChild(shell, "launcherPanel");
1806 var launcherPanel = findChild(shell, "launcherPanel");
@@ -1836,7 +1831,7 @@ Rectangle {
1836 // This makes sure the hoverMouseArea is set to invisible AND disabled
1831 // This makes sure the hoverMouseArea is set to invisible AND disabled
1837 // when not needed. Otherwise it'll eat mouse hover events for the rest of the shell/apps
1832 // when not needed. Otherwise it'll eat mouse hover events for the rest of the shell/apps
1838 function test_hoverMouseAreaDisabledAndInvisible() {
1833 function test_hoverMouseAreaDisabledAndInvisible() {
1839− loadDesktopShellWithApps(2)
1834+ loadShell("desktop", 2);
1840
1835
1841 var hoverMouseArea = findChild(shell, "hoverMouseArea");
1836 var hoverMouseArea = findChild(shell, "hoverMouseArea");
1842 tryCompare(hoverMouseArea, "enabled", false)
1837 tryCompare(hoverMouseArea, "enabled", false)
@@ -1862,7 +1857,7 @@ Rectangle {
1862 }
1857 }
1863
1858
1864 function test_focusAppFromLauncherExitsSpread(data) {
1859 function test_focusAppFromLauncherExitsSpread(data) {
1865− loadDesktopShellWithApps(2)
1860+ loadShell("desktop", 2);
1866 var launcher = findChild(shell, "launcher");
1861 var launcher = findChild(shell, "launcher");
1867 var stage = findChild(shell, "stage");
1862 var stage = findChild(shell, "stage");
1868 var app1 = findChild(launcher, "launcherDelegate0");
1863 var app1 = findChild(launcher, "launcherDelegate0");
@@ -1895,7 +1890,7 @@ Rectangle {
1895
1890
1896 // regression test for http://pad.lv/1443319
1891 // regression test for http://pad.lv/1443319
1897 function test_closeMaximizedAndRestart() {
1892 function test_closeMaximizedAndRestart() {
1898− loadDesktopShellWithApps(7);
1893+ loadShell("desktop", 7)
1899
1894
1900 var appRepeater = findChild(shell, "appRepeater")
1895 var appRepeater = findChild(shell, "appRepeater")
1901 var application = topLevelSurfaceList.applicationAt(0);
1896 var application = topLevelSurfaceList.applicationAt(0);
@@ -1922,7 +1917,7 @@ Rectangle {
1922 }
1917 }
1923
1918
1924 function test_newAppHasValidGeometry() {
1919 function test_newAppHasValidGeometry() {
1925− loadDesktopShellWithApps(1);
1920+ loadShell("desktop", 1)
1926 var appRepeater = findChild(shell, "appRepeater");
1921 var appRepeater = findChild(shell, "appRepeater");
1927 var appDelegate = appRepeater.itemAt(0);
1922 var appDelegate = appRepeater.itemAt(0);
1928
1923
@@ -1935,7 +1930,7 @@ Rectangle {
1935
1930
1936 // bug http://pad.lv/1431566
1931 // bug http://pad.lv/1431566
1937 function test_switchToStagedHidesPanelButtons() {
1932 function test_switchToStagedHidesPanelButtons() {
1938− loadDesktopShellWithApps(1);
1933+ loadShell("desktop", 1)
1939 var appRepeater = findChild(shell, "appRepeater")
1934 var appRepeater = findChild(shell, "appRepeater")
1940 var appDelegate = appRepeater.itemAt(0);
1935 var appDelegate = appRepeater.itemAt(0);
1941 var panelButtons = findChild(shell, "panelWindowControlButtons")
1936 var panelButtons = findChild(shell, "panelWindowControlButtons")
@@ -1952,7 +1947,7 @@ Rectangle {
1952 }
1947 }
1953
1948
1954 function test_lockingGreeterHidesPanelButtons() {
1949 function test_lockingGreeterHidesPanelButtons() {
1955− loadDesktopShellWithApps(1);
1950+ loadShell("desktop", 1)
1956 var appRepeater = findChild(shell, "appRepeater")
1951 var appRepeater = findChild(shell, "appRepeater")
1957 var appDelegate = appRepeater.itemAt(0);
1952 var appDelegate = appRepeater.itemAt(0);
1958 var panelButtons = findChild(shell, "panelWindowControlButtons")
1953 var panelButtons = findChild(shell, "panelWindowControlButtons")
@@ -1968,7 +1963,7 @@ Rectangle {
1968 }
1963 }
1969
1964
1970 function test_cantMoveWindowUnderPanel() {
1965 function test_cantMoveWindowUnderPanel() {
1971− loadDesktopShellWithApps(1);
1966+ loadShell("desktop", 1)
1972 var appRepeater = findChild(shell, "appRepeater")
1967 var appRepeater = findChild(shell, "appRepeater")
1973 var appDelegate = appRepeater.itemAt(0);
1968 var appDelegate = appRepeater.itemAt(0);
1974
1969
@@ -1979,7 +1974,7 @@ Rectangle {
1979 }
1974 }
1980
1975
1981 function test_cantResizeWindowUnderPanel() {
1976 function test_cantResizeWindowUnderPanel() {
1982− loadDesktopShellWithApps(0);
1977+ loadShell("desktop", 0);
1983
1978
1984 var appSurfaceId = topLevelSurfaceList.nextId;
1979 var appSurfaceId = topLevelSurfaceList.nextId;
1985 var app = ApplicationManager.startApplication("dialer-app")
1980 var app = ApplicationManager.startApplication("dialer-app")
@@ -2005,7 +2000,7 @@ Rectangle {
2005 }
2000 }
2006
2001
2007 function test_restoreWindowStateFixesIfUnderPanel() {
2002 function test_restoreWindowStateFixesIfUnderPanel() {
2008− loadDesktopShellWithApps(2);
2003+ loadShell("desktop", 2)
2009 var appRepeater = findChild(shell, "appRepeater")
2004 var appRepeater = findChild(shell, "appRepeater")
2010 var application = topLevelSurfaceList.applicationAt(0);
2005 var application = topLevelSurfaceList.applicationAt(0);
2011 var appDelegate = appRepeater.itemAt(0);
2006 var appDelegate = appRepeater.itemAt(0);
@@ -2183,7 +2178,7 @@ Rectangle {
2183 }
2178 }
2184
2179
2185 function test_superTabToCycleLauncher(data) {
2180 function test_superTabToCycleLauncher(data) {
2186− loadDesktopShellWithApps(1);
2181+ loadShell("desktop", 1)
2187 GSettingsController.setAutohideLauncher(!data.launcherLocked);
2182 GSettingsController.setAutohideLauncher(!data.launcherLocked);
2188 waitForRendering(shell);
2183 waitForRendering(shell);
2189
2184
@@ -2217,7 +2212,7 @@ Rectangle {
2217 }
2212 }
2218
2213
2219 function test_longpressSuperOpensLauncherAndShortcutsOverlay() {
2214 function test_longpressSuperOpensLauncherAndShortcutsOverlay() {
2220− loadShell("desktop");
2215+ loadShell("phone", 1);
2221 var launcher = findChild(shell, "launcher");
2216 var launcher = findChild(shell, "launcher");
2222 var shortcutHint = findChild(findChild(launcher, "launcherDelegate0"), "shortcutHint")
2217 var shortcutHint = findChild(findChild(launcher, "launcherDelegate0"), "shortcutHint")
2223 var shortcutsOverlay = findChild(shell, "shortcutsOverlay");
2218 var shortcutsOverlay = findChild(shell, "shortcutsOverlay");
@@ -2269,7 +2264,7 @@ Rectangle {
2269 }
2264 }
2270
2265
2271 function test_lockedOutLauncherAddsMarginsToMaximized() {
2266 function test_lockedOutLauncherAddsMarginsToMaximized() {
2272− loadDesktopShellWithApps(1);
2267+ loadShell("desktop", 1)
2273 var appContainer = findChild(shell, "appContainer");
2268 var appContainer = findChild(shell, "appContainer");
2274 var launcher = findChild(shell, "launcher");
2269 var launcher = findChild(shell, "launcher");
2275 var launcherPanel = findChild(launcher, "launcherPanel");
2270 var launcherPanel = findChild(launcher, "launcherPanel");
@@ -2420,10 +2415,9 @@ Rectangle {
2420 }
2415 }
2421
2416
2422 function test_greeterModeBroadcastsApp() {
2417 function test_greeterModeBroadcastsApp() {
2423− setLightDMMockMode("single-pin");
2424 shellLoader.mode = "greeter";
2418 shellLoader.mode = "greeter";
2419+ setLightDMMockMode("single-pin");
2425 loadShell("phone");
2420 loadShell("phone");
2426− shell.usageScenario = "phone";
2427 waitForRendering(shell);
2421 waitForRendering(shell);
2428
2422
2429 dragLauncherIntoView();
2423 dragLauncherIntoView();
@@ -2439,10 +2433,9 @@ Rectangle {
2439 }
2433 }
2440
2434
2441 function test_greeterModeBroadcastsHome() {
2435 function test_greeterModeBroadcastsHome() {
2442− setLightDMMockMode("single-pin");
2443 shellLoader.mode = "greeter";
2436 shellLoader.mode = "greeter";
2437+ setLightDMMockMode("single-pin");
2444 loadShell("phone");
2438 loadShell("phone");
2445− shell.usageScenario = "phone";
2446 waitForRendering(shell);
2439 waitForRendering(shell);
2447
2440
2448 var gallerySurfaceId = topLevelSurfaceList.nextId;
2441 var gallerySurfaceId = topLevelSurfaceList.nextId;
@@ -2461,10 +2454,9 @@ Rectangle {
2461 }
2454 }
2462
2455
2463 function test_greeterModeDispatchesURL() {
2456 function test_greeterModeDispatchesURL() {
2464− setLightDMMockMode("single-pin");
2465 shellLoader.mode = "greeter";
2457 shellLoader.mode = "greeter";
2458+ setLightDMMockMode("single-pin");
2466 loadShell("phone");
2459 loadShell("phone");
2467− shell.usageScenario = "phone";
2468 waitForRendering(shell);
2460 waitForRendering(shell);
2469
2461
2470 var urlDispatcher = findInvisibleChild(shell, "urlDispatcher");
2462 var urlDispatcher = findInvisibleChild(shell, "urlDispatcher");
@@ -2557,7 +2549,7 @@ Rectangle {
2557 }
2549 }
2558
2550
2559 function test_dragPanelToRestoreMaximizedWindow(data) {
2551 function test_dragPanelToRestoreMaximizedWindow(data) {
2560− loadDesktopShellWithApps(0);
2552+ loadShell("desktop", 0);
2561 var panel = findChild(shell, "windowControlArea");
2553 var panel = findChild(shell, "windowControlArea");
2562 verify(panel);
2554 verify(panel);
2563
2555
@@ -2589,10 +2581,9 @@ Rectangle {
2589 }
2581 }
2590
2582
2591 function test_fullShellModeHasNoInitialGreeter() {
2583 function test_fullShellModeHasNoInitialGreeter() {
2592− setLightDMMockMode("single-pin");
2593 shellLoader.mode = "full-shell";
2584 shellLoader.mode = "full-shell";
2594 loadShell("phone");
2585 loadShell("phone");
2595− shell.usageScenario = "phone";
2586+ setLightDMMockMode("single-pin");
2596 waitForRendering(shell);
2587 waitForRendering(shell);
2597
2588
2598 var greeter = findChild(shell, "greeter");
2589 var greeter = findChild(shell, "greeter");
@@ -2636,7 +2627,7 @@ Rectangle {
2636 }
2627 }
2637
2628
2638 function test_rightEdgePushWithOpenIndicators() {
2629 function test_rightEdgePushWithOpenIndicators() {
2639− loadDesktopShellWithApps(1);
2630+ loadShell("desktop", 1)
2640
2631
2641 var stage = findChild(shell, "stage");
2632 var stage = findChild(shell, "stage");
2642 var cursor = findChild(shell, "cursor");
2633 var cursor = findChild(shell, "cursor");
@@ -2684,7 +2675,7 @@ Rectangle {
2684 }
2675 }
2685
2676
2686 function test_oskDisplacesWindow(data) {
2677 function test_oskDisplacesWindow(data) {
2687− loadDesktopShellWithApps(0);
2678+ loadShell("desktop", 0);
2688 ensureInputMethodSurface();
2679 ensureInputMethodSurface();
2689 shell.oskEnabled = data.oskEnabled;
2680 shell.oskEnabled = data.oskEnabled;
2690
2681
@@ -2891,7 +2882,7 @@ Rectangle {
2891 }
2882 }
2892
2883
2893 function test_fourFingerTapOpensDrawer(data) {
2884 function test_fourFingerTapOpensDrawer(data) {
2894− loadDesktopShellWithApps(1);
2885+ loadShell("desktop", 1)
2895
2886
2896 var stage = findChild(shell, "stage");
2887 var stage = findChild(shell, "stage");
2897 var drawer = findChild(shell, "drawer")
2888 var drawer = findChild(shell, "drawer")
@@ -2907,7 +2898,7 @@ Rectangle {
2907 }
2898 }
2908
2899
2909 function test_restoreFromFullscreen() {
2900 function test_restoreFromFullscreen() {
2910− loadDesktopShellWithApps(0);
2901+ loadShell("desktop", 0);
2911
2902
2912 var appSurfaceId = topLevelSurfaceList.nextId;
2903 var appSurfaceId = topLevelSurfaceList.nextId;
2913 var app = ApplicationManager.startApplication("dialer-app")
2904 var app = ApplicationManager.startApplication("dialer-app")
@@ -2934,7 +2925,7 @@ Rectangle {
2934
2925
2935
2926
2936 function test_closeAppsInSpreadWithQ() {
2927 function test_closeAppsInSpreadWithQ() {
2937− loadDesktopShellWithApps(0);
2928+ loadShell("desktop", 0);
2938
2929
2939 var appSurfaceId = topLevelSurfaceList.nextId;
2930 var appSurfaceId = topLevelSurfaceList.nextId;
2940 var app = ApplicationManager.startApplication("unity8-dash")
2931 var app = ApplicationManager.startApplication("unity8-dash")
@@ -3008,7 +2999,7 @@ Rectangle {
3008 }
2999 }
3009
3000
3010 function test_altTabToMinimizedApp() {
3001 function test_altTabToMinimizedApp() {
3011− loadDesktopShellWithApps(0);
3002+ loadShell("desktop", 0);
3012
3003
3013 var appSurfaceId = topLevelSurfaceList.nextId;
3004 var appSurfaceId = topLevelSurfaceList.nextId;
3014 var app = ApplicationManager.startApplication("dialer-app")
3005 var app = ApplicationManager.startApplication("dialer-app")
@@ -3040,7 +3031,7 @@ Rectangle {
3040 }
3031 }
3041
3032
3042 function test_touchMenuPosition(data) {
3033 function test_touchMenuPosition(data) {
3043− loadDesktopShellWithApps(0);
3034+ loadShell("desktop", 0);
3044
3035
3045 var panel = findChild(shell, "panel");
3036 var panel = findChild(shell, "panel");
3046 var launcher = testCase.findChild(shell, "launcher");
3037 var launcher = testCase.findChild(shell, "launcher");
@@ -3060,7 +3051,7 @@ Rectangle {
3060 }
3051 }
3061
3052
3062 function test_touchMenuHidesOnLauncherAppDrawer(data) {
3053 function test_touchMenuHidesOnLauncherAppDrawer(data) {
3063− loadDesktopShellWithApps(1);
3054+ loadShell("desktop", 1)
3064
3055
3065 var panel = findChild(shell, "panel");
3056 var panel = findChild(shell, "panel");
3066 var launcher = testCase.findChild(shell, "launcher");
3057 var launcher = testCase.findChild(shell, "launcher");
@@ -3082,7 +3073,7 @@ Rectangle {
3082 }
3073 }
3083
3074
3084 function test_doubleClickPanelRestoresWindow() {
3075 function test_doubleClickPanelRestoresWindow() {
3085− loadDesktopShellWithApps(0);
3076+ loadShell("desktop", 0);
3086
3077
3087 // start dialer
3078 // start dialer
3088 var appDelegate = startApplication("dialer-app")
3079 var appDelegate = startApplication("dialer-app")
@@ -3103,7 +3094,7 @@ Rectangle {
3103 }
3094 }
3104
3095
3105 function test_noMenusWithActiveCall() {
3096 function test_noMenusWithActiveCall() {
3106− loadDesktopShellWithApps(0);
3097+ loadShell("desktop", 0);
3107
3098
3108 // start music-app, maximize it
3099 // start music-app, maximize it
3109 var appDelegate = startApplication("music-app")
3100 var appDelegate = startApplication("music-app")
@@ -3134,7 +3125,7 @@ Rectangle {
3134 }
3125 }
3135
3126
3136 function test_enforceFocusOnStageOnAltTab() {
3127 function test_enforceFocusOnStageOnAltTab() {
3137− loadDesktopShellWithApps(0);
3128+ loadShell("desktop", 0);
3138
3129
3139 var appSurfaceId = topLevelSurfaceList.nextId;
3130 var appSurfaceId = topLevelSurfaceList.nextId;
3140 var app = ApplicationManager.startApplication("unity8-dash")
3131 var app = ApplicationManager.startApplication("unity8-dash")
@@ -3174,7 +3165,7 @@ Rectangle {
3174 }
3165 }
3175
3166
3176 function test_maximizedWindowMenuThenAltTab(data) {
3167 function test_maximizedWindowMenuThenAltTab(data) {
3177− loadDesktopShellWithApps(0);
3168+ loadShell("desktop", 0);
3178
3169
3179 var appDelegate = startApplication("gmail-webapp");
3170 var appDelegate = startApplication("gmail-webapp");
3180 var appDelegate2 = startApplication("dialer-app");
3171 var appDelegate2 = startApplication("dialer-app");
@@ -3218,7 +3209,7 @@ Rectangle {
3218 }
3209 }
3219
3210
3220 function test_launchFromDrawerPutsFocusOnStage() {
3211 function test_launchFromDrawerPutsFocusOnStage() {
3221− loadDesktopShellWithApps(1);
3212+ loadShell("desktop", 1)
3222
3213
3223 keyClick(Qt.Key_A, Qt.MetaModifier);
3214 keyClick(Qt.Key_A, Qt.MetaModifier);
3224 typeString("browser");
3215 typeString("browser");
@@ -3229,7 +3220,7 @@ Rectangle {
3229 }
3220 }
3230
3221
3231 function test_maximizedWindowAndMenuInPanel() {
3222 function test_maximizedWindowAndMenuInPanel() {
3232− loadDesktopShellWithApps(0);
3223+ loadShell("desktop", 0);
3233
3224
3234 // start music-app, maximize it
3225 // start music-app, maximize it
3235 var appDelegate = startApplication("music-app")
3226 var appDelegate = startApplication("music-app")