git.iko.soy/unity8
on xenial help sign in
Fix tests
11358e0Michael Terry
tests/mocks/AccountsService/AccountsService.cpp+8−1
compare with xenial
unifiedsplit
@@ -22,6 +22,7 @@
22
22
23AccountsService::AccountsService(QObject* parent)
23AccountsService::AccountsService(QObject* parent)
24 : QObject(parent),
24 : QObject(parent),
25+ m_interactiveWhileLocked(true),
25 m_backgroundFile(qmlDirectory() + "graphics/phone_background.jpg"),
26 m_backgroundFile(qmlDirectory() + "graphics/phone_background.jpg"),
26 m_statsWelcomeScreen(true),
27 m_statsWelcomeScreen(true),
27 m_failedLogins(0)
28 m_failedLogins(0)
@@ -52,7 +53,13 @@ void AccountsService::setDemoEdges(bool demoEdges)
52
53
53bool AccountsService::interactiveWhileLocked() const
54bool AccountsService::interactiveWhileLocked() const
54{
55{
55− return true;
56+ return m_interactiveWhileLocked;
57+}
58+
59+void AccountsService::setInteractiveWhileLocked(bool interactiveWhileLocked)
60+{
61+ m_interactiveWhileLocked = interactiveWhileLocked;
62+ Q_EMIT interactiveWhileLockedChanged();
56}
63}
57
64
58QString AccountsService::backgroundFile() const
65QString AccountsService::backgroundFile() const
tests/mocks/AccountsService/AccountsService.h+3
@@ -38,6 +38,7 @@ class AccountsService: public QObject
38 NOTIFY demoEdgesChanged)
38 NOTIFY demoEdgesChanged)
39 Q_PROPERTY (bool interactiveWhileLocked
39 Q_PROPERTY (bool interactiveWhileLocked
40 READ interactiveWhileLocked
40 READ interactiveWhileLocked
41+ WRITE setInteractiveWhileLocked // only available in mock
41 NOTIFY interactiveWhileLockedChanged)
42 NOTIFY interactiveWhileLockedChanged)
42 Q_PROPERTY (QString backgroundFile
43 Q_PROPERTY (QString backgroundFile
43 READ backgroundFile
44 READ backgroundFile
@@ -68,6 +69,7 @@ public:
68 bool demoEdges() const;
69 bool demoEdges() const;
69 void setDemoEdges(bool demoEdges);
70 void setDemoEdges(bool demoEdges);
70 bool interactiveWhileLocked() const;
71 bool interactiveWhileLocked() const;
72+ void setInteractiveWhileLocked(bool interactiveWhileLocked);
71 QString backgroundFile() const;
73 QString backgroundFile() const;
72 void setBackgroundFile(const QString &backgroundFile);
74 void setBackgroundFile(const QString &backgroundFile);
73 bool statsWelcomeScreen() const;
75 bool statsWelcomeScreen() const;
@@ -86,6 +88,7 @@ Q_SIGNALS:
86 void failedLoginsChanged();
88 void failedLoginsChanged();
87
89
88private:
90private:
91+ bool m_interactiveWhileLocked;
89 QString m_backgroundFile;
92 QString m_backgroundFile;
90 QString m_user;
93 QString m_user;
91 bool m_statsWelcomeScreen;
94 bool m_statsWelcomeScreen;
tests/qmltests/tst_ShellWithPin.qml+10−7
@@ -75,6 +75,7 @@ Item {
75 swipeAwayGreeter()
75 swipeAwayGreeter()
76 shell.failedLoginsDelayAttempts = -1
76 shell.failedLoginsDelayAttempts = -1
77 shell.maxFailedLogins = -1
77 shell.maxFailedLogins = -1
78+ AccountsService.interactiveWhileLocked = true
78 }
79 }
79
80
80 function cleanup() {
81 function cleanup() {
@@ -130,9 +131,12 @@ Item {
130
131
131 function test_disabledEdges() {
132 function test_disabledEdges() {
132 var launcher = findChild(shell, "launcher")
133 var launcher = findChild(shell, "launcher")
133− tryCompare(launcher, "available", false)
134−
135 var indicators = findChild(shell, "indicators")
134 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)
136 tryCompare(indicators, "available", false)
140 tryCompare(indicators, "available", false)
137 }
141 }
138
142
@@ -150,12 +154,9 @@ Item {
150 tryCompare(greeter, "fakeActiveForApp", "dialer-app")
154 tryCompare(greeter, "fakeActiveForApp", "dialer-app")
151 tryCompare(lockscreen, "shown", false)
155 tryCompare(lockscreen, "shown", false)
152 tryCompare(panel, "fullscreenMode", true)
156 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)
158 tryCompare(indicators, "available", false)
157 tryCompare(indicators, "available", false)
158+ tryCompare(launcher, "available", false)
159+ tryCompare(stage, "spreadEnabled", false)
159
160
160 // Cancel emergency mode, and go back to normal
161 // Cancel emergency mode, and go back to normal
161 waitForRendering(greeter)
162 waitForRendering(greeter)
@@ -165,6 +166,8 @@ Item {
165 tryCompare(greeter, "fakeActiveForApp", "")
166 tryCompare(greeter, "fakeActiveForApp", "")
166 tryCompare(lockscreen, "shown", true)
167 tryCompare(lockscreen, "shown", true)
167 tryCompare(panel, "fullscreenMode", false)
168 tryCompare(panel, "fullscreenMode", false)
169+ tryCompare(indicators, "available", true)
170+ tryCompare(launcher, "available", true)
168 tryCompare(stage, "spreadEnabled", true)
171 tryCompare(stage, "spreadEnabled", true)
169 }
172 }
170
173