b943231 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix manual test buttons to work again

b943231Michael Terry10 years ago

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

compare with xenial

unifiedsplit

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

21AccountsService::AccountsService(QObject* parent)

22 : QObject(parent),

23− m_enableFingerprintIdentification(false),

23+ m_enableFingerprintIdentification(true),

24 m_enableLauncherWhileLocked(true),

25 m_enableIndicatorsWhileLocked(true),

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

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

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

20MockBiometryd::MockBiometryd(QObject *parent)

21 : QObject(parent)

22 , m_device(new MockDevice(this))

23− , m_available(false)

23+ , m_available(true)

24{

25}

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

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

150 teaseSpy.clear();

151 sessionStartedSpy.clear();

152 activeChangedSpy.clear();

153− Biometryd.available = false;

153+ Biometryd.available = true;

154− AccountsService.enableFingerprintIdentification = false;

154+ AccountsService.enableFingerprintIdentification = true;

155 viewShowMessageSpy.clear();

156 viewShowPromptSpy.clear();

157 viewShowLastChanceSpy.clear();

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

565 }

566

567 function test_fingerprintSuccess() {

568− Biometryd.available = true;

569− AccountsService.enableFingerprintIdentification = true;

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

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

571

569

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

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

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

578 }

576 }

579

577

580 function test_fingerprintFailureMessage() {

578 function test_fingerprintFailureMessage() {

581− Biometryd.available = true;

582− AccountsService.enableFingerprintIdentification = true;

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

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

584

580

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

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

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

592 }

588 }

593

589

594 function test_fingerprintTooManyFailures() {

590 function test_fingerprintTooManyFailures() {

595− Biometryd.available = true;

596− AccountsService.enableFingerprintIdentification = true;

597 selectUser("has-password");

591 selectUser("has-password");

598

592

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

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

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

608 }

602 }

609

603

610 function test_fingerprintFailureCountReset() {

604 function test_fingerprintFailureCountReset() {

611− Biometryd.available = true;

612− AccountsService.enableFingerprintIdentification = true;

613 selectUser("has-password");

605 selectUser("has-password");

614

606

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

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

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

629 }

621 }

630

622

631 function test_fingerprintWrongUid() {

623 function test_fingerprintWrongUid() {

632− Biometryd.available = true;

633− AccountsService.enableFingerprintIdentification = true;

634 selectUser("has-password");

624 selectUser("has-password");

635

625

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

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

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

642 }

632 }

643

633

644 function test_fingerprintNotEnabled() {

634 function test_fingerprintNotEnabled() {

645− Biometryd.available = true;

635+ AccountsService.enableFingerprintIdentification = false;

646 selectUser("has-password");

636 selectUser("has-password");

647

637

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

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

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

657 }

647 }

658

648

659 function test_fingerprintReaderNotPresent() {

649 function test_fingerprintReaderNotPresent() {

660− AccountsService.enableFingerprintIdentification = true;

650+ Biometryd.available = false;

661 selectUser("has-password");

651 selectUser("has-password");

662

652

663 verify(!Biometryd.available);

653 verify(!Biometryd.available);

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

674 }

664 }

675

665

676 function test_fingerprintGreeterNotActive() {

666 function test_fingerprintGreeterNotActive() {

677− Biometryd.available = true;

678− AccountsService.enableFingerprintIdentification = true;

679 selectUser("has-password");

667 selectUser("has-password");

680

668

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

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

tests/qmltests/tst_Shell.qml+9−2

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

340 text: "Success"

341 onClicked: {

342 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);

344 }

351 }

345 }

352 }

346

353

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

348 text: "Failure"

355 text: "Failure"

349 onClicked: {

356 onClicked: {

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

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

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

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

352 }

359 }

353 }

360 }

354 }

361 }