41fcfe7 · unity8 · git.iko.soy

qml/Greeter/Greeter.qml+2−2

compare with xenial

unifiedsplit

@@ -521,11 +521,11 @@ Showable {

521 onIdEnabledChanged: restartOperation()

522

523 onSucceeded: {

524− if (result.uid !== lightDM.users.data(d.currentIndex, lightDM.userRoles.UidRole)) {

524+ if (result !== lightDM.users.data(d.currentIndex, lightDM.userRoles.UidRole)) {

525 failOperation("not the selected user");

526 return;

527 }

528− console.log("Identified user by fingerprint:", result.uid);

528+ console.log("Identified user by fingerprint:", result);

529 d.fingerprintFailureCount = 0;

530 if (loader.item)

531 loader.item.notifyAuthenticationSucceeded(true /* showFakePassword */);

tests/mocks/Biometryd/CMakeLists.txt−4

@@ -1,7 +1,3 @@

1−include_directories(

2− ${CMAKE_CURRENT_BINARY_DIR}

3−)

4−

5set(MOCK_BIOMETRYD_SOURCES

1set(MOCK_BIOMETRYD_SOURCES

6 plugin.cpp

2 plugin.cpp

7 MockBiometryd.cpp

3 MockBiometryd.cpp

tests/mocks/Biometryd/MockOperation.cpp+1−19

@@ -19,22 +19,6 @@

19

20#include "MockOperation.h"

21

22−class Result : public QObject

23−{

24− Q_OBJECT

25− Q_PROPERTY(unsigned int uid READ uid CONSTANT)

26−

27−public:

28− explicit Result(unsigned int uid, QObject *parent = 0)

29− : QObject(parent), m_uid(uid)

30− {}

31−

32− unsigned int uid() const { return m_uid; }

33−

34−private:

35− unsigned int m_uid;

36−};

37−

38MockOperation::MockOperation(QObject *parent)

22MockOperation::MockOperation(QObject *parent)

39 : QObject(parent)

23 : QObject(parent)

40 , m_observer(nullptr)

24 , m_observer(nullptr)

@@ -61,7 +45,7 @@ void MockOperation::mockSuccess(unsigned int uid)

61{

45{

62 if (m_observer)

46 if (m_observer)

63 QMetaObject::invokeMethod(m_observer, "succeeded", Qt::DirectConnection,

47 QMetaObject::invokeMethod(m_observer, "succeeded", Qt::DirectConnection,

64− Q_ARG(QVariant, QVariant::fromValue(new Result(uid, this))));

48+ Q_ARG(QVariant, QVariant::fromValue(uid)));

65}

49}

66

50

67void MockOperation::mockFailure(const QString &reason)

51void MockOperation::mockFailure(const QString &reason)

@@ -70,5 +54,3 @@ void MockOperation::mockFailure(const QString &reason)

70 QMetaObject::invokeMethod(m_observer, "failed", Qt::DirectConnection,

54 QMetaObject::invokeMethod(m_observer, "failed", Qt::DirectConnection,

71 Q_ARG(QString, reason));

55 Q_ARG(QString, reason));

72}

56}

73−

74−#include "MockOperation.moc"