acc904a · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix more tests

acc904aMichael Terry10 years ago

tests/qmltests/tst_Shell.qml+4−6

compare with xenial

unifiedsplit

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

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

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

866

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

868−

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

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

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

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

871

869

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

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

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

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

874

872

875− mouseClick(passwordInput)

873+ mouseClick(promptButton);

876 }

874 }

877

875

878 function confirmLoggedIn(loggedIn) {

876 function confirmLoggedIn(loggedIn) {

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

1475 confirmLoggedIn(data.loggedIn)

1473 confirmLoggedIn(data.loggedIn)

1476

1474

1477 if (data.passwordFocus) {

1475 if (data.passwordFocus) {

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

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

1479 tryCompare(passwordInput, "focus", true)

1477 tryCompare(passwordInput, "focus", true)

1480 }

1478 }

1481 }

1479 }

tests/qmltests/tst_ShellWithPin.qml+2−10

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

117 signalName: "resettingDevice"

118 }

119

120− SignalSpy {

121− id: promptSpy

122− target: LightDM.Greeter

123− signalName: "showPrompt"

124− }

125−

126 Telephony.CallEntry {

120 Telephony.CallEntry {

127 id: phoneCall

121 id: phoneCall

128 phoneNumber: "+447812221111"

122 phoneNumber: "+447812221111"

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

539 shellLoader.itemDestroyed = false;

533 shellLoader.itemDestroyed = false;

540 shellLoader.active = false;

534 shellLoader.active = false;

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

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

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

543

536

544 // Create new shell

537 // Create new shell

545− promptSpy.clear();

546 shellLoader.active = true;

538 shellLoader.active = true;

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

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

548

540

549 // Confirm that we start disabled

541 // Confirm that we start disabled

550− compare(promptSpy.count, 0);

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

551 verify(shell.waitingOnGreeter);

543 verify(shell.waitingOnGreeter);

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

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

553 verify(!coverPageDragHandle.enabled);

545 verify(!coverPageDragHandle.enabled);

554

546

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

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

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

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

557− verify(promptSpy.count > 0);

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

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

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

559 verify(lockscreen.shown);

551 verify(lockscreen.shown);

560 }

552 }