4bea1cd · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Allow for tests to decide if they want navigation/primaryFilter

4bea1cdAlbert Astals Cid11 years ago

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

compare with xenial

unifiedsplit

@@ -39,6 +39,8 @@ Scope::Scope(QString const& id, QString const& name, bool favorite, Scopes* pare

39 , m_searching(false)

40 , m_favorite(favorite)

41 , m_isActive(false)

42+ , m_hasNavigation(true)

43+ , m_hasPrimaryFilter(true)

42 , m_currentNavigationId("root")

44 , m_currentNavigationId("root")

43 , m_previewRendererName("preview-generic")

45 , m_previewRendererName("preview-generic")

44 , m_categories(new Categories(categories, this))

46 , m_categories(new Categories(categories, this))

@@ -227,7 +229,12 @@ QString Scope::currentNavigationId() const

227

229

228bool Scope::hasNavigation() const

230bool Scope::hasNavigation() const

229{

231{

230− return true;

232+ return m_hasNavigation;

233+}

234+

235+void Scope::setHasNavigation(bool hasNavigation)

236+{

237+ m_hasNavigation = hasNavigation;

231}

238}

232

239

233Scope::Status Scope::status() const

240Scope::Status Scope::status() const

@@ -290,7 +297,7 @@ void Scope::setNavigationState(const QString &navigationId)

290

297

291unity::shell::scopes::FilterBaseInterface* Scope::primaryNavigationFilter() const

298unity::shell::scopes::FilterBaseInterface* Scope::primaryNavigationFilter() const

292{

299{

293− return m_primaryNavigationFilter;

300+ return m_hasPrimaryFilter ? m_primaryNavigationFilter : nullptr;

294}

301}

295

302

296unity::shell::scopes::FiltersInterface* Scope::filters() const

303unity::shell::scopes::FiltersInterface* Scope::filters() const

@@ -319,6 +326,11 @@ void Scope::resetPrimaryNavigationTag()

319 }

326 }

320}

327}

321

328

329+void Scope::setHasPrimaryFilter(bool hasPrimaryFilter)

330+{

331+ m_hasPrimaryFilter = hasPrimaryFilter;

332+}

333+

322void Scope::performQuery(const QString& query)

334void Scope::performQuery(const QString& query)

323{

335{

324 Q_EMIT queryPerformed(query);

336 Q_EMIT queryPerformed(query);

tests/mocks/Unity/fake_scope.h+4

@@ -70,12 +70,14 @@ public:

70 bool hasNavigation() const override;

71 Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& navigationId) override;

72 Q_INVOKABLE void setNavigationState(const QString &navigationId) override;

73+ Q_INVOKABLE void setHasNavigation(bool hasNavigation); // This is not invokable in the Interface, here for testing benefits

74 unity::shell::scopes::FilterBaseInterface* primaryNavigationFilter() const override;

75 unity::shell::scopes::FilterBaseInterface* primaryNavigationFilter() const override;

75 unity::shell::scopes::FiltersInterface* filters() const override;

76 unity::shell::scopes::FiltersInterface* filters() const override;

76 QString primaryNavigationTag() const override;

77 QString primaryNavigationTag() const override;

77 int activeFiltersCount() const override;

78 int activeFiltersCount() const override;

78 Q_INVOKABLE void resetPrimaryNavigationTag() override;

79 Q_INVOKABLE void resetPrimaryNavigationTag() override;

80+ Q_INVOKABLE void setHasPrimaryFilter(bool hasPrimaryFilter); // This is not invokable in the Interface, here for testing benefits

80 void performQuery(const QString& query) override;

82 void performQuery(const QString& query) override;

@@ -101,6 +103,8 @@ protected:

101 bool m_searching;

103 bool m_searching;

102 bool m_favorite;

104 bool m_favorite;

103 bool m_isActive;

105 bool m_isActive;

106+ bool m_hasNavigation;

107+ bool m_hasPrimaryFilter;

104 QString m_currentNavigationId;

108 QString m_currentNavigationId;

105

109

106 QString m_previewRendererName;

110 QString m_previewRendererName;