cd69592 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

update tst_Shell

cd69592Michael Zanetti12 years ago

qml/Dash/graphics/phone/screenshots/dash.pngnew file

compare with xenial

unifiedsplit

No changes to the content.

qml/Shell.qml+2−1

@@ -85,6 +85,7 @@ Item {

86 DashCommunicator {

87 id: dash

88+ objectName: "dashCommunicator"

88 }

89 }

90 WindowKeysFilter {

91 WindowKeysFilter {

@@ -475,7 +476,7 @@ Item {

475

476

476 onShowDashHome: showHome()

477 onShowDashHome: showHome()

477 onDash: showDash()

478 onDash: showDash()

478− onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)

479+ onDashSwipeChanged: if (dashSwipe) dash.setCurrentScope("clickscope", false, true)

479 onLauncherApplicationSelected: {

480 onLauncherApplicationSelected: {

480 if (greeter.fakeActiveForApp !== "") {

481 if (greeter.fakeActiveForApp !== "") {

481 lockscreen.show()

482 lockscreen.show()

qml/Stages/PhoneStage.qml+6

@@ -190,6 +190,12 @@ Item {

190 snapAnimation.start();

191 }

192

193+ // In case the ApplicationManager already holds an app when starting up we're missing animations

194+ // Make sure we end up in the same state

195+ Component.onCompleted: {

196+ spreadView.contentX = -spreadView.shift

197+ }

198+

193 SequentialAnimation {

199 SequentialAnimation {

194 id: snapAnimation

200 id: snapAnimation

195 property int targetContentX: -spreadView.shift

201 property int targetContentX: -spreadView.shift

qml/Stages/SpreadDelegate.qml+1

@@ -37,6 +37,7 @@ Item {

38 Item {

39 id: surfaceContainer

40+ objectName: "surfaceContainer" + index

40 anchors.fill: parent

41 anchors.fill: parent

41 readonly property var surface: model.surface

42 readonly property var surface: model.surface

42 property bool appHasCreatedASurface: false

43 property bool appHasCreatedASurface: false

tests/mocks/Unity/Application/ApplicationManager.cpp+19

@@ -41,6 +41,8 @@ ApplicationManager::ApplicationManager(QObject *parent)

41 m_roleNames.insert(RoleFullscreen, "fullscreen");

43 buildListOfAvailableApplications();

44+

45+ startDash();

44}

46}

46ApplicationManager::~ApplicationManager()

48ApplicationManager::~ApplicationManager()

@@ -205,6 +207,10 @@ ApplicationInfo* ApplicationManager::startApplication(const QString &appId,

205

207

206bool ApplicationManager::stopApplication(const QString &appId)

208bool ApplicationManager::stopApplication(const QString &appId)

207{

209{

210+ if (appId == "unity8-dash") {

211+ return false;

212+ }

213+

208 ApplicationInfo *application = findApplication(appId);

214 ApplicationInfo *application = findApplication(appId);

209 if (application == nullptr)

215 if (application == nullptr)

210 return false;

216 return false;

@@ -380,6 +386,14 @@ void ApplicationManager::buildListOfAvailableApplications()

380{

386{

381 ApplicationInfo *application;

387 ApplicationInfo *application;

382

388

389+ application = new ApplicationInfo(this);

390+ application->setAppId("unity8-dash");

391+ application->setName("Unity 8 Mock Dash");

392+ application->setIcon(QUrl("unity8-dash"));

393+ application->setStage(ApplicationInfo::SideStage);

394+ generateQmlStrings(application);

395+ m_availableApplications.append(application);

396+

383 application = new ApplicationInfo(this);

397 application = new ApplicationInfo(this);

384 application->setAppId("dialer-app");

398 application->setAppId("dialer-app");

385 application->setName("Dialer");

399 application->setName("Dialer");

@@ -598,3 +612,8 @@ bool ApplicationManager::isEmpty() const

598{

612{

599 return m_runningApplications.isEmpty();

613 return m_runningApplications.isEmpty();

600}

614}

615+

616+void ApplicationManager::startDash()

617+{

618+ startApplication("unity8-dash");

619+}

tests/mocks/Unity/Application/ApplicationManager.h+3

@@ -118,6 +118,9 @@ class ApplicationManager : public ApplicationManagerInterface {

118 void focusRequested(const QString &appId);

119 void emptyChanged(bool empty);

120

121+ private Q_SLOTS:

122+ void startDash();

123+

121 private:

124 private:

122 void add(ApplicationInfo *application);

125 void add(ApplicationInfo *application);

123 void remove(ApplicationInfo* application);

126 void remove(ApplicationInfo* application);

tests/mocks/Unity/CMakeLists.txt+1

@@ -2,6 +2,7 @@ add_subdirectory(Application)

2add_subdirectory(Indicators)

3add_subdirectory(Launcher)

4add_subdirectory(Notifications)

5+add_subdirectory(DashCommunicator)

6pkg_search_module(DEE dee-1.0 REQUIRED)

7pkg_search_module(DEE dee-1.0 REQUIRED)

7pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

8pkg_search_module(GOBJECT gobject-2.0 REQUIRED)

tests/qmltests/tst_Shell.qml+36−271

@@ -56,49 +56,20 @@ Item {

56 signalName: "sessionStarted"

57 }

59+ SignalSpy {

60+ id: dashCommunicatorSpy

61+ signalName: "setCurrentScopeCalled"

62+ }

63+

59 UT.UnityTestCase {

64 UT.UnityTestCase {

60 name: "Shell"

65 name: "Shell"

61 when: windowShown

66 when: windowShown

63 function initTestCase() {

68 function initTestCase() {

64− var ok = false;

65− var attempts = 0;

66− var maxAttempts = 1000;

67−

68− // Qt loads a qml scene asynchronously. So early on, some findChild() calls made in

69− // tests may fail because the desired child item wasn't loaded yet.

70− // Thus here we try to ensure the scene has been fully loaded before proceeding with the tests.

71− // As I couldn't find an API in QQuickView & friends to tell me that the scene is 100% loaded

72− // (all items instantiated, etc), I resort to checking the existence of some key items until

73− // repeatedly until they're all there.

74− do {

75− var dashContentList = findChild(shell, "dashContentList");

76− waitForRendering(dashContentList);

77− var homeLoader = findChild(dashContentList, "clickscope loader");

78− ok = homeLoader !== null

79− && homeLoader.item !== undefined;

80−

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

82− ok &= greeter !== null;

83−

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

85− ok &= launcherPanel !== null;

86−

87− attempts++;

88− if (!ok) {

89− console.log("Attempt " + attempts + " failed. Waiting a bit before trying again.");

90− // wait a bit before retrying

91− wait(100);

92− } else {

93− console.log("All seem fine after " + attempts + " attempts.");

94− }

95− } while (!ok && attempts <= maxAttempts);

96−

97− verify(ok);

98−

99 swipeAwayGreeter();

69 swipeAwayGreeter();

100

101 sessionSpy.target = findChild(shell, "greeter")

71 sessionSpy.target = findChild(shell, "greeter")

72+ dashCommunicatorSpy.target = findInvisibleChild(shell, "dashCommunicator");

102 }

73 }

103

104 function cleanup() {

75 function cleanup() {

@@ -111,56 +82,17 @@ Item {

111 // kill all (fake) running apps

82 // kill all (fake) running apps

112 killApps(ApplicationManager);

83 killApps(ApplicationManager);

113

114− var dashContent = findChild(shell, "dashContent");

85+ waitForUIToSettle();

115− dashContent.closePreview();

116−

117− var dashHome = findChild(shell, "clickscope loader");

118− swipeUntilScopeViewIsReached(dashHome);

119−

120 hideIndicators();

86 hideIndicators();

121 }

87 }

122

123 function killApps(apps) {

89 function killApps(apps) {

124 if (!apps) return;

90 if (!apps) return;

125− while (apps.count > 0) {

91+ while (apps.count > 1) {

92+ var appIndex = apps.get(0).appId == "unity8-dash" ? 1 : 0

126− ApplicationManager.stopApplication(apps.get(0).appId);

93+ ApplicationManager.stopApplication(apps.get(appIndex).appId);

127 }

94 }

128− compare(ApplicationManager.count, 0)

95+ compare(ApplicationManager.count, 1)

129− }

130−

131− /*

132− Test the effect of a right-edge drag on the dash in 3 situations:

133− 1 - when no application has been launched yet

134− 2 - when there's a minimized application

135− 3 - after the last running application has been closed/stopped

136−

137− The behavior of Dash on 3 should be the same as on 1.

138− */

139− function test_rightEdgeDrag() {

140− checkRightEdgeDragWithNoRunningApps();

141−

142− dragLauncherIntoView();

143−

144− // Launch an app from the launcher

145− tapOnAppIconInLauncher();

146− waitUntilApplicationWindowIsFullyVisible();

147−

148− // Minimize the application we just launched

149− swipeFromLeftEdge(units.gu(27));

150−

151− waitForUIToSettle();

152−

153− checkRightEdgeDragWithMinimizedApp();

154−

155− // Minimize that application once again

156− swipeFromLeftEdge(units.gu(27));

157−

158− // Right edge behavior should now be the same as before that app,

159− // was launched. Manually cleanup beforehand to get to initial

160− // state.

161− cleanup();

162− waitForUIToSettle();

163− checkRightEdgeDragWithNoRunningApps();

164 }

96 }

165

166 function test_leftEdgeDrag_data() {

98 function test_leftEdgeDrag_data() {

@@ -183,7 +115,7 @@ Item {

183

115

184 swipeFromLeftEdge(data.swipeLength);

116 swipeFromLeftEdge(data.swipeLength);

185 if (data.appHides)

117 if (data.appHides)

186− waitUntilApplicationWindowIsFullyHidden();

118+ waitUntilDashIsFocused();

187 else

119 else

188 waitUntilApplicationWindowIsFullyVisible();

120 waitUntilApplicationWindowIsFullyVisible();

189 }

121 }

@@ -238,100 +170,18 @@ Item {

238 tryCompare(greeter, "showProgress", 0);

170 tryCompare(greeter, "showProgress", 0);

239 }

171 }

240

172

241− /*

242− Perform a right-edge drag when the Dash is being show and there are

243− no running/minimized apps to be restored.

244−

245− The expected behavior is that an animation should be played to hint the

246− user that his right-edge drag gesture has been successfully recognized

247− but there is no application to be brought to foreground.

248− */

249− function checkRightEdgeDragWithNoRunningApps() {

250− var touchX = shell.width - (shell.edgeSize / 2);

251− var touchY = shell.height / 2;

252−

253− var dash = findChild(shell, "dash");

254− // check that dash has normal scale and opacity

255− tryCompare(dash, "contentScale", 1.0);

256− tryCompare(dash, "opacity", 1.0);

257−

258− touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY,

259− true /* beginTouch */, false /* endTouch */, units.gu(10), 50);

260−

261− // check that Dash has been scaled down and had its opacity reduced

262− tryCompareFunction(function() { return dash.contentScale <= 0.9; }, true);

263− tryCompareFunction(function() { return dash.opacity <= 0.5; }, true);

264−

265− touchRelease(shell, shell.width * 0.1, touchY);

266−

267− // and now everything should have gone back to normal

268− tryCompare(dash, "contentScale", 1.0);

269− tryCompare(dash, "opacity", 1.0);

270− }

271−

272− /*

273− Perform a right-edge drag when the Dash is being show and there is

274− a running/minimized app to be restored.

275−

276− The expected behavior is that the dash should fade away and ultimately be

277− made invisible once the gesture is finished as the restored app will now

278− be on foreground.

279− */

280− function checkRightEdgeDragWithMinimizedApp() {

281− var touchX = shell.width - (shell.edgeSize / 2);

282− var touchY = shell.height / 2;

283−

284− var dash = findChild(shell, "dash");

285− // check that dash has normal scale and opacity

286− tryCompare(dash, "contentScale", 1.0);

287− tryCompare(dash, "opacity", 1.0);

288−

289− touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY,

290− true /* beginTouch */, false /* endTouch */, units.gu(10), 50);

291−

292− // check that Dash has been scaled down and had its opacity reduced

293− tryCompareFunction(function() { return dash.contentScale <= 0.9; }, true);

294− tryCompareFunction(function() { return dash.opacity <= 0.5; }, true);

295−

296− touchRelease(shell, shell.width * 0.1, touchY);

297−

298− // dash should have gone away, now that the app is on foreground

299− tryCompare(dash, "visible", false);

300− }

301−

302 /*

173 /*

303 Regression test for bug https://bugs.launchpad.net/touch-preview-images/+bug/1193419

174 Regression test for bug https://bugs.launchpad.net/touch-preview-images/+bug/1193419

304

175

305− When the user minimizes an application (left-edge swipe) he should always end up in the "Running Apps"

176+ When the user minimizes an application (left-edge swipe) he should always end up in the

306− category of the "Applications" scope view.

177+ "Applications" scope view.

307

178

308 Steps:

179 Steps:

309− - go to apps lens

310− - scroll to the bottom

311− - reveal launcher and launch an app

180+ - reveal launcher and launch an app that covers the dash

312 - perform long left edge swipe to go minimize the app and go back to the dash.

181 - perform long left edge swipe to go minimize the app and go back to the dash.

313−

182+ - verify the setCurrentScope() D-Bus call to the dash has been called for the correct scope id.

314− Expected Results

315− - apps lens shown

316 */

183 */

317 function test_minimizingAppTakesToDashApps() {

184 function test_minimizingAppTakesToDashApps() {

318− var dashApps = findChild(shell, "clickscope");

319− swipeUntilScopeViewIsReached(dashApps);

320−

321− // swipe finger up until the running/recent apps section (which we assume

322− // it's the first one) is as far from view as possible.

323− // We also assume that DashApps is tall enough that it's scrollable

324− var appsCategoryListView = findChild(dashApps, "categoryListView");

325− while (!appsCategoryListView.atYEnd) {

326− swipeUpFromCenter();

327− tryCompare(appsCategoryListView, "moving", false);

328− }

329−

330− // Switch away from the Applications scope.

331− swipeRightFromCenter();

332− waitUntilItemStopsMoving(dashApps);

333− verify(!itemIsOnScreen(dashApps));

334−

335 dragLauncherIntoView();

185 dragLauncherIntoView();

336

186

337 // Launch an app from the launcher

187 // Launch an app from the launcher

@@ -339,19 +189,16 @@ Item {

339

189

340 waitUntilApplicationWindowIsFullyVisible();

190 waitUntilApplicationWindowIsFullyVisible();

341

191

342− // Dragging launcher into view with a little bit of gap (units.gu(1)) should switch to Apps scope

192+ verify(ApplicationManager.focusedApplicationId !== "unity8-dash")

343− dragLauncherIntoView();

344− verify(itemIsOnScreen(dashApps));

345

193

194+ dashCommunicatorSpy.clear();

346 // Minimize the application we just launched

195 // Minimize the application we just launched

347 swipeFromLeftEdge(units.gu(27));

196 swipeFromLeftEdge(units.gu(27));

348

197

349− // Wait for the whole UI to settle down

198+ tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");

350− waitUntilApplicationWindowIsFullyHidden();

351− waitUntilItemStopsMoving(dashApps);

352− tryCompare(appsCategoryListView, "moving", false);

353

199

354− verify(itemIsOnScreen(dashApps));

200+ compare(dashCommunicatorSpy.count, 1);

201+ compare(dashCommunicatorSpy.signalArguments[0][0], "clickscope");

355 }

202 }

356

203

357 function test_showInputMethod() {

204 function test_showInputMethod() {

@@ -408,9 +255,14 @@ Item {

408

255

409 // Wait for the whole UI to settle down

256 // Wait for the whole UI to settle down

410 function waitForUIToSettle() {

257 function waitForUIToSettle() {

411− waitUntilApplicationWindowIsFullyHidden();

412− var dashContentList = findChild(shell, "dashContentList");

258+ var launcher = findChild(shell, "launcherPanel")

413− tryCompare(dashContentList, "moving", false);

259+ tryCompareFunction(function() {return launcher.x === 0 || launcher.x === -launcher.width;}, true);

260+ if (launcher.x === 0) {

261+ mouseClick(shell, shell.width / 2, shell.height / 2)

262+ }

263+ tryCompare(launcher, "x", -launcher.width)

264+

265+ waitForRendering(shell)

414 }

266 }

415

267

416 function dragToCloseIndicatorsPanel() {

268 function dragToCloseIndicatorsPanel() {

@@ -427,6 +279,7 @@ Item {

427

279

428 function dragLauncherIntoView() {

280 function dragLauncherIntoView() {

429 var launcherPanel = findChild(shell, "launcherPanel");

281 var launcherPanel = findChild(shell, "launcherPanel");

282+ print("launcher is at", launcherPanel.x)

430 verify(launcherPanel.x = - launcherPanel.width);

283 verify(launcherPanel.x = - launcherPanel.width);

431

284

432 var touchStartX = 2;

285 var touchStartX = 2;

@@ -467,24 +320,12 @@ Item {

467 }

320 }

468

321

469 function waitUntilApplicationWindowIsFullyVisible() {

322 function waitUntilApplicationWindowIsFullyVisible() {

470− var underlay = findChild(shell, "underlay");

323+ var spreadView = findChild(shell, "surfaceContainer0");

471− tryCompare(underlay, "visible", false);

324+ tryCompareFunction(function() { return spreadView.surface !== null; }, true);

472 }

325 }

473

326

474− function waitUntilApplicationWindowIsFullyHidden() {

327+ function waitUntilDashIsFocused() {

475− var stages = findChild(shell, "stages");

328+ tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");

476− tryCompare(stages, "fullyHidden", true);

477− }

478−

479− function swipeUntilScopeViewIsReached(scopeView) {

480− while (!itemIsOnScreen(scopeView)) {

481− if (itemIsToLeftOfScreen(scopeView)) {

482− swipeRightFromCenter();

483− } else {

484− swipeLeftFromCenter();

485− }

486− waitUntilItemStopsMoving(scopeView);

487− }

488 }

329 }

489

330

490 function swipeFromLeftEdge(swipeLength) {

331 function swipeFromLeftEdge(swipeLength) {

@@ -493,24 +334,6 @@ Item {

493 touchFlick(shell, touchStartX, touchStartY, swipeLength, touchStartY);

334 touchFlick(shell, touchStartX, touchStartY, swipeLength, touchStartY);

494 }

335 }

495

336

496− function swipeLeftFromCenter() {

497− var touchStartX = shell.width * 3 / 4;

498− var touchStartY = shell.height / 2;

499− touchFlick(shell, touchStartX, touchStartY, 0, touchStartY);

500− }

501−

502− function swipeRightFromCenter() {

503− var touchStartX = shell.width * 3 / 4;

504− var touchStartY = shell.height / 2;

505− touchFlick(shell, touchStartX, touchStartY, shell.width, touchStartY);

506− }

507−

508− function swipeUpFromCenter() {

509− var touchStartX = shell.width / 2;

510− var touchStartY = shell.height / 2;

511− touchFlick(shell, touchStartX, touchStartY, touchStartX, 0);

512− }

513−

514 function itemIsOnScreen(item) {

337 function itemIsOnScreen(item) {

515 var itemRectInShell = item.mapToItem(shell, 0, 0, item.width, item.height);

338 var itemRectInShell = item.mapToItem(shell, 0, 0, item.width, item.height);

516

339

@@ -520,64 +343,6 @@ Item {

520 && itemRectInShell.y + itemRectInShell.height <= shell.height;

343 && itemRectInShell.y + itemRectInShell.height <= shell.height;

521 }

344 }

522

345

523− function itemIsToLeftOfScreen(item) {

524− var itemRectInShell = item.mapToItem(shell, 0, 0, item.width, item.height);

525− return itemRectInShell.x < 0;

526− }

527−

528− function waitUntilItemStopsMoving(item) {

529− var itemRectInShell = item.mapToItem(shell, 0, 0, item.width, item.height);

530− var previousX = itemRectInShell.x;

531− var previousY = itemRectInShell.y;

532− var isStill = false;

533−

534− do {

535− wait(100);

536− itemRectInShell = item.mapToItem(shell, 0, 0, item.width, item.height);

537− if (itemRectInShell.x == previousX && itemRectInShell.y == previousY) {

538− isStill = true;

539− } else {

540− previousX = itemRectInShell.x;

541− previousY = itemRectInShell.y;

542− }

543− } while (!isStill);

544− }

545−

546− function test_DashShown_data() {

547− return [

548− {tag: "in focus", greeter: false, app: false, launcher: false, indicators: false, expectedShown: true},

549− {tag: "under greeter", greeter: true, app: false, launcher: false, indicators: false, expectedShown: false},

550− {tag: "under app", greeter: false, app: true, launcher: false, indicators: false, expectedShown: false},

551− {tag: "under launcher", greeter: false, app: false, launcher: true, indicators: false, expectedShown: true},

552− {tag: "under indicators", greeter: false, app: false, launcher: false, indicators: true, expectedShown: false},

553− ]

554− }

555−

556− function test_DashShown(data) {

557− if (data.greeter) {

558− // Swipe the greeter in

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

560− Powerd.displayPowerStateChange(Powerd.Off, 0);

561− tryCompare(greeter, "showProgress", 1);

562− }

563−

564− if (data.app) {

565− dragLauncherIntoView();

566− tapOnAppIconInLauncher();

567− }

568−

569− if (data.launcher) {

570− dragLauncherIntoView();

571− }

572−

573− if (data.indicators) {

574− showIndicators();

575− }

576−

577− var dash = findChild(shell, "dash");

578− tryCompare(dash, "shown", data.expectedShown);

579− }

580−

581 function test_focusRequestedHidesGreeter() {

346 function test_focusRequestedHidesGreeter() {

582 var greeter = findChild(shell, "greeter");

347 var greeter = findChild(shell, "greeter");

583

348

@@ -588,8 +353,7 @@ Item {

588 // Minimize the application we just launched

353 // Minimize the application we just launched

589 swipeFromLeftEdge(units.gu(27));

354 swipeFromLeftEdge(units.gu(27));

590

355

591− // Wait for the whole UI to settle down

356+ waitUntilDashIsFocused();

592− waitUntilApplicationWindowIsFullyHidden();

593

357

594 greeter.show();

358 greeter.show();

595 tryCompare(greeter, "showProgress", 1);

359 tryCompare(greeter, "showProgress", 1);

@@ -602,6 +366,7 @@ Item {

602 function test_showGreeterDBusCall() {

366 function test_showGreeterDBusCall() {

603 var greeter = findChild(shell, "greeter")

367 var greeter = findChild(shell, "greeter")

604 tryCompare(greeter, "showProgress", 0)

368 tryCompare(greeter, "showProgress", 0)

369+ waitForRendering(greeter);

605 LightDM.Greeter.showGreeter()

370 LightDM.Greeter.showGreeter()

606 tryCompare(greeter, "showProgress", 1)

371 tryCompare(greeter, "showProgress", 1)

607 }

372 }