git.iko.soy/unity8
on xenial help sign in
Add tests
commit883a380fec2887c3d8fdb67e8ce4839718a255f9 authorMichael Terry <michael.terry@canonical.com> dateThu 7 Jan 2016, 15:59 (11 years ago) parenta352498
3 files changed+31−1
compare with xenial
unifiedsplit
tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp+8−1 tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h+8 tests/qmltests/Wizard/tst_Wizard.qml+15
tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp+8−1
@@ -17,12 +17,19 @@
1717#include "MockSecurityPrivacy.h"
1818
1919MockSecurityPrivacy::MockSecurityPrivacy(QObject *parent)
20− : QObject(parent)
20+ : QObject(parent),
21+ m_type(SecurityType::Swipe)
2122{
2223}
2324
25+MockSecurityPrivacy::SecurityType MockSecurityPrivacy::getSecurityType()
26+{
27+ return m_type;
28+}
29+
2430QString MockSecurityPrivacy::setSecurity(const QString &oldPasswd, const QString &newPasswd, SecurityType newType)
2531{
32+ m_type = newType;
2633 Q_EMIT setSecurityCalled(oldPasswd, newPasswd, newType);
2734 return "";
2835}
tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h+8
@@ -23,6 +23,9 @@ class MockSecurityPrivacy : public QObject
2323{
2424 Q_OBJECT
2525 Q_ENUMS(SecurityType)
26+ Q_PROPERTY (SecurityType securityType
27+ READ getSecurityType
28+ NOTIFY securityTypeChanged)
2629
2730public:
2831 enum SecurityType {
@@ -33,10 +36,15 @@ public:
3336
3437 MockSecurityPrivacy(QObject *parent = 0);
3538
39+ SecurityType getSecurityType();
3640 Q_INVOKABLE QString setSecurity(const QString &oldPasswd, const QString &newPasswd, SecurityType newType);
3741
3842Q_SIGNALS:
43+ void securityTypeChanged();
3944 void setSecurityCalled(const QString &oldPasswd, const QString &newPasswd, SecurityType newType); // only in mock
45+
46+private:
47+ SecurityType m_type;
4048};
4149
4250#endif // MOCK_SECURITYPRIVACY_H
tests/qmltests/Wizard/tst_Wizard.qml+15
@@ -129,6 +129,7 @@ Item {
129129
130130 var pages = findChild(wizard, "wizardPages");
131131 var security = findInvisibleChild(pages, "securityPrivacy");
132+ security.setSecurity("", "", UbuntuSecurityPrivacyPanel.Swipe);
132133 setSecuritySpy.target = security;
133134
134135 setup();
@@ -315,6 +316,20 @@ Item {
315316 }
316317 }
317318
319+ function test_passwdSkipIfSet() {
320+ var page = goToPage("simPage");
321+
322+ // Set password type to non-swipe
323+ var pages = findChild(wizard, "wizardPages");
324+ var security = findInvisibleChild(pages, "securityPrivacy");
325+ security.setSecurity("", "", UbuntuSecurityPrivacyPanel.Passphrase);
326+ compare(security.securityType, UbuntuSecurityPrivacyPanel.Passphrase);
327+
328+ // Make sure that moving from sim page lands on wifi page
329+ tap(findChild(page, "forwardButton"));
330+ waitForPage("wifiPage"); // thus skipping passwdPage
331+ }
332+
318333 function test_passwdPasscode() {
319334 var page = goToPage("passwdPage");
320335