b0ebe6d · unity8 · git.iko.soy

tests/mocks/Unity/fake_applications_scope.cpp+1

compare with xenial

unifiedsplit

@@ -30,6 +30,7 @@ ApplicationsScope::ApplicationsScope(bool visible, QObject* parent)

30 m_id = "applications.scope";

31 m_name = "Applications";

32 m_visible = visible;

33+ m_previewRendererName = "preview-application";

33 m_categories->setModel(createCategoriesModel());

34 m_categories->setModel(createCategoriesModel());

34}

35}

35

36

tests/mocks/Unity/fake_preview.cpp+4−2

@@ -16,13 +16,15 @@

16

17#include "fake_preview.h"

18

19−Preview::Preview(QObject *parent): QObject(parent)

19+Preview::Preview(const QString &rendererName, QObject *parent):

20+ QObject(parent),

21+ m_rendererName(rendererName)

20{

22{

21}

23}

22

24

23QString Preview::rendererName() const

25QString Preview::rendererName() const

24{

26{

25− return "generic-preview";

27+ return m_rendererName;

26}

28}

27

29

28QString Preview::title() const

30QString Preview::title() const

tests/mocks/Unity/fake_preview.h+4−1

@@ -38,7 +38,7 @@ class Q_DECL_EXPORT Preview : public QObject

38 Q_PROPERTY(QString image READ image NOTIFY previewChanged)

39

40public:

41− explicit Preview(QObject *parent = 0);

41+ explicit Preview(const QString &rendererName, QObject *parent = 0);

42

43 QString rendererName() const;

44 QString title() const;

@@ -55,6 +55,9 @@ public:

55

56Q_SIGNALS:

57 void previewChanged();

58+

59+private:

60+ QString m_rendererName;

58};

61};

59

62

60Q_DECLARE_METATYPE(Preview *)

63Q_DECLARE_METATYPE(Preview *)

tests/mocks/Unity/fake_scope.cpp+2−1

@@ -38,6 +38,7 @@ Scope::Scope(QString const& id, QString const& name, bool visible, QObject* pare

38 , m_isActive(false)

39 , m_categories(new Categories(this))

40 , m_results(new DeeListModel(this))

41+ , m_previewRendererName("preview-generic")

41{

42{

42 DeeModel* results_model = create_results_model(20, 300);

43 DeeModel* results_model = create_results_model(20, 300);

43 m_categories->setResultModel(results_model);

44 m_categories->setResultModel(results_model);

@@ -47,7 +48,7 @@ Scope::Scope(QString const& id, QString const& name, bool visible, QObject* pare

47 m_timer.setInterval(1000);

48 m_timer.setInterval(1000);

48 m_timer.setSingleShot(true);

49 m_timer.setSingleShot(true);

49 connect(&m_timer, &QTimer::timeout, [this]() {

50 connect(&m_timer, &QTimer::timeout, [this]() {

50− Preview *p = new Preview(this);

51+ Preview *p = new Preview(m_previewRendererName, this);

51 Q_EMIT previewReady(p);

52 Q_EMIT previewReady(p);

52 });

53 });

53}

54}

tests/mocks/Unity/fake_scope.h+2

@@ -116,6 +116,8 @@ protected:

116 bool m_searching;

117 bool m_isActive;

118

119+ QString m_previewRendererName;

120+

119 Categories* m_categories;

121 Categories* m_categories;

120 DeeListModel* m_results;

122 DeeListModel* m_results;

121

123