5b38a05 · unity8 · git.iko.soy

git.iko.soy/unity8

Fix Tutorial qmluitest too, whoops!

commit5b38a050e3610c58c88e4c4826e9b990d7504bfa authorMichael Terry <michael.terry@canonical.com> dateThu 10 Mar 2016, 08:31 (11 years ago) parent99800d5

2 files changed+15−15

compare with xenial

unifiedsplit

tests/mocks/Unity/Application/SurfaceManager.cpp+1 tests/qmltests/Tutorial/tst_Tutorial.qml+14−15

tests/mocks/Unity/Application/SurfaceManager.cpp+1

@@ -63,6 +63,7 @@ MirSurface *SurfaceManager::inputMethodSurface()

6363 if (!m_virtualKeyboard) {

6464 m_virtualKeyboard = new VirtualKeyboard;

6565 connect(m_virtualKeyboard, &QObject::destroyed, this, [this](QObject *obj) {

66+ m_virtualKeyboard = nullptr;

6667 MirSurface* surface = qobject_cast<MirSurface*>(obj);

6768 Q_EMIT surfaceDestroyed(surface);

6869 });

tests/qmltests/Tutorial/tst_Tutorial.qml+14−15

@@ -309,7 +309,7 @@ Rectangle {

309309 var tutorialTopTimer = findInvisibleChild(tutorialTop, "tutorialTopTimer");

310310

311311 tutorialTopTimer.interval = 1;

312− AccountsService.demoEdgesCompleted = ["left"];

312+ AccountsService.demoEdgesCompleted = ["left", "left-long"];

313313

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

315315 tryCompare(tutorialTop, "shown", true);

@@ -320,7 +320,7 @@ Rectangle {

320320 var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");

321321 var tutorialRight = findChild(shell, "tutorialRight");

322322

323− AccountsService.demoEdgesCompleted = ["left", "top"];

323+ AccountsService.demoEdgesCompleted = ["left", "left-long", "top"];

324324 ApplicationManager.startApplication("gallery-app");

325325 ApplicationManager.startApplication("facebook-webapp");

326326

@@ -333,7 +333,7 @@ Rectangle {

333333 var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");

334334 var tutorialBottom = findChild(shell, "tutorialBottom");

335335

336− AccountsService.demoEdgesCompleted = ["left", "top", "right"];

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

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

338338

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

@@ -456,7 +456,7 @@ Rectangle {

456456 touchFlick(shell, halfWidth, 0, halfWidth, shell.height);

457457

458458 tryCompare(tutorialTop, "shown", false);

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

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

460460 tryCompare(panel.indicators, "fullyOpened", true);

461461 }

462462

@@ -482,12 +482,12 @@ Rectangle {

482482

483483 var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");

484484 var tutorialTop = findChild(shell, "tutorialTop");

485− AccountsService.demoEdgesCompleted = ["left"];

485+ AccountsService.demoEdgesCompleted = ["left", "left-long"];

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

487487 verify(!tutorialTop.shown);

488488

489489 touchFlick(shell, halfWidth, 0, halfWidth, shell.height);

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

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

491491 }

492492

493493 function test_tutorialRightEdges() {

@@ -518,7 +518,7 @@ Rectangle {

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

519519

520520 tryCompare(tutorialRight, "shown", false);

521− tryCompare(AccountsService, "demoEdgesCompleted", ["left", "top", "right"]);

521+ tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top", "right"]);

522522 }

523523

524524 function test_tutorialRightShortDrag() {

@@ -550,7 +550,7 @@ Rectangle {

550550 ApplicationManager.startApplication("facebook-webapp");

551551 tryCompare(ApplicationManager, "count", 3);

552552

553− AccountsService.demoEdgesCompleted = ["left", "top"];

553+ AccountsService.demoEdgesCompleted = ["left", "left-long", "top"];

554554 verify(tutorialRightTimer.running, true);

555555 verify(!tutorialRight.shown);

556556 tryCompare(tutorialRight, "shown", true);

@@ -560,11 +560,11 @@ Rectangle {

560560 // Test that we skip the tutorial if user uses right edge themselves

561561

562562 var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");

563− AccountsService.demoEdgesCompleted = ["left"];

563+ AccountsService.demoEdgesCompleted = ["left", "left-long"];

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

565565

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

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

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

568568 }

569569

570570 function test_tutorialBottomEdges() {

@@ -596,14 +596,13 @@ Rectangle {

596596 touchFlick(shell, halfWidth, shell.height, halfWidth, halfHeight);

597597

598598 tryCompare(tutorialBottom, "shown", false);

599− tryCompare(AccountsService, "demoEdgesCompleted", ["left", "top", "right", "bottom-dialer-app"]);

599+ tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long", "top", "right", "bottom-dialer-app"]);

600600

601601 // OK, we did one, just confirm that when all are done, we mark whole tutorial as done.

602602 verify(AccountsService.demoEdges);

603− AccountsService.demoEdgesCompleted = ["left", "top", "right",

603+ AccountsService.demoEdgesCompleted = ["left", "left-long", "top", "right",

604604 "bottom-address-book-app",

605605 "bottom-com.ubuntu.calculator_calculator",

606− "bottom-com.ubuntu.clock_clock",

607606 "bottom-dialer-app",

608607 "bottom-messaging-app"];

609608 verify(!AccountsService.demoEdges);

@@ -617,7 +616,7 @@ Rectangle {

617616 var tutorialRight = findChild(shell, "tutorialRight");

618617 var tutorialBottom = findChild(shell, "tutorialBottom");

619618

620− AccountsService.demoEdgesCompleted = ["left", "top"];

619+ AccountsService.demoEdgesCompleted = ["left", "left-long", "top"];

621620 ApplicationManager.startApplication("gallery-app");

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

623622

@@ -717,7 +716,7 @@ Rectangle {

717716 verify(!tutorialRight.isReady);

718717 verify(!tutorialRight.shown);

719718 verify(!tutorialRight.paused);

720− compare(AccountsService.demoEdgesCompleted, ["left", "top"]);

719+ compare(AccountsService.demoEdgesCompleted, ["left", "left-long", "top"]);

721720 }

722721

723722 function test_desktopOnlyShowsTutorialRight() {