git.iko.soy/unity8
on xenial help sign in
Fix tests
commit11358e01fbd124e77f704aa4b084bf381763888d authorMichael Terry <michael.terry@canonical.com> dateMon 18 Aug 2014, 15:49 (12 years ago) parent5d365e3
3 files changed+21−8
compare with xenial
unifiedsplit
tests/mocks/AccountsService/AccountsService.cpp+8−1 tests/mocks/AccountsService/AccountsService.h+3 tests/qmltests/tst_ShellWithPin.qml+10−7
tests/mocks/AccountsService/AccountsService.cpp+8−1
@@ -22,6 +22,7 @@
2222
2323AccountsService::AccountsService(QObject* parent)
2424 : QObject(parent),
25+ m_interactiveWhileLocked(true),
2526 m_backgroundFile(qmlDirectory() + "graphics/phone_background.jpg"),
2627 m_statsWelcomeScreen(true),
2728 m_failedLogins(0)
@@ -52,7 +53,13 @@ void AccountsService::setDemoEdges(bool demoEdges)
5253
5354bool AccountsService::interactiveWhileLocked() const
5455{
55− return true;
56+ return m_interactiveWhileLocked;
57+}
58+
59+void AccountsService::setInteractiveWhileLocked(bool interactiveWhileLocked)
60+{
61+ m_interactiveWhileLocked = interactiveWhileLocked;
62+ Q_EMIT interactiveWhileLockedChanged();
5663}
5764
5865QString AccountsService::backgroundFile() const
tests/mocks/AccountsService/AccountsService.h+3
@@ -38,6 +38,7 @@ class AccountsService: public QObject
3838 NOTIFY demoEdgesChanged)
3939 Q_PROPERTY (bool interactiveWhileLocked
4040 READ interactiveWhileLocked
41+ WRITE setInteractiveWhileLocked // only available in mock
4142 NOTIFY interactiveWhileLockedChanged)
4243 Q_PROPERTY (QString backgroundFile
4344 READ backgroundFile
@@ -68,6 +69,7 @@ public:
6869 bool demoEdges() const;
6970 void setDemoEdges(bool demoEdges);
7071 bool interactiveWhileLocked() const;
72+ void setInteractiveWhileLocked(bool interactiveWhileLocked);
7173 QString backgroundFile() const;
7274 void setBackgroundFile(const QString &backgroundFile);
7375 bool statsWelcomeScreen() const;
@@ -86,6 +88,7 @@ Q_SIGNALS:
8688 void failedLoginsChanged();
8789
8890private:
91+ bool m_interactiveWhileLocked;
8992 QString m_backgroundFile;
9093 QString m_user;
9194 bool m_statsWelcomeScreen;
tests/qmltests/tst_ShellWithPin.qml+10−7
@@ -75,6 +75,7 @@ Item {
7575 swipeAwayGreeter()
7676 shell.failedLoginsDelayAttempts = -1
7777 shell.maxFailedLogins = -1
78+ AccountsService.interactiveWhileLocked = true
7879 }
7980
8081 function cleanup() {
@@ -130,9 +131,12 @@ Item {
130131
131132 function test_disabledEdges() {
132133 var launcher = findChild(shell, "launcher")
133− tryCompare(launcher, "available", false)
134−
135134 var indicators = findChild(shell, "indicators")
135+ tryCompare(launcher, "available", true)
136+ tryCompare(indicators, "available", true)
137+
138+ AccountsService.interactiveWhileLocked = false
139+ tryCompare(launcher, "available", false)
136140 tryCompare(indicators, "available", false)
137141 }
138142
@@ -150,12 +154,9 @@ Item {
150154 tryCompare(greeter, "fakeActiveForApp", "dialer-app")
151155 tryCompare(lockscreen, "shown", false)
152156 tryCompare(panel, "fullscreenMode", true)
153− tryCompare(stage, "spreadEnabled", false)
154−
155− // These are normally false anyway, but confirm they remain so in
156− // emergency mode.
157− tryCompare(launcher, "available", false)
158157 tryCompare(indicators, "available", false)
158+ tryCompare(launcher, "available", false)
159+ tryCompare(stage, "spreadEnabled", false)
159160
160161 // Cancel emergency mode, and go back to normal
161162 waitForRendering(greeter)
@@ -165,6 +166,8 @@ Item {
165166 tryCompare(greeter, "fakeActiveForApp", "")
166167 tryCompare(lockscreen, "shown", true)
167168 tryCompare(panel, "fullscreenMode", false)
169+ tryCompare(indicators, "available", true)
170+ tryCompare(launcher, "available", true)
168171 tryCompare(stage, "spreadEnabled", true)
169172 }
170173