Merge lp:~nick-dedekind/unity8/lp1236249 into lp:unity8

[Nick Dedekind]

Only use the root action state as a unitymenumodel ActionStateParser when needed.

Only use the root action state as a unitymenumodel ActionStateParser when needed.
Removes issue where object is destroyed before menu.

Added tests.

[lp:~nick-dedekind/unity8/lp1236249]

416. By Nick Dedekind on 2013-10-11

Only use the parser when needed.

[Michael Terry (mterry)]

A couple style comments:

17 +void RootActionState::reset() {

Brace should be on new line.

27 if (m_menu && m_menu->rowCount() > 0) {
28 +
29 + ActionStateParser* oldParser = m_menu->actionStateParser();

We can drop the extra new line.

review: Needs Fixing

[lp:~nick-dedekind/unity8/lp1236249]

417. By Nick Dedekind on 2013-10-11

fixed style

[Nick Dedekind (nick-dedekind)]

> A couple style comments:
>
> 17 +void RootActionState::reset() {
>
> Brace should be on new line.
>
> 27 if (m_menu && m_menu->rowCount() > 0) {
> 28 +
> 29 + ActionStateParser* oldParser = m_menu->actionStateParser();
>
> We can drop the extra new line.

Thanks.
Fixed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:415
http://jenkins.qa.ubuntu.com/job/unity8-ci/1370/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4952
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2856
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1370
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1370/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1369
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/827
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/827/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2858
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2858/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2375
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2415

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1370/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Unity/Indicators/rootactionstate.cpp'
--- plugins/Unity/Indicators/rootactionstate.cpp	2013-09-17 12:31:19 +0000
+++ plugins/Unity/Indicators/rootactionstate.cpp	2013-10-11 15:51:58 +0000
@@ -57,7 +57,7 @@
             connect(m_menu, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), SLOT(onModelRowsRemoved(const QModelIndex&, int, int)));
             connect(m_menu, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)), SLOT(onModelDataChanged(const QModelIndex&, const QModelIndex&, const QVector<int>&)));
 
-            m_menu->setActionStateParser(this);
+            connect(m_menu, SIGNAL(destroyed()), SLOT(reset()));
         }
         updateActionState();
         Q_EMIT menuChanged();
@@ -92,10 +92,24 @@
     }
 }
 
+void RootActionState::reset()
+{
+    m_cachedState.clear();
+    m_menu = NULL;
+
+    Q_EMIT menuChanged();
+    Q_EMIT updated();
+}
+
 void RootActionState::updateActionState()
 {
     if (m_menu && m_menu->rowCount() > 0) {
+        ActionStateParser* oldParser = m_menu->actionStateParser();
+        m_menu->setActionStateParser(this);
+
         m_cachedState = m_menu->get(0, "actionState").toMap();
+
+        m_menu->setActionStateParser(oldParser);
     } else {
         m_cachedState.clear();
     }

=== modified file 'plugins/Unity/Indicators/rootactionstate.h'
--- plugins/Unity/Indicators/rootactionstate.h	2013-09-17 12:31:19 +0000
+++ plugins/Unity/Indicators/rootactionstate.h	2013-10-11 15:51:58 +0000
@@ -77,6 +77,7 @@
     void onModelRowsAdded(const QModelIndex& parent, int start, int end);
     void onModelRowsRemoved(const QModelIndex& parent, int start, int end);
     void onModelDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>&);
+    void reset();
 
 private:
     void updateActionState();

=== modified file 'tests/plugins/Unity/Indicators/CMakeLists.txt'
--- tests/plugins/Unity/Indicators/CMakeLists.txt	2013-07-17 09:11:03 +0000
+++ tests/plugins/Unity/Indicators/CMakeLists.txt	2013-10-11 15:51:58 +0000
@@ -1,6 +1,9 @@
+pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)
+
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../../plugins/Unity/Indicators
+    ${QMENUMODEL_INCLUDE_DIRS}
     )
 
 macro(run_tests)
@@ -16,6 +19,7 @@
         qt5_use_modules(${_test}Exec Test Core Qml)
         target_link_libraries(${_test}Exec
             IndicatorsQml
+            ${QMENUMODEL_LDFLAGS}
             )
         set(_test_list "${_test_list};${_test}")
     endforeach()
@@ -25,4 +29,5 @@
     indicatorsmanagertest
     indicatorsmodeltest
     menucontentactivatortest
+    rootactionstatetest
     )

=== added file 'tests/plugins/Unity/Indicators/rootactionstatetest.cpp'
--- tests/plugins/Unity/Indicators/rootactionstatetest.cpp	1970-01-01 00:00:00 +0000
+++ tests/plugins/Unity/Indicators/rootactionstatetest.cpp	2013-10-11 15:51:58 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Nick Dedekind <[e-mail]>
+ */
+
+#include "rootactionstate.h"
+
+#include <unitymenumodel.h>
+#include <QtTest>
+
+class RootActionStateTest : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+
+    void testDeleteRootActionState()
+    {
+        UnityMenuModel* menuModel = new UnityMenuModel();
+        ActionStateParser* originalParser = menuModel->actionStateParser();
+        RootActionState* rootState = new RootActionState();
+
+        rootState->setMenu(menuModel);
+
+        delete rootState;
+        QCOMPARE(menuModel->actionStateParser(), originalParser);
+        delete menuModel;
+    }
+
+    void testDeleteUnityMenuModel()
+    {
+        UnityMenuModel* menuModel = new UnityMenuModel();
+        RootActionState* rootState = new RootActionState();
+
+        rootState->setMenu(menuModel);
+
+        QCOMPARE(rootState->menu(), menuModel);
+        delete menuModel;
+        QVERIFY(rootState->menu() == NULL);
+        delete rootState;
+    }
+};
+
+QTEST_GUILESS_MAIN(RootActionStateTest)
+#include "rootactionstatetest.moc"