b943231 · unity8 · git.iko.soy

git.iko.soy/unity8

Fix manual test buttons to work again

commitb943231e6c52923e91ed736bcb5ddc976a668d34 authorMichael Terry <michael.terry@canonical.com> dateThu 16 Jun 2016, 15:22 (10 years ago) parentafbee3e

4 files changed+15−20

compare with xenial

unifiedsplit

tests/mocks/AccountsService/AccountsService.cpp+1−1 tests/mocks/Biometryd/MockBiometryd.cpp+1−1 tests/qmltests/Greeter/tst_Greeter.qml+4−16 tests/qmltests/tst_Shell.qml+9−2

tests/mocks/AccountsService/AccountsService.cpp+1−1

@@ -20,7 +20,7 @@

2020

2121AccountsService::AccountsService(QObject* parent)

2222 : QObject(parent),

23− m_enableFingerprintIdentification(false),

23+ m_enableFingerprintIdentification(true),

2424 m_enableLauncherWhileLocked(true),

2525 m_enableIndicatorsWhileLocked(true),

2626 m_backgroundFile(qmlDirectory() + "/graphics/phone_background.jpg"),

tests/mocks/Biometryd/MockBiometryd.cpp+1−1

@@ -20,7 +20,7 @@

2020MockBiometryd::MockBiometryd(QObject *parent)

2121 : QObject(parent)

2222 , m_device(new MockDevice(this))

23− , m_available(false)

23+ , m_available(true)

2424{

2525}

2626

tests/qmltests/Greeter/tst_Greeter.qml+4−16

@@ -150,8 +150,8 @@ Item {

150150 teaseSpy.clear();

151151 sessionStartedSpy.clear();

152152 activeChangedSpy.clear();

153− Biometryd.available = false;

154− AccountsService.enableFingerprintIdentification = false;

153+ Biometryd.available = true;

154+ AccountsService.enableFingerprintIdentification = true;

155155 viewShowMessageSpy.clear();

156156 viewShowPromptSpy.clear();

157157 viewShowLastChanceSpy.clear();

@@ -565,8 +565,6 @@ Item {

565565 }

566566

567567 function test_fingerprintSuccess() {

568− Biometryd.available = true;

569− AccountsService.enableFingerprintIdentification = true;

570568 var index = selectUser("has-password");

571569

572570 var biometryd = findInvisibleChild(greeter, "biometryd");

@@ -578,8 +576,6 @@ Item {

578576 }

579577

580578 function test_fingerprintFailureMessage() {

581− Biometryd.available = true;

582− AccountsService.enableFingerprintIdentification = true;

583579 var index = selectUser("has-password");

584580

585581 var biometryd = findInvisibleChild(greeter, "biometryd");

@@ -592,8 +588,6 @@ Item {

592588 }

593589

594590 function test_fingerprintTooManyFailures() {

595− Biometryd.available = true;

596− AccountsService.enableFingerprintIdentification = true;

597591 selectUser("has-password");

598592

599593 var biometryd = findInvisibleChild(greeter, "biometryd");

@@ -608,8 +602,6 @@ Item {

608602 }

609603

610604 function test_fingerprintFailureCountReset() {

611− Biometryd.available = true;

612− AccountsService.enableFingerprintIdentification = true;

613605 selectUser("has-password");

614606

615607 var biometryd = findInvisibleChild(greeter, "biometryd");

@@ -629,8 +621,6 @@ Item {

629621 }

630622

631623 function test_fingerprintWrongUid() {

632− Biometryd.available = true;

633− AccountsService.enableFingerprintIdentification = true;

634624 selectUser("has-password");

635625

636626 var biometryd = findInvisibleChild(greeter, "biometryd");

@@ -642,7 +632,7 @@ Item {

642632 }

643633

644634 function test_fingerprintNotEnabled() {

645− Biometryd.available = true;

635+ AccountsService.enableFingerprintIdentification = false;

646636 selectUser("has-password");

647637

648638 var biometryd = findInvisibleChild(greeter, "biometryd");

@@ -657,7 +647,7 @@ Item {

657647 }

658648

659649 function test_fingerprintReaderNotPresent() {

660− AccountsService.enableFingerprintIdentification = true;

650+ Biometryd.available = false;

661651 selectUser("has-password");

662652

663653 verify(!Biometryd.available);

@@ -674,8 +664,6 @@ Item {

674664 }

675665

676666 function test_fingerprintGreeterNotActive() {

677− Biometryd.available = true;

678− AccountsService.enableFingerprintIdentification = true;

679667 selectUser("has-password");

680668

681669 var biometryd = findInvisibleChild(greeter, "biometryd");

tests/qmltests/tst_Shell.qml+9−2

@@ -340,7 +340,14 @@ Rectangle {

340340 text: "Success"

341341 onClicked: {

342342 var biometryd = testCase.findInvisibleChild(shellContainer, "biometryd");

343− biometryd.mockIdentification(0, "");

343+ var uid = 0;

344+ for (var i = 0; i < LightDM.Users.count; i++) {

345+ if (LightDM.Users.data(i, LightDM.UserRoles.NameRole) == AccountsService.user) {

346+ uid = LightDM.Users.data(i, LightDM.UserRoles.UidRole);

347+ break;

348+ }

349+ }

350+ biometryd.operation.mockSuccess(uid);

344351 }

345352 }

346353

@@ -348,7 +355,7 @@ Rectangle {

348355 text: "Failure"

349356 onClicked: {

350357 var biometryd = testCase.findInvisibleChild(shellContainer, "biometryd");

351− biometryd.mockIdentification(0, "error");

358+ biometryd.operation.mockFailure("error");

352359 }

353360 }

354361 }