b2444c2 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

update tests

b2444c2Michael Zanetti10 years ago

qml/Launcher/Launcher.qml+4−4

compare with xenial

unifiedsplit

@@ -87,14 +87,14 @@ FocusScope {

87 superPressTimer.stop();

88 superLongPressTimer.stop();

89 } else {

90+ switchToNextState("");

91+ root.focus = false;

90 if (panel.highlightIndex == -1) {

92 if (panel.highlightIndex == -1) {

91− showDashHome();

93+ root.showDashHome();

92 } else if (panel.highlightIndex >= 0){

94 } else if (panel.highlightIndex >= 0){

93 launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);

95 launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);

94 }

96 }

95 panel.highlightIndex = -2;

97 panel.highlightIndex = -2;

96− switchToNextState("");

97− root.focus = false;

98 }

99 }

100

@@ -206,7 +206,7 @@ FocusScope {

206 case Qt.Key_Return:

207 case Qt.Key_Space:

208 if (panel.highlightIndex == -1) {

209− showDashHome();

209+ root.showDashHome();

210 } else if (panel.highlightIndex >= 0) {

211 launcherApplicationSelected(LauncherModel.get(panel.highlightIndex).appId);

212 }

qml/Launcher/LauncherPanel.qml+2

@@ -777,6 +777,8 @@ Rectangle {

777 quickList.model = launcherListView.model.get(index).quickList;

778 quickList.appId = launcherListView.model.get(index).appId;

779 quickList.state = "open";

780+ root.highlightIndex = index;

781+ quickList.forceActiveFocus();

780 }

782 }

781

783

782 Item {

784 Item {

tests/qmltests/Dash/tst_DashShell.qml−40

@@ -72,45 +72,5 @@ Item {

72 true, 15000);

73 waitForRendering(findChild(dash, "scopeLoader0").item);

74 }

75−

76− function test_setShellHome() {

77− var dashContentList = findChild(dash, "dashContentList");

78− var startX = dash.width - units.gu(1);

79− var startY = dash.height / 2;

80− var stopX = units.gu(1)

81− var stopY = startY;

82− waitForRendering(dashContentList);

83− touchFlick(dash, startX, startY, stopX, stopY);

84− touchFlick(dash, startX, startY, stopX, stopY);

85− compare(dashContentList.currentIndex, 2, "Could not flick to scope id 2");

86−

87− // Flick the greeter away

88− var startX = shell.width - units.gu(1);

89− var startY = shell.height / 2;

90− var stopX = units.gu(1)

91− var stopY = startY;

92− touchFlick(shell, startX, startY, stopX, stopY);

93−

94− var greeter = findChild(shell, "greeter");

95− tryCompare(greeter, "shown", false);

96−

97− // bring in the launcher

98− var startX = units.gu(1);

99− var startY = shell.height / 2;

100− var stopX = shell.width / 3;

101− var stopY = startY;

102− touchFlick(shell, startX, startY, stopX, stopY);

103−

104− var launcher = findChild(shell, "launcher");

105− var buttonShowDashHome = findChild(launcher, "buttonShowDashHome");

106− tryCompare(buttonShowDashHome, "enabled", true);

107− tryCompare(launcher, "visibleWidth", launcher.panelWidth);

108−

109− // Make sure that opening the launcher doesn't change the scope

110− compare(dashContentList.currentIndex, 2, "Opening the launcher changed the current scope");

111−

112− mouseClick(buttonShowDashHome);

113− tryCompare(dashContentList, "currentIndex", 0);

114− }

115 }

75 }

116}

76}

tests/qmltests/Launcher/tst_Launcher.qml+2−2

@@ -1187,13 +1187,13 @@ Rectangle {

1187 }

1188

1189 function test_keyboardNavigation(data) {

1190− var bfbFocusHighlight = findChild(launcher, "bfbFocusHighlight");

1190+ var bfb = findChild(launcher, "buttonShowDashHome");

1191 var quickList = findChild(launcher, "quickList");

1192 var launcherPanel = findChild(launcher, "launcherPanel");

1193 var launcherListView = findChild(launcher, "launcherListView");

1194 var last = launcherListView.count - 1;

1195

1196− compare(bfbFocusHighlight.visible, false);

1196+ compare(bfb.highlighted, false);

1197 launcher.openForKeyboardNavigation();

1198 tryCompare(launcherPanel, "x", 0);

1199 waitForRendering(launcher);

tests/qmltests/tst_Shell.qml+5−64

@@ -739,22 +739,6 @@ Rectangle {

739 mockNotificationsModel.append(n)

740 }

741

742− function test_ClickUbuntuIconInLauncherTakesToAppsAndResetSearchString() {

743− loadShell("phone");

744− swipeAwayGreeter();

745− dragLauncherIntoView();

746− dashCommunicatorSpy.clear();

747−

748− var launcher = findChild(shell, "launcher");

749− var dashIcon = findChild(launcher, "dashItem");

750− verify(dashIcon != undefined);

751− mouseClick(dashIcon);

752−

753− tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");

754−

755− compare(dashCommunicatorSpy.count, 1);

756− }

757−

758 function test_suspend() {

742 function test_suspend() {

759 loadShell("phone");

743 loadShell("phone");

760 swipeAwayGreeter();

744 swipeAwayGreeter();

@@ -1372,47 +1356,6 @@ Rectangle {

1372 tryCompare(stage, "state", "spread");

1356 tryCompare(stage, "state", "spread");

1373 }

1357 }

1374

1358

1375− function test_tapUbuntuIconInLauncherOverAppSpread() {

1376− launcherShowDashHomeSpy.clear();

1377−

1378− loadShell("phone");

1379− swipeAwayGreeter();

1380−

1381− waitUntilFocusedApplicationIsShowingItsSurface();

1382−

1383− swipeFromRightEdgeToShowAppSpread();

1384−

1385− var launcher = findChild(shell, "launcher");

1386−

1387− dragLauncherIntoView();

1388−

1389− // Emulate a tap with a finger, where the touch position drifts during the tap.

1390− // This is to test the touch ownership changes. The tap is happening on the button

1391− // area but then drifting into the left edge drag area. This test makes sure

1392− // the touch ownership stays with the button and doesn't move over to the

1393− // left edge drag area.

1394− {

1395− var buttonShowDashHome = findChild(launcher, "buttonShowDashHome");

1396− touchFlick(buttonShowDashHome,

1397− buttonShowDashHome.width * 0.2, /* startPos.x */

1398− buttonShowDashHome.height * 0.8, /* startPos.y */

1399− buttonShowDashHome.width * 0.8, /* endPos.x */

1400− buttonShowDashHome.height * 0.2 /* endPos.y */);

1401− }

1402−

1403− compare(launcherShowDashHomeSpy.count, 1);

1404−

1405− // check that the stage has left spread mode.

1406− {

1407− var stage = findChild(shell, "stage");

1408− tryCompare(stage, "state", "staged");

1409− }

1410−

1411− // check that the launcher got dismissed

1412− var launcherPanel = findChild(shell, "launcherPanel");

1413− tryCompare(launcherPanel, "x", -launcherPanel.width);

1414− }

1415−

1416 function test_physicalHomeKeyPressDoesNothingWithActiveGreeter() {

1359 function test_physicalHomeKeyPressDoesNothingWithActiveGreeter() {

1417 loadShell("phone");

1360 loadShell("phone");

1418

1361

@@ -1839,7 +1782,7 @@ Rectangle {

1839 loadDesktopShellWithApps()

1782 loadDesktopShellWithApps()

1840 var launcher = findChild(shell, "launcher");

1783 var launcher = findChild(shell, "launcher");

1841 var stage = findChild(shell, "stage");

1784 var stage = findChild(shell, "stage");

1842− var bfb = findChild(launcher, "buttonShowDashHome");

1785+ var app1 = findChild(launcher, "launcherDelegate0");

1843

1786

1844 GSettingsController.setAutohideLauncher(!data.launcherLocked);

1787 GSettingsController.setAutohideLauncher(!data.launcherLocked);

1845 waitForRendering(shell);

1788 waitForRendering(shell);

@@ -1852,17 +1795,17 @@ Rectangle {

1852 if (!data.launcherLocked) {

1795 if (!data.launcherLocked) {

1853 revealLauncherByEdgePushWithMouse();

1796 revealLauncherByEdgePushWithMouse();

1854 tryCompare(launcher, "x", 0);

1797 tryCompare(launcher, "x", 0);

1855− mouseMove(bfb, bfb.width / 2, bfb.height / 2)

1798+ mouseMove(app1, app1.width / 2, app1.height / 2)

1856 waitForRendering(shell)

1799 waitForRendering(shell)

1857 }

1800 }

1858

1801

1859− mouseClick(bfb, bfb.width / 2, bfb.height / 2)

1802+ mouseClick(app1, app1.width / 2, app1.height / 2)

1860 if (!data.launcherLocked) {

1803 if (!data.launcherLocked) {

1861 tryCompare(launcher, "state", "")

1804 tryCompare(launcher, "state", "")

1862 }

1805 }

1863 tryCompare(stage, "state", "windowed")

1806 tryCompare(stage, "state", "windowed")

1864

1807

1865− tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash")

1808+ tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app")

1866

1809

1867 keyRelease(Qt.Key_Alt);

1810 keyRelease(Qt.Key_Alt);

1868 }

1811 }

@@ -2185,10 +2128,8 @@ Rectangle {

2185 tryCompare(launcher, "state", "visible");

2128 tryCompare(launcher, "state", "visible");

2186 tryCompare(launcherPanel, "highlightIndex", -1);

2129 tryCompare(launcherPanel, "highlightIndex", -1);

2187 keyRelease(Qt.Key_Super_L, Qt.MetaModifier);

2130 keyRelease(Qt.Key_Super_L, Qt.MetaModifier);

2188− tryCompare(launcher, "state", data.launcherLocked ? "visible" : "");

2131+ tryCompare(launcher, "state", "drawer");

2189 tryCompare(launcherPanel, "highlightIndex", -2);

2132 tryCompare(launcherPanel, "highlightIndex", -2);

2190− tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");

2191− tryCompare(stage, "focus", true)

2192 }

2133 }

2193

2134

2194 function test_longpressSuperOpensLauncherAndShortcutsOverlay() {

2135 function test_longpressSuperOpensLauncherAndShortcutsOverlay() {