a3d02ab · unity8 · git.iko.soy

git.iko.soy/unity8

s/valid/available

commita3d02ab99fe00546e4a57d3b0b2685f875891562 authorMichael Terry <michael.terry@canonical.com> dateTue 31 May 2016, 16:36 (10 years ago) parentec51140

4 files changed+27−27

compare with xenial

unifiedsplit

qml/Greeter/Greeter.qml+1−1 tests/mocks/Biometryd/MockBiometryd.cpp+7−7 tests/mocks/Biometryd/MockBiometryd.h+8−8 tests/qmltests/Greeter/tst_Greeter.qml+11−11

qml/Greeter/Greeter.qml+1−1

@@ -488,7 +488,7 @@ Showable {

488488

489489 property var operation: null

490490 readonly property bool idEnabled: root.active &&

491− Biometryd.valid &&

491+ Biometryd.available &&

492492 AccountsService.enableFingerprintIdentification

493493

494494 function cancelOperation() {

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

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

2020MockBiometryd::MockBiometryd(QObject *parent)

2121 : QObject(parent)

2222 , m_device(new MockDevice(this))

23− , m_valid(false)

23+ , m_available(false)

2424{

2525}

2626

@@ -29,15 +29,15 @@ MockDevice *MockBiometryd::defaultDevice() const

2929 return m_device;

3030}

3131

32−bool MockBiometryd::valid() const

32+bool MockBiometryd::available() const

3333{

34− return m_valid;

34+ return m_available;

3535}

3636

37−void MockBiometryd::setValid(bool valid)

37+void MockBiometryd::setAvailable(bool available)

3838{

39− if (m_valid != valid) {

40− m_valid = valid;

41− Q_EMIT validChanged();

39+ if (m_available != available) {

40+ m_available = available;

41+ Q_EMIT availableChanged();

4242 }

4343}

tests/mocks/Biometryd/MockBiometryd.h+8−8

@@ -26,25 +26,25 @@ class MockBiometryd : public QObject

2626 Q_OBJECT

2727 Q_DISABLE_COPY(MockBiometryd)

2828 Q_PROPERTY(MockDevice *defaultDevice READ defaultDevice CONSTANT)

29− Q_PROPERTY(bool valid

30− READ valid

31− WRITE setValid // only in mock

32− NOTIFY validChanged)

29+ Q_PROPERTY(bool available

30+ READ available

31+ WRITE setAvailable // only in mock

32+ NOTIFY availableChanged)

3333

3434public:

3535 explicit MockBiometryd(QObject *parent = 0);

3636

3737 MockDevice *defaultDevice() const;

3838

39− bool valid() const;

40− void setValid(bool valid);

39+ bool available() const;

40+ void setAvailable(bool available);

4141

4242Q_SIGNALS:

43− void validChanged();

43+ void availableChanged();

4444

4545private:

4646 MockDevice *m_device;

47− bool m_valid;

47+ bool m_available;

4848};

4949

5050#endif // MOCK_BIOMETRYD_H

tests/qmltests/Greeter/tst_Greeter.qml+11−11

@@ -150,7 +150,7 @@ Item {

150150 teaseSpy.clear();

151151 sessionStartedSpy.clear();

152152 activeChangedSpy.clear();

153− Biometryd.valid = false;

153+ Biometryd.available = false;

154154 AccountsService.enableFingerprintIdentification = false;

155155 viewShowMessageSpy.clear();

156156 viewShowPromptSpy.clear();

@@ -565,7 +565,7 @@ Item {

565565 }

566566

567567 function test_fingerprintSuccess() {

568− Biometryd.valid = true;

568+ Biometryd.available = true;

569569 AccountsService.enableFingerprintIdentification = true;

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

571571

@@ -578,7 +578,7 @@ Item {

578578 }

579579

580580 function test_fingerprintFailureMessage() {

581− Biometryd.valid = true;

581+ Biometryd.available = true;

582582 AccountsService.enableFingerprintIdentification = true;

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

584584

@@ -592,7 +592,7 @@ Item {

592592 }

593593

594594 function test_fingerprintTooManyFailures() {

595− Biometryd.valid = true;

595+ Biometryd.available = true;

596596 AccountsService.enableFingerprintIdentification = true;

597597 selectUser("has-password");

598598

@@ -608,7 +608,7 @@ Item {

608608 }

609609

610610 function test_fingerprintFailureCountReset() {

611− Biometryd.valid = true;

611+ Biometryd.available = true;

612612 AccountsService.enableFingerprintIdentification = true;

613613 selectUser("has-password");

614614

@@ -629,7 +629,7 @@ Item {

629629 }

630630

631631 function test_fingerprintWrongUid() {

632− Biometryd.valid = true;

632+ Biometryd.available = true;

633633 AccountsService.enableFingerprintIdentification = true;

634634 selectUser("has-password");

635635

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

642642 }

643643

644644 function test_fingerprintNotEnabled() {

645− Biometryd.valid = true;

645+ Biometryd.available = true;

646646 selectUser("has-password");

647647

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

@@ -660,21 +660,21 @@ Item {

660660 AccountsService.enableFingerprintIdentification = true;

661661 selectUser("has-password");

662662

663− verify(!Biometryd.valid);

663+ verify(!Biometryd.available);

664664

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

666666 verify(!biometryd.operation);

667667

668− Biometryd.valid = true;

668+ Biometryd.available = true;

669669 verify(biometryd.operation);

670670 verify(biometryd.operation.running);

671671

672− Biometryd.valid = false;

672+ Biometryd.available = false;

673673 verify(!biometryd.operation);

674674 }

675675

676676 function test_fingerprintGreeterNotActive() {

677− Biometryd.valid = true;

677+ Biometryd.available = true;

678678 AccountsService.enableFingerprintIdentification = true;

679679 selectUser("has-password");

680680