f39312b · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix tutorial tests

f39312bMichael Terry10 years ago

qml/Shell.qml+2−1

compare with xenial

unifiedsplit

@@ -625,7 +625,8 @@ Item {

625

626 paused: callManager.hasCalls || !greeter || greeter.shown

627 delayed: dialogs.hasActiveDialog || notifications.hasNotification ||

628− inputMethod.state === "shown" || launcher.shown ||

628+ inputMethod.state === "shown" ||

629+ (launcher.shown && !launcher.lockedVisible) ||

629 panel.indicators.shown || stage.dragProgress > 0

630 panel.indicators.shown || stage.dragProgress > 0

630 usageScenario: shell.usageScenario

631 usageScenario: shell.usageScenario

631 lastInputTimestamp: inputFilter.lastInputTimestamp

632 lastInputTimestamp: inputFilter.lastInputTimestamp

tests/qmltests/Tutorial/tst_Tutorial.qml+24−22

@@ -385,12 +385,12 @@ Rectangle {

385

386 function test_tutorialLeftFinish() {

387 var tutorial = findChild(shell, "tutorial");

388− var tutorialLeft = findChild(tutorial, "tutorialLeft");

388+ var tutorialLeftLoader = findChild(tutorial, "tutorialLeftLoader");

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

390

391 touchFlick(shell, 0, halfHeight, halfWidth, halfHeight);

392

393− tryCompare(tutorialLeft, "shown", false);

393+ tryCompare(tutorialLeftLoader, "shown", false);

394 tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);

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

396 }

@@ -400,6 +400,7 @@ Rectangle {

400 // letting go (i.e. not triggering the "progress" property of

401 // Launcher).

402 var tutorialLeft = findChild(shell, "tutorialLeft");

403+ var tutorialLeftLoader = findChild(shell, "tutorialLeftLoader");

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

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

404

405

405 // Confirm fade during drag

406 // Confirm fade during drag

@@ -416,31 +417,32 @@ Rectangle {

416 // out much.

417 // out much.

417 touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.4, halfHeight);

418 touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.4, halfHeight);

418 tryCompare(launcher, "state", ""); // should remain hidden

419 tryCompare(launcher, "state", ""); // should remain hidden

419− tryCompare(tutorialLeft, "shown", true); // and we should still be on left

420+ tryCompare(tutorialLeftLoader, "shown", true); // and we should still be on left

420

421

422

422 // Now drag out but not past launcher itself

423 // Now drag out but not past launcher itself

423 touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.9, halfHeight);

424 touchFlick(shell, 0, halfHeight, launcher.panelWidth * 0.9, halfHeight);

424

425

425− tryCompare(tutorialLeft, "shown", false);

426+ tryCompare(tutorialLeftLoader, "shown", false);

426 tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);

427 tryCompare(AccountsService, "demoEdgesCompleted", ["left"]);

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

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

428 }

429 }

429

430

430− function test_tutorialLeftLongDrag() {

431+ function test_tutorialLeftLongFinish() {

431− // Just confirm that a long drag ("dash" drag) doesn't confuse us

432+ AccountsService.demoEdgesCompleted = ["left", "top"];

433+

434+ var tutorialLeftLongTimer = findInvisibleChild(shell, "tutorialLeftLongTimer");

435+ tutorialLeftLongTimer.interval = 1;

432

436

433− // So that we actually switch to dash and launcher hides

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

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

435

438

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

439+ var tutorialLeftLongLoader = findChild(shell, "tutorialLeftLongLoader");

437− var tutorialLeft = findChild(shell, "tutorialLeftLoader");

440+ tryCompare(tutorialLeftLongLoader, "shown", true);

438− verify(tutorialLeft);

439

441

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

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

441

443

442− tryCompare(tutorialLeft, "shown", false);

444+ tryCompare(tutorialLeftLongLoader, "shown", false);

443− tryCompare(AccountsService, "demoEdgesCompleted", ["left", "left-long"]);

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

444 }

446 }

445

447

446 function test_tutorialLeftAutoSkipped() {

448 function test_tutorialLeftAutoSkipped() {

@@ -494,13 +496,13 @@ Rectangle {

494

496

495 function test_tutorialTopFinish() {

497 function test_tutorialTopFinish() {

496 var tutorial = findChild(shell, "tutorial");

498 var tutorial = findChild(shell, "tutorial");

497− var tutorialTop = findChild(tutorial, "tutorialTop");

499+ var tutorialTopLoader = findChild(tutorial, "tutorialTopLoader");

498 var panel = findChild(shell, "panel");

500 var panel = findChild(shell, "panel");

499

501

500 openTutorialTop();

502 openTutorialTop();

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

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

502

504

503− tryCompare(tutorialTop, "shown", false);

505+ tryCompare(tutorialTopLoader, "shown", false);

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

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

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

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

506 }

508 }

@@ -555,15 +557,11 @@ Rectangle {

555 }

557 }

556

558

557 function test_tutorialRightFinish() {

559 function test_tutorialRightFinish() {

558− var tutorial = findChild(shell, "tutorial");

559− var tutorialRight = findChild(tutorial, "tutorialRight");

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

561−

562 openTutorialRight();

560 openTutorialRight();

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

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

564

562

565− tryCompare(tutorialRight, "shown", false);

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

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

564+ tryCompare(AccountsService, "demoEdges", false);

567 }

565 }

568

566

569 function test_tutorialRightShortDrag() {

567 function test_tutorialRightShortDrag() {

@@ -671,19 +669,22 @@ Rectangle {

671

669

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

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

673 var tutorialTopLoader = findChild(shell, "tutorialTopLoader");

671 var tutorialTopLoader = findChild(shell, "tutorialTopLoader");

672+ var tutorialLeftLongLoader = findChild(shell, "tutorialLeftLongLoader");

674 var tutorialRightLoader = findChild(shell, "tutorialRightLoader");

673 var tutorialRightLoader = findChild(shell, "tutorialRightLoader");

675 verify(!tutorialLeftLoader.active);

674 verify(!tutorialLeftLoader.active);

676 verify(!tutorialTopLoader.active);

675 verify(!tutorialTopLoader.active);

676+ verify(!tutorialLeftLongLoader.active);

677 verify(tutorialRightLoader.active);

678 compare(AccountsService.demoEdgesCompleted, []);

679

680+ var tutorialRightTimer = findInvisibleChild(tutorialRightLoader, "tutorialRightTimer");

681+ tutorialRightTimer.interval = 1;

682+

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

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

681 ApplicationManager.startApplication("camera-app");

684 ApplicationManager.startApplication("camera-app");

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

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

683 tryCompare(tutorialRightLoader.item, "isReady", true);

686 tryCompare(tutorialRightLoader.item, "isReady", true);

684

687

685− var tutorialRightTimer = findInvisibleChild(tutorialRightLoader, "tutorialRightTimer");

686− tutorialRightTimer.interval = 1;

687 tryCompare(tutorialRightLoader, "shown", true);

688 tryCompare(tutorialRightLoader, "shown", true);

688 }

689 }

689

690

@@ -692,10 +693,10 @@ Rectangle {

692

693

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

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

694 var tutorialRightTimer = findInvisibleChild(tutorialRight, "tutorialRightTimer");

695 var tutorialRightTimer = findInvisibleChild(tutorialRight, "tutorialRightTimer");

696+ tutorialRightTimer.interval = 1;

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

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

696 ApplicationManager.startApplication("camera-app");

698 ApplicationManager.startApplication("camera-app");

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

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

698− tutorialRightTimer.interval = 1;

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

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

700

701

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

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

@@ -734,6 +735,7 @@ Rectangle {

734

735

735 var notifications = findChild(shell, "notificationList");

736 var notifications = findChild(shell, "notificationList");

736 notifications.model = mockNotificationsModel;

737 notifications.model = mockNotificationsModel;

738+ addNotification(); // placeholder

737 addNotification();

739 addNotification();

738

740

739 tryCompare(tutorial, "delayed", true);

741 tryCompare(tutorial, "delayed", true);