Merge lp:~aacid/unity8/dash_reset_instead_of_fatal into lp:unity8

[Albert Astals Cid]

Reset instead of qFatal when removing things from the middle

This can be optimized but let's see how this behaves, at least we won't qFatal anymore :D

* Are there any related MPs required for this MP to build/function as expected?
https://code.launchpad.net/~stolowski/unity-api/scope-activate-action/+merge/273557
https://code.launchpad.net/~stolowski/unity-scopes-shell/diff-updates/+merge/273554

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

 * 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?
N/A

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

[lp:~aacid/unity8/dash_reset_instead_of_fatal]

2003. By Albert Astals Cid on 2015-10-14

increase deps for easier building in silo

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2002
http://jenkins.qa.ubuntu.com/job/unity8-ci/6468/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4635
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/850
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/499
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1075
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1076
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/707
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/708
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3739
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4632
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4632/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24178
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/850
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/850/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24177

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/dash_reset_instead_of_fatal]

2004. By Albert Astals Cid on 2015-10-14

Adapt to unity-api changes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2003
http://jenkins.qa.ubuntu.com/job/unity8-ci/6469/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4637/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/851/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1181/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/500/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1076/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1077/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/708/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/709/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4634/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/851/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2004
http://jenkins.qa.ubuntu.com/job/unity8-ci/6471/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4640/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/853/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1183/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/502/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1078/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1079/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/710/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/711/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4637/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/853/console

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

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/dash_reset_instead_of_fatal]

2005. By Albert Astals Cid on 2015-10-26

Merge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2005
http://jenkins.qa.ubuntu.com/job/unity8-ci/6544/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4822/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/927/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1256/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/572/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1151/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1152/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/783/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/784/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4819/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/927/console

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

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
unrelated
 * Did you make sure that the branch does not contain spurious tags?
y

review: Approve

[Michael Zanetti (mzanetti)]

Needs information on the prerequisite branches. It just points to an abandoned silo. Which of them are needed? Should they be landed by us?

review: Needs Information

=== modified file 'plugins/Dash/horizontaljournal.cpp'
--- plugins/Dash/horizontaljournal.cpp	2015-09-14 09:11:08 +0000
+++ plugins/Dash/horizontaljournal.cpp	2015-10-26 13:52:18 +0000
@@ -199,7 +199,9 @@
                 m_lastInRowIndexPosition.remove(indexToRemove);
             } else {
                 if (indexToRemove < lastIndex) {
-                    qFatal("HorizontalJournal only supports removal from the end of the model");
+                    qDebug() << "HorizontalJournal only supports removal from the end of the model, resetting instead";
+                    cleanupExistingItems();
+                    break;
                 } else {
                     setImplicitHeightDirty();
                 }

=== modified file 'plugins/Dash/organicgrid.cpp'
--- plugins/Dash/organicgrid.cpp	2015-09-14 09:11:08 +0000
+++ plugins/Dash/organicgrid.cpp	2015-10-26 13:52:18 +0000
@@ -250,7 +250,9 @@
                 releaseItem(m_visibleItems.takeLast());
             } else {
                 if (indexToRemove < lastIndex) {
-                    qFatal("OrganicGrid only supports removal from the end of the model");
+                    qDebug() << "OrganicGrid only supports removal from the end of the model, resetting instead";
+                    cleanupExistingItems();
+                    break;
                 }
             }
         }

=== modified file 'plugins/Dash/verticaljournal.cpp'
--- plugins/Dash/verticaljournal.cpp	2015-09-14 09:11:08 +0000
+++ plugins/Dash/verticaljournal.cpp	2015-10-26 13:52:18 +0000
@@ -265,7 +265,9 @@
             }
             if (!found) {
                 if (indexToRemove < lastCreatedIndex) {
-                    qFatal("VerticalJournal only supports removal from the end of the model");
+                    qDebug() << "VerticalJournal only supports removal from the end of the model, resetting instead";
+                    cleanupExistingItems();
+                    break;
                 } else {
                     setImplicitHeightDirty();
                 }

=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt	2015-08-06 13:06:10 +0000
+++ tests/mocks/Unity/CMakeLists.txt	2015-10-26 13:52:18 +0000
@@ -7,7 +7,7 @@
 add_subdirectory(DashCommunicator)
 
 pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=7)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=8)
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}

=== modified file 'tests/mocks/Unity/fake_categories.cpp'
--- tests/mocks/Unity/fake_categories.cpp	2014-08-20 08:44:08 +0000
+++ tests/mocks/Unity/fake_categories.cpp	2015-10-26 13:52:18 +0000
@@ -32,11 +32,6 @@
     return m_category_count;
 }
 
-void Categories::addSpecialCategory(QString const& /*categoryId*/, QString const& /*name*/, QString const& /*icon*/, QString const& /*rawTemplate*/, QObject* /*countObject*/)
-{
-    qFatal("Using un-implemented Categories::addSpecialCategory");
-}
-
 bool Categories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
 {
     qFatal("Using un-implemented Categories::overrideCategoryJson");

=== modified file 'tests/mocks/Unity/fake_categories.h'
--- tests/mocks/Unity/fake_categories.h	2014-08-19 15:59:49 +0000
+++ tests/mocks/Unity/fake_categories.h	2015-10-26 13:52:18 +0000
@@ -34,7 +34,6 @@
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
-    Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;
     Q_INVOKABLE bool overrideCategoryJson(QString const& categoryId, QString const& json) override;
 
     Q_INVOKABLE QVariant data(int row, int role) const;

=== modified file 'tests/mocks/Unity/fake_scope.cpp'
--- tests/mocks/Unity/fake_scope.cpp	2015-09-22 12:57:08 +0000
+++ tests/mocks/Unity/fake_scope.cpp	2015-10-26 13:52:18 +0000
@@ -271,6 +271,11 @@
     Q_EMIT refreshed();
 }
 
+void Scope::activateAction(QVariant const& /*result*/, QString const& /*categoryId*/, QString const& /*actionId*/)
+{
+    qFatal("Using Scope::activateAction");
+}
+
 unity::shell::scopes::NavigationInterface* Scope::getNavigation(const QString& id)
 {
     if (id.isEmpty())

=== modified file 'tests/mocks/Unity/fake_scope.h'
--- tests/mocks/Unity/fake_scope.h	2015-07-08 09:40:35 +0000
+++ tests/mocks/Unity/fake_scope.h	2015-10-26 13:52:18 +0000
@@ -79,6 +79,8 @@
 
     Q_INVOKABLE void refresh() override;
 
+    Q_INVOKABLE virtual void activateAction(QVariant const& result, QString const& categoryId, QString const& actionId) override;
+
 Q_SIGNALS:
     // These are not in the Interface, here for testing benefits
     void refreshed();

=== modified file 'tests/mocks/Unity/fake_scopesoverview.cpp'
--- tests/mocks/Unity/fake_scopesoverview.cpp	2015-09-30 13:09:38 +0000
+++ tests/mocks/Unity/fake_scopesoverview.cpp	2015-10-26 13:52:18 +0000
@@ -74,11 +74,6 @@
     return 2;
 }
 
-void ScopesOverviewCategories::addSpecialCategory(QString const&, QString const&, QString const&, QString const&, QObject*)
-{
-    qFatal("Using un-implemented ScopesOverviewCategories::addSpecialCategory");
-}
-
 bool ScopesOverviewCategories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
 {
     qFatal("Using un-implemented ScopesOverviewCategories::overrideCategoryJson");
@@ -175,11 +170,6 @@
     return 2;
 }
 
-void ScopesOverviewSearchCategories::addSpecialCategory(QString const&, QString const&, QString const&, QString const&, QObject*)
-{
-    qFatal("Using un-implemented ScopesOverviewSearchCategories::addSpecialCategory");
-}
-
 bool ScopesOverviewSearchCategories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)
 {
     qFatal("Using un-implemented ScopesOverviewSearchCategories::overrideCategoryJson");

=== modified file 'tests/mocks/Unity/fake_scopesoverview.h'
--- tests/mocks/Unity/fake_scopesoverview.h	2015-07-08 09:40:35 +0000
+++ tests/mocks/Unity/fake_scopesoverview.h	2015-10-26 13:52:18 +0000
@@ -53,7 +53,6 @@
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
-    Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;
     Q_INVOKABLE bool overrideCategoryJson(QString const& categoryId, QString const& json) override;
 
     // This is implementation detail
@@ -76,7 +75,6 @@
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
 
-    Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;
     Q_INVOKABLE bool overrideCategoryJson(QString const& categoryId, QString const& json) override;
 
 private: