3df724b · unity8 · git.iko.soy

git.iko.soy/unity8

Some test fixes

commit3df724b605bce7c9ad53e3182fe2199e09e509f0 authorMichael Terry <michael.terry@canonical.com> dateWed 16 Mar 2016, 11:08 (11 years ago) parent28988b8

2 files changed+13−6

compare with xenial

unifiedsplit

qml/Tutorial/TutorialBottom.qml−2 tests/qmltests/Tutorial/tst_Tutorial.qml+13−4

qml/Tutorial/TutorialBottom.qml−2

@@ -78,8 +78,6 @@ TutorialPage {

7878 i18n.tr("Swipe up to add a contact") :

7979 application.appId === "com.ubuntu.calculator_calculator" ?

8080 i18n.tr("Swipe up for favorite calculations") :

81− application.appId === "com.ubuntu.clock_clock" ?

82− i18n.tr("Swipe up to manage alarms") :

8381 application.appId === "dialer-app" ?

8482 i18n.tr("Swipe up for recent calls") :

8583 application.appId === "messaging-app" ?

tests/qmltests/Tutorial/tst_Tutorial.qml+13−4

@@ -267,8 +267,9 @@ Rectangle {

267267 }

268268

269269 function prepareShell() {

270− tryCompare(shell, "enabled", true); // enabled by greeter when ready

270+ tryCompare(shell, "enabled", true); // enabled by greeter when ready

271271

272+ SurfaceManager.inputMethodSurface.setState(Mir.MinimizedState);

272273 callManager.foregroundCall = null;

273274 AccountsService.demoEdges = false;

274275 AccountsService.demoEdgesCompleted = [];

@@ -334,6 +335,7 @@ Rectangle {

334335

335336 AccountsService.demoEdgesCompleted = ["left", "left-long", "top", "right"];

336337 ApplicationManager.startApplication("dialer-app");

338+ tryCompare(ApplicationManager, "focusedApplicationId", "dialer-app");

337339

338340 tryCompare(tutorialLeftLoader, "active", false);

339341 tryCompare(tutorialBottom, "shown", true);

@@ -381,7 +383,7 @@ Rectangle {

381383 // compare opacity with a bound rather than hard 0.6 because progress doesn't

382384 // always match the drag perfectly (takes a moment for drag to kick in)

383385 tryCompareFunction(function() {

384− return tutorialLeft.opacity >= 0.6 && tutorialLeft.opacity < 0.7;

386+ return tutorialLeft.opacity >= 0.6 && tutorialLeft.opacity < 0.8;

385387 }, true);

386388 touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.4, halfHeight, false, true);

387389

@@ -412,7 +414,7 @@ Rectangle {

412414 touchFlick(shell, 0, halfHeight, shell.width, halfHeight);

413415

414416 tryCompare(tutorialLeft, "shown", false);

415− tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);

417+ tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long"]);

416418 }

417419

418420 function test_tutorialLeftAutoSkipped() {

@@ -634,6 +636,8 @@ Rectangle {

634636 var sideStageX = shell.width - units.gu(20);

635637

636638 openTutorialBottom();

639+ var app = ApplicationManager.findApplication("dialer-app");

640+ app.setStage(ApplicationInfoInterface.SideStage);

637641

638642 touchFlick(shell, mainStageX, shell.height, mainStageX, targetHeight, true, false);

639643 compare(tutorialBottom.opacity, 1);

@@ -652,8 +656,13 @@ Rectangle {

652656 var mainStageX = units.gu(20);

653657 var sideStageX = shell.width - units.gu(20);

654658

659+ ApplicationManager.startApplication("gallery-app");

660+ var app = ApplicationManager.findApplication("gallery-app");

661+ app.setStage(ApplicationInfoInterface.SideStage);

662+ tryCompare(ApplicationManager, "focusedApplicationId", "gallery-app");

663+

655664 openTutorialBottom();

656− var app = ApplicationManager.findApplication("dialer-app");

665+ app = ApplicationManager.findApplication("dialer-app");

657666 app.setStage(ApplicationInfoInterface.MainStage);

658667

659668 touchFlick(shell, sideStageX, shell.height, sideStageX, targetHeight, true, false);