883a380 · unity8 · git.iko.soy

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.cpp+8−1

compare with xenial

unifiedsplit

@@ -17,12 +17,19 @@

17#include "MockSecurityPrivacy.h"

18

19MockSecurityPrivacy::MockSecurityPrivacy(QObject *parent)

20− : QObject(parent)

20+ : QObject(parent),

21+ m_type(SecurityType::Swipe)

21{

22{

22}

23}

23

24

25+MockSecurityPrivacy::SecurityType MockSecurityPrivacy::getSecurityType()

26+{

27+ return m_type;

28+}

29+

24QString MockSecurityPrivacy::setSecurity(const QString &oldPasswd, const QString &newPasswd, SecurityType newType)

30QString MockSecurityPrivacy::setSecurity(const QString &oldPasswd, const QString &newPasswd, SecurityType newType)

25{

31{

32+ m_type = newType;

26 Q_EMIT setSecurityCalled(oldPasswd, newPasswd, newType);

33 Q_EMIT setSecurityCalled(oldPasswd, newPasswd, newType);

27 return "";

34 return "";

28}

35}

tests/mocks/Ubuntu/SystemSettings/SecurityPrivacy/MockSecurityPrivacy.h+8

@@ -23,6 +23,9 @@ class MockSecurityPrivacy : public QObject

23{

24 Q_OBJECT

25 Q_ENUMS(SecurityType)

26+ Q_PROPERTY (SecurityType securityType

27+ READ getSecurityType

28+ NOTIFY securityTypeChanged)

26

29

27public:

30public:

28 enum SecurityType {

31 enum SecurityType {

@@ -33,10 +36,15 @@ public:

33

36

34 MockSecurityPrivacy(QObject *parent = 0);

37 MockSecurityPrivacy(QObject *parent = 0);

35

38

39+ SecurityType getSecurityType();

36 Q_INVOKABLE QString setSecurity(const QString &oldPasswd, const QString &newPasswd, SecurityType newType);

40 Q_INVOKABLE QString setSecurity(const QString &oldPasswd, const QString &newPasswd, SecurityType newType);

37

41

38Q_SIGNALS:

42Q_SIGNALS:

43+ void securityTypeChanged();

39 void setSecurityCalled(const QString &oldPasswd, const QString &newPasswd, SecurityType newType); // only in mock

44 void setSecurityCalled(const QString &oldPasswd, const QString &newPasswd, SecurityType newType); // only in mock

45+

46+private:

47+ SecurityType m_type;

40};

48};

41

49

42#endif // MOCK_SECURITYPRIVACY_H

50#endif // MOCK_SECURITYPRIVACY_H

tests/qmltests/Wizard/tst_Wizard.qml+15

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

129

130 var pages = findChild(wizard, "wizardPages");

131 var security = findInvisibleChild(pages, "securityPrivacy");

132+ security.setSecurity("", "", UbuntuSecurityPrivacyPanel.Swipe);

132 setSecuritySpy.target = security;

133 setSecuritySpy.target = security;

133

134

134 setup();

135 setup();

@@ -315,6 +316,20 @@ Item {

315 }

316 }

317 }

317

318

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+

318 function test_passwdPasscode() {

333 function test_passwdPasscode() {

319 var page = goToPage("passwdPage");

334 var page = goToPage("passwdPage");

320

335