git.iko.soy/unity8
on xenial help sign in
use result, not result.uid
commit41fcfe7ecdc73b299ef66355e3f3b5363f410f51 authorMichael Terry <michael.terry@canonical.com> dateTue 7 Jun 2016, 11:50 (10 years ago) parenta3d02ab
3 files changed+3−25
compare with xenial
unifiedsplit
qml/Greeter/Greeter.qml+2−2 tests/mocks/Biometryd/CMakeLists.txt−4 tests/mocks/Biometryd/MockOperation.cpp+1−19
qml/Greeter/Greeter.qml+2−2
@@ -521,11 +521,11 @@ Showable {
521521 onIdEnabledChanged: restartOperation()
522522
523523 onSucceeded: {
524− if (result.uid !== lightDM.users.data(d.currentIndex, lightDM.userRoles.UidRole)) {
524+ if (result !== lightDM.users.data(d.currentIndex, lightDM.userRoles.UidRole)) {
525525 failOperation("not the selected user");
526526 return;
527527 }
528− console.log("Identified user by fingerprint:", result.uid);
528+ console.log("Identified user by fingerprint:", result);
529529 d.fingerprintFailureCount = 0;
530530 if (loader.item)
531531 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−
51set(MOCK_BIOMETRYD_SOURCES
62 plugin.cpp
73 MockBiometryd.cpp
tests/mocks/Biometryd/MockOperation.cpp+1−19
@@ -19,22 +19,6 @@
1919
2020#include "MockOperation.h"
2121
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−
3822MockOperation::MockOperation(QObject *parent)
3923 : QObject(parent)
4024 , m_observer(nullptr)
@@ -61,7 +45,7 @@ void MockOperation::mockSuccess(unsigned int uid)
6145{
6246 if (m_observer)
6347 QMetaObject::invokeMethod(m_observer, "succeeded", Qt::DirectConnection,
64− Q_ARG(QVariant, QVariant::fromValue(new Result(uid, this))));
48+ Q_ARG(QVariant, QVariant::fromValue(uid)));
6549}
6650
6751void MockOperation::mockFailure(const QString &reason)
@@ -70,5 +54,3 @@ void MockOperation::mockFailure(const QString &reason)
7054 QMetaObject::invokeMethod(m_observer, "failed", Qt::DirectConnection,
7155 Q_ARG(QString, reason));
7256}
73−
74−#include "MockOperation.moc"