2f186a9 · unity8 · git.iko.soy

tests/mocks/Wizard/CMakeLists.txt+1

compare with xenial

unifiedsplit

@@ -8,6 +8,7 @@ include_directories(

8add_library(MockWizard-qml MODULE

9 mockplugin.cpp

10 MockSystem.cpp

11+ ${CMAKE_SOURCE_DIR}/plugins/Wizard/Changelog.cpp

11 ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp

12 ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp

12 ${CMAKE_SOURCE_DIR}/plugins/Wizard/timezonemodel.cpp

13 ${CMAKE_SOURCE_DIR}/plugins/Wizard/timezonemodel.cpp

13 ${CMAKE_SOURCE_DIR}/plugins/Wizard/LocalePlugin.cpp

14 ${CMAKE_SOURCE_DIR}/plugins/Wizard/LocalePlugin.cpp

tests/mocks/Wizard/MockSystem.cpp+7−1

@@ -21,7 +21,8 @@

21

22MockSystem::MockSystem()

23 : QObject(),

24− m_wizardEnabled(false)

24+ m_wizardEnabled(false),

25+ m_version("Lomiri 17.04.12")

25{

26{

26}

27}

27

28

@@ -47,6 +48,11 @@ void MockSystem::setIsUpdate(bool update)

47 Q_EMIT isUpdateChanged();

48 Q_EMIT isUpdateChanged();

48}

49}

49

50

51+QString MockSystem::version() const

52+{

53+ return m_version;

54+}

55+

50void MockSystem::updateSessionLocale(const QString &locale)

56void MockSystem::updateSessionLocale(const QString &locale)

51{

57{

52 Q_EMIT updateSessionLocaleCalled(locale);

58 Q_EMIT updateSessionLocaleCalled(locale);

tests/mocks/Wizard/MockSystem.h+4

@@ -24,6 +24,7 @@ class MockSystem : public QObject

24{

25 Q_OBJECT

26 Q_PROPERTY(bool wizardEnabled READ wizardEnabled WRITE setWizardEnabled NOTIFY wizardEnabledChanged)

27+ Q_PROPERTY(QString version READ version NOTIFY versionChanged)

27 Q_PROPERTY(bool isUpdate READ isUpdate WRITE setIsUpdate NOTIFY isUpdateChanged)

28 Q_PROPERTY(bool isUpdate READ isUpdate WRITE setIsUpdate NOTIFY isUpdateChanged)

28

29

29public:

30public:

@@ -33,6 +34,7 @@ public:

33 void setWizardEnabled(bool enabled);

34 void setWizardEnabled(bool enabled);

34 bool isUpdate() const;

35 bool isUpdate() const;

35 void setIsUpdate(bool enabled); // only in mock

36 void setIsUpdate(bool enabled); // only in mock

37+ QString version() const;

36

38

37public Q_SLOTS:

39public Q_SLOTS:

38 void updateSessionLocale(const QString &locale);

40 void updateSessionLocale(const QString &locale);

@@ -44,6 +46,7 @@ public Q_SLOTS:

44Q_SIGNALS:

46Q_SIGNALS:

45 void wizardEnabledChanged();

47 void wizardEnabledChanged();

46 void isUpdateChanged(); // only in mock

48 void isUpdateChanged(); // only in mock

49+ void versionChanged();

47 void updateSessionLocaleCalled(const QString &locale); // only in mock

50 void updateSessionLocaleCalled(const QString &locale); // only in mock

48 void wouldHaveSetSkipUntilFinish(); // only in mock

51 void wouldHaveSetSkipUntilFinish(); // only in mock

49

52

@@ -52,6 +55,7 @@ private:

52

55

53 bool m_wizardEnabled = true;

56 bool m_wizardEnabled = true;

54 bool m_isUpdate = false;

57 bool m_isUpdate = false;

58+ QString m_version;

55};

59};

56

60

57#endif

61#endif

tests/mocks/Wizard/mockplugin.cpp+2

@@ -14,6 +14,7 @@

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15 */

16

17+#include "Changelog.h"

17#include "mockplugin.h"

18#include "mockplugin.h"

18#include "MockSystem.h"

19#include "MockSystem.h"

19#include "PageList.h"

20#include "PageList.h"

@@ -30,6 +31,7 @@ void MockWizardPlugin::registerTypes(const char *uri)

30 qmlRegisterType<PageList>(uri, 0, 1, "PageList");

31 qmlRegisterType<PageList>(uri, 0, 1, "PageList");

31 qmlRegisterSingletonType<MockSystem>(uri, 0, 1, "System", [](QQmlEngine*, QJSEngine*) -> QObject* { return new MockSystem; });

32 qmlRegisterSingletonType<MockSystem>(uri, 0, 1, "System", [](QQmlEngine*, QJSEngine*) -> QObject* { return new MockSystem; });

32 qmlRegisterSingletonType<Status>(uri, 0, 1, "Status", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Status; });

33 qmlRegisterSingletonType<Status>(uri, 0, 1, "Status", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Status; });

34+ qmlRegisterSingletonType<Changelog>(uri, 0, 1, "Changelog", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Changelog; });

33 qmlRegisterType<TimeZoneLocationModel>(uri, 0, 1, "TimeZoneModel");

35 qmlRegisterType<TimeZoneLocationModel>(uri, 0, 1, "TimeZoneModel");

34 qmlRegisterType<KeyboardLayoutsModel>(uri, 0, 1, "KeyboardLayoutsModel");

36 qmlRegisterType<KeyboardLayoutsModel>(uri, 0, 1, "KeyboardLayoutsModel");

35 qmlRegisterType<LocalePlugin>(uri, 0, 1, "LocalePlugin");

37 qmlRegisterType<LocalePlugin>(uri, 0, 1, "LocalePlugin");