acc904a · unity8 · git.iko.soy

git.iko.soy/unity8

Fix more tests

commitacc904ace7a7c14e082577ce7884a265403a9333 authorMichael Terry <mike@mterry.name> dateTue 17 Jan 2017, 14:47 (10 years ago) parentc02eb64

2 files changed+6−16

compare with xenial

unifiedsplit

tests/qmltests/tst_Shell.qml+4−6 tests/qmltests/tst_ShellWithPin.qml+2−10

tests/qmltests/tst_Shell.qml+4−6

@@ -864,15 +864,13 @@ Rectangle {

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

865865 tryCompare(greeter, "fullyShown", true);

866866

867− var passwordInput = findChild(shell, "greeterPrompt0");

868−

869− var promptButton = findChild(passwordInput, "promptButton");

867+ var promptButton = findChild(greeter, "promptButton");

870868 tryCompare(promptButton, "visible", isButton);

871869

872− var promptField = findChild(passwordInput, "promptField");

870+ var promptField = findChild(greeter, "promptField");

873871 tryCompare(promptField, "visible", !isButton);

874872

875− mouseClick(passwordInput)

873+ mouseClick(promptButton);

876874 }

877875

878876 function confirmLoggedIn(loggedIn) {

@@ -1475,7 +1473,7 @@ Rectangle {

14751473 confirmLoggedIn(data.loggedIn)

14761474

14771475 if (data.passwordFocus) {

1478− var passwordInput = findChild(greeter, "greeterPrompt0");

1476+ var passwordInput = findChild(greeter, "promptField");

14791477 tryCompare(passwordInput, "focus", true)

14801478 }

14811479 }

tests/qmltests/tst_ShellWithPin.qml+2−10

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

117117 signalName: "resettingDevice"

118118 }

119119

120− SignalSpy {

121− id: promptSpy

122− target: LightDM.Greeter

123− signalName: "showPrompt"

124− }

125−

126120 Telephony.CallEntry {

127121 id: phoneCall

128122 phoneNumber: "+447812221111"

@@ -539,22 +533,20 @@ Item {

539533 shellLoader.itemDestroyed = false;

540534 shellLoader.active = false;

541535 tryCompare(shellLoader, "itemDestroyed", true);

542− LightDM.Greeter.authenticate(""); // reset greeter

543536

544537 // Create new shell

545− promptSpy.clear();

546538 shellLoader.active = true;

547539 tryCompareFunction(function() {return shell !== null}, true);

548540

549541 // Confirm that we start disabled

550− compare(promptSpy.count, 0);

542+ compare(LightDM.Prompts.count, 0);

551543 verify(shell.waitingOnGreeter);

552544 var coverPageDragHandle = findChild(shell, "coverPageDragHandle");

553545 verify(!coverPageDragHandle.enabled);

554546

555547 // And that we only become enabled once the lockscreen is up

556548 tryCompare(shell, "waitingOnGreeter", false);

557− verify(promptSpy.count > 0);

549+ verify(LightDM.Prompts.count > 0);

558550 var lockscreen = findChild(shell, "lockscreen");

559551 verify(lockscreen.shown);

560552 }