Merge lp:~unity-team/unity8/scopes-mocks-v2 into lp:unity8

[Michal Hruby]

Fix FTBFS when using latest unity-api.

Fix FTBFS when using latest unity-api.

 * Are there any related MPs required for this MP to build/function as expected? Please list.

https://code.launchpad.net/~mhr3/unity-api/expansion-queries/+merge/225938 + its prereq branch

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes, compiles again.

 * Did you make sure that your branch does not contain spurious tags?

Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

No, trivial change.

 * If you changed the UI, has there been a design review?

N/A

[lp:~unity-team/unity8/scopes-mocks-v2]

1014. By Michal Hruby on 2014-07-08

Consolidate code style of the scope mock

1015. By Michal Hruby on 2014-07-08

Added missing case

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1013
http://jenkins.qa.ubuntu.com/job/unity8-ci/3360/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1680/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/454/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/454/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/454/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2718/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3360/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1015
http://jenkins.qa.ubuntu.com/job/unity8-ci/3369/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1711/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/373/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/463/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2754/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3369/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes.

 * Did CI run pass? If not, please explain why.
New dep unavailable.

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-07-03 14:47:28 +0000
+++ debian/control	2014-07-08 11:05:16 +0000
@@ -19,7 +19,7 @@
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.7),
                libqt5xmlpatterns5-dev,
-               libunity-api-dev (>= 7.83),
+               libunity-api-dev (>= 7.85),
                libunity-mir-dev,
                libusermetricsoutput1-dev,
                libxcb1-dev,

=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt	2014-06-02 08:01:57 +0000
+++ tests/mocks/Unity/CMakeLists.txt	2014-07-08 11:05:16 +0000
@@ -6,7 +6,7 @@
 pkg_search_module(DEE dee-1.0 REQUIRED)
 pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
 pkg_search_module(DEEQT libdee-qt5 REQUIRED)
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=1)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=2)
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}

=== modified file 'tests/mocks/Unity/fake_categories.cpp'
--- tests/mocks/Unity/fake_categories.cpp	2014-06-27 07:59:08 +0000
+++ tests/mocks/Unity/fake_categories.cpp	2014-07-08 11:05:16 +0000
@@ -116,6 +116,8 @@
                 map["title"] = "HOLA";
                 return map;
             }
+            case RoleHeaderLink:
+                return QString();
             case RoleResults:
                 return QVariant();
             case RoleCount:
@@ -163,6 +165,8 @@
                 map["subtitle"] = "HOLA";
                 return map;
             }
+            case RoleHeaderLink:
+                return QString();
             case RoleResults:
                 return QVariant::fromValue(resultsModel);
             case RoleCount:

=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2014-06-27 07:58:48 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2014-07-08 11:05:16 +0000
@@ -35,87 +35,110 @@
 {
 }
 
-QString Scope::id() const {
+QString Scope::id() const
+{
     return m_id;
 }
 
-QString Scope::name() const {
+QString Scope::name() const
+{
     return m_name;
 }
 
-QString Scope::searchQuery() const {
+QString Scope::searchQuery() const
+{
     return m_searchQuery;
 }
 
-QString Scope::iconHint() const {
+QString Scope::iconHint() const
+{
     return m_iconHint;
 }
 
-QString Scope::description() const {
+QString Scope::description() const
+{
     return m_description;
 }
 
-QString Scope::searchHint() const {
-    return QString("");
-}
-
-QString Scope::shortcut() const {
-    return QString("");
-}
-
-bool Scope::searchInProgress() const {
+QString Scope::searchHint() const
+{
+    return QString("");
+}
+
+QString Scope::shortcut() const
+{
+    return QString("");
+}
+
+bool Scope::searchInProgress() const
+{
     return m_searching;
 }
 
-unity::shell::scopes::CategoriesInterface* Scope::categories() const {
+unity::shell::scopes::CategoriesInterface* Scope::categories() const
+{
     return m_categories;
 }
 
-QString Scope::noResultsHint() const {
+unity::shell::scopes::SettingsModelInterface* Scope::settings() const
+{
+    return nullptr;
+}
+
+QString Scope::noResultsHint() const
+{
     return m_noResultsHint;
 }
 
-QString Scope::formFactor() const {
+QString Scope::formFactor() const
+{
     return m_formFactor;
 }
 
-bool Scope::visible() const {
+bool Scope::visible() const
+{
     return m_visible;
 }
 
-bool Scope::isActive() const {
+bool Scope::isActive() const
+{
     return m_isActive;
 }
 
-void Scope::setSearchQuery(const QString &str) {
+void Scope::setSearchQuery(const QString &str)
+{
     if (str != m_searchQuery) {
         m_searchQuery = str;
         Q_EMIT searchQueryChanged();
     }
 }
 
-void Scope::setFormFactor(const QString &str) {
+void Scope::setFormFactor(const QString &str)
+{
     if (str != m_formFactor) {
         m_formFactor = str;
         Q_EMIT formFactorChanged();
     }
 }
 
-void Scope::setActive(const bool active) {
+void Scope::setActive(const bool active)
+{
     if (active != m_isActive) {
         m_isActive = active;
         Q_EMIT isActiveChanged();
     }
 }
 
-void Scope::setSearchInProgress(const bool inProg) {
+void Scope::setSearchInProgress(const bool inProg)
+{
     if (inProg != m_searching) {
         m_searching = inProg;
         Q_EMIT searchInProgressChanged();
     }
 }
 
-void Scope::setNoResultsHint(const QString& str) {
+void Scope::setNoResultsHint(const QString& str)
+{
     if (str != m_noResultsHint) {
         m_noResultsHint = str;
         Q_EMIT noResultsHintChanged();
@@ -182,3 +205,8 @@
     m_currentDeparment = id;
     Q_EMIT currentDepartmentIdChanged();
 }
+
+void Scope::performQuery(const QString& query)
+{
+    Q_UNUSED(query);
+}

=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2014-06-27 07:58:48 +0000
+++ tests/mocks/Unity/fake_scope.h	2014-07-08 11:05:16 +0000
@@ -46,6 +46,7 @@
     QString noResultsHint() const override;
     QString formFactor() const override;
     bool isActive() const override;
+    unity::shell::scopes::SettingsModelInterface* settings() const override;
 
     /* setters */
     void setSearchQuery(const QString& search_query) override;
@@ -63,6 +64,7 @@
     bool hasDepartments() const override;
     Q_INVOKABLE unity::shell::scopes::DepartmentInterface* getDepartment(const QString& id) override;
     Q_INVOKABLE void loadDepartment(const QString& id) override;
+    Q_INVOKABLE void performQuery(const QString& query) override;
 
     QVariantMap customizations() const override;