git.iko.soy/unity8
on xenial help sign in
Add test, clean up TestView
commite4b3050ec2ef324b04f9c4b6d7056cfee910fcbb authorMichael Terry <michael.terry@canonical.com> dateWed 8 Jun 2016, 16:04 (10 years ago) parente2c4923
5 files changed+21−2
compare with xenial
unifiedsplit
tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp+2−1 tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp+9 tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h+1 tests/qmltests/Greeter/TestView.qml+2 tests/qmltests/Greeter/tst_Greeter.qml+7−1
tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp+2−1
@@ -76,7 +76,8 @@ bool Greeter::lockHint () const
7676
7777QString Greeter::selectUserHint() const
7878{
79− return "";
79+ Q_D(const Greeter);
80+ return d->selectUserHint();
8081}
8182
8283bool Greeter::selectGuestHint() const
tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpp+9
@@ -129,4 +129,13 @@ void GreeterPrivate::handleRespond_full(const QString &response)
129129 q->sendAuthenticationComplete();
130130}
131131
132+QString GreeterPrivate::selectUserHint() const
133+{
134+ if (mockMode == "full") {
135+ return "info-prompt";
136+ } else {
137+ return "";
138+ }
139+}
140+
132141}
tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h+1
@@ -39,6 +39,7 @@ public:
3939
4040 void handleAuthenticate();
4141 void handleRespond(const QString &response);
42+ QString selectUserHint() const;
4243
4344protected:
4445 Greeter * const q_ptr;
tests/qmltests/Greeter/TestView.qml+2
@@ -33,6 +33,7 @@ Item {
3333 property var infographicModel
3434 readonly property bool fullyShown: _fullyShown
3535 readonly property bool required: _required
36+ readonly property bool animating: false
3637
3738 property bool _fullyShown: true
3839 property bool _required: true
@@ -41,6 +42,7 @@ Item {
4142 signal responded(string response)
4243 signal tease()
4344 signal emergencyCall()
45+ signal promptlessLogin()
4446
4547 signal _showMessageCalled(string html)
4648 signal _showPromptCalled(string text, bool isSecret, bool isDefaultPrompt)
tests/qmltests/Greeter/tst_Greeter.qml+7−1
@@ -153,7 +153,6 @@ Item {
153153 viewTryToUnlockSpy.clear();
154154 tryCompare(greeter, "waiting", false);
155155 view = findChild(greeter, "testView");
156− verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
157156 greeter.failedLoginsDelayAttempts = 7;
158157 greeter.failedLoginsDelayMinutes = 5;
159158 }
@@ -191,6 +190,7 @@ Item {
191190 compare(view.currentIndex, i);
192191 compare(AccountsService.user, name);
193192 compare(LightDM.Greeter.authenticationUser, name);
193+ return i;
194194 }
195195
196196 function verifyLoggedIn() {
@@ -553,5 +553,11 @@ Item {
553553 compare(viewResetSpy.count, 1);
554554 tryCompare(viewShowPromptSpy, "count", 1);
555555 }
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+ }
556562 }
557563}