e4b3050 · unity8 · git.iko.soy

tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp+2−1

compare with xenial

unifiedsplit

@@ -76,7 +76,8 @@ bool Greeter::lockHint () const

76

77QString Greeter::selectUserHint() const

78{

79+ Q_D(const Greeter);

79− return "";

80+ return d->selectUserHint();

80}

81}

81

82

82bool Greeter::selectGuestHint() const

83bool Greeter::selectGuestHint() const

tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp+9

@@ -129,4 +129,13 @@ void GreeterPrivate::handleRespond_full(const QString &response)

129 q->sendAuthenticationComplete();

130}

131

132+QString GreeterPrivate::selectUserHint() const

133+{

134+ if (mockMode == "full") {

135+ return "info-prompt";

136+ } else {

137+ return "";

138+ }

139+}

140+

132}

141}

tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h+1

@@ -39,6 +39,7 @@ public:

39

40 void handleAuthenticate();

41 void handleRespond(const QString &response);

42+ QString selectUserHint() const;

42

43

43protected:

44protected:

44 Greeter * const q_ptr;

45 Greeter * const q_ptr;

tests/qmltests/Greeter/TestView.qml+2

@@ -33,6 +33,7 @@ Item {

33 property var infographicModel

34 readonly property bool fullyShown: _fullyShown

35 readonly property bool required: _required

36+ readonly property bool animating: false

36

37

37 property bool _fullyShown: true

38 property bool _fullyShown: true

38 property bool _required: true

39 property bool _required: true

@@ -41,6 +42,7 @@ Item {

41 signal responded(string response)

42 signal responded(string response)

42 signal tease()

43 signal tease()

43 signal emergencyCall()

44 signal emergencyCall()

45+ signal promptlessLogin()

44

46

45 signal _showMessageCalled(string html)

47 signal _showMessageCalled(string html)

46 signal _showPromptCalled(string text, bool isSecret, bool isDefaultPrompt)

48 signal _showPromptCalled(string text, bool isSecret, bool isDefaultPrompt)

tests/qmltests/Greeter/tst_Greeter.qml+7−1

@@ -153,7 +153,6 @@ Item {

153 viewTryToUnlockSpy.clear();

154 tryCompare(greeter, "waiting", false);

155 view = findChild(greeter, "testView");

156− verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

157 greeter.failedLoginsDelayAttempts = 7;

156 greeter.failedLoginsDelayAttempts = 7;

158 greeter.failedLoginsDelayMinutes = 5;

157 greeter.failedLoginsDelayMinutes = 5;

159 }

158 }

@@ -191,6 +190,7 @@ Item {

191 compare(view.currentIndex, i);

190 compare(view.currentIndex, i);

192 compare(AccountsService.user, name);

191 compare(AccountsService.user, name);

193 compare(LightDM.Greeter.authenticationUser, name);

192 compare(LightDM.Greeter.authenticationUser, name);

193+ return i;

194 }

195

196 function verifyLoggedIn() {

@@ -553,5 +553,11 @@ Item {

553 compare(viewResetSpy.count, 1);

554 tryCompare(viewShowPromptSpy, "count", 1);

555 }

556+

557+ function test_selectUserHint() {

558+ // "full" mock sets selectUser == "info-prompt"

559+ var i = verifySelected("info-prompt");

560+ verify(i != 0); // just make sure that info-prompt isn't default 0 answer

561+ }

556 }

562 }

557}

563}