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

[Nick Dedekind]

Fixed CachedUnityMenuModel destruction unhinging indicators.

Fixed CachedUnityMenuModel destruction unhinging indicators.
Destroying cached model was causing menu path to update to "".
Added tests for CachedMenuModel

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

 * 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:~nick-dedekind/unity8/lp1328646]

1181. By Nick Dedekind on 2014-08-19

added test for lp1328646

[Michał Sawicz (saviq)]

I really hate the ref/deref happening on QML side, could we use QML ownership to do this?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1181
http://jenkins.qa.ubuntu.com/job/unity8-ci/4020/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3762
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1021
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1114
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3630
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5009
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5009/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11729

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

review: Approve (continuous-integration)

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

1182. By Nick Dedekind on 2014-08-19

use qml ownership for models

1183. By Nick Dedekind on 2014-08-20

review comments

1184. By Nick Dedekind on 2014-08-20

removed debug

1185. By Nick Dedekind on 2014-08-20

Added tests for model delete

1186. By Nick Dedekind on 2014-08-20

Reverted shell change

[Nick Dedekind (nick-dedekind)]

> I really hate the ref/deref happening on QML side, could we use QML ownership
> to do this?

I think I've addressed all your concerns. Was able to move the model instantiation into the cache now that i've fixed up the QMenuModel mocking.
The GC looks a bit hairy in the qmltests for testing the deletion, but it seems to work.

[Albert Astals Cid (aacid)]

Code looks good, testing it in the phone now

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1184
http://jenkins.qa.ubuntu.com/job/unity8-ci/4034/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3815
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1035/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3678
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5062
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5062/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11795

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

So i guess it is fixed, but still suffers from only updating every X seconds, so if i locked at 47, wait will 50, unlock, it will still say 47 for a few seconds, that is very bad.

Is there that in any way related to this fixes or shall a new bug be opened about that?

review: Needs Information

[kevin gunn (kgunn72)]

> So i guess it is fixed, but still suffers from only updating every X seconds,
> so if i locked at 47, wait will 50, unlock, it will still say 47 for a few
> seconds, that is very bad.
>
> Is there that in any way related to this fixes or shall a new bug be opened
> about that?

Is that only on the indicator ? i assume greeter is reflecting the correct time?

agreed, we should open another bug in an effort to land this and unblock the train

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1186
http://jenkins.qa.ubuntu.com/job/unity8-ci/4039/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1040
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1133
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3705
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5091
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5091/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11822

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

review: Needs Fixing (continuous-integration)

[kevin gunn (kgunn72)]

approving as albert was ok with code & it fixes the primary problem. will open bug for secondary issue of lagging clock update after waking.

review: Approve

[Charles Kerr (charlesk)]

https://bugs.launchpad.net/ubuntu/+source/indicator-datetime/+bug/1359802

=== modified file 'plugins/Unity/Indicators/qmldir'
--- plugins/Unity/Indicators/qmldir	2014-07-30 08:10:40 +0000
+++ plugins/Unity/Indicators/qmldir	2014-08-20 09:19:41 +0000
@@ -1,6 +1,3 @@
 module Unity.Indicators
 plugin IndicatorsQml
 typeinfo Indicators.qmltypes
-
-CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
-IndicatorBase 0.1 IndicatorBase.qml

=== modified file 'plugins/Unity/Indicators/unitymenumodelcache.cpp'
--- plugins/Unity/Indicators/unitymenumodelcache.cpp	2013-08-30 08:17:10 +0000
+++ plugins/Unity/Indicators/unitymenumodelcache.cpp	2014-08-20 09:19:41 +0000
@@ -29,14 +29,29 @@
 {
 }
 
-
-UnityMenuModel* UnityMenuModelCache::model(const QString& path) const
-{
-    return m_menuModels.value(path, NULL);
-}
-
-void UnityMenuModelCache::registerModel(const QString& path, UnityMenuModel* menuModel)
-{
-    menuModel->setParent(this);
-    m_menuModels[path] = menuModel;
-}
\ No newline at end of file
+UnityMenuModel* UnityMenuModelCache::model(const QByteArray& bus,
+                                           const QByteArray& path,
+                                           const QVariantMap& actions)
+{
+    if (m_registry.contains(path))
+        return m_registry[path];
+
+    UnityMenuModel* menuModel = new UnityMenuModel;
+    connect(menuModel, &QObject::destroyed, this, [menuModel, this](QObject*) {
+        QList<QByteArray> keys = m_registry.keys(menuModel);
+        Q_FOREACH(const QByteArray& key, keys) {
+            m_registry.remove(key);
+        }
+    });
+    m_registry[path] = menuModel;
+
+    menuModel->setBusName(bus);
+    menuModel->setMenuObjectPath(path);
+    menuModel->setActions(actions);
+    return menuModel;
+}
+
+bool UnityMenuModelCache::contains(const QByteArray& path)
+{
+    return m_registry.contains(path);
+}

=== modified file 'plugins/Unity/Indicators/unitymenumodelcache.h'
--- plugins/Unity/Indicators/unitymenumodelcache.h	2013-08-30 08:17:10 +0000
+++ plugins/Unity/Indicators/unitymenumodelcache.h	2014-08-20 09:19:41 +0000
@@ -34,11 +34,13 @@
     UnityMenuModelCache(QObject*parent=NULL);
     ~UnityMenuModelCache();
 
-    Q_INVOKABLE UnityMenuModel* model(const QString& path) const;
-    Q_INVOKABLE void registerModel(const QString& path, UnityMenuModel* menuModel);
+    Q_INVOKABLE UnityMenuModel* model(const QByteArray& bus,
+                                      const QByteArray& path,
+                                      const QVariantMap& actions);
+    Q_INVOKABLE bool contains(const QByteArray& path);
 
 private:
-    QHash<QString, UnityMenuModel*> m_menuModels;
+    QHash<QByteArray, UnityMenuModel*> m_registry;
 };
 
 #endif // UNITYMENUMODELCACHE_H

=== modified file 'qml/Greeter/Clock.qml'
--- qml/Greeter/Clock.qml	2014-06-12 15:03:20 +0000
+++ qml/Greeter/Clock.qml	2014-08-20 09:19:41 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import "../Panel/Indicators"
 import Unity.Indicators 0.1 as Indicators
 
 Item {
@@ -33,7 +34,7 @@
         }
     }
 
-    Indicators.CachedUnityMenuModel {
+    CachedUnityMenuModel {
         id: timeModel
         objectName: "timeModel"
 

=== renamed file 'plugins/Unity/Indicators/CachedUnityMenuModel.qml' => 'qml/Panel/Indicators/CachedUnityMenuModel.qml'
--- plugins/Unity/Indicators/CachedUnityMenuModel.qml	2014-06-26 10:00:41 +0000
+++ qml/Panel/Indicators/CachedUnityMenuModel.qml	2014-08-20 09:19:41 +0000
@@ -18,43 +18,22 @@
  */
 
 import QtQuick 2.0
-import QMenuModel 0.1 as QMenuModel
+import QMenuModel 0.1
 import Unity.Indicators 0.1 as Indicators
 
 // Make sure we don't duplicate models.
 Item {
     id: cachedModel
-    property string busName: ""
-    property string actionsObjectPath: ""
-    property string menuObjectPath: ""
-
+    property string busName
+    property string actionsObjectPath
+    property string menuObjectPath
     readonly property bool ready: busName!=="" && actionsObjectPath!=="" && menuObjectPath!==""
 
-    property QtObject model: {
-        if (!ready) {
-            return null;
-        }
-
-        var component = Indicators.UnityMenuModelCache.model(menuObjectPath);
-        if (!component) {
-            component = modelComponent.createObject(cachedModel);
-            return component;
-        }
-        return component;
-    }
-
-    Component {
-        id: modelComponent
-
-        QMenuModel.UnityMenuModel {
-            id: unityModel
-            busName: cachedModel.busName
-            actions: { "indicator": cachedModel.actionsObjectPath }
-            menuObjectPath: cachedModel.menuObjectPath
-
-            Component.onCompleted: {
-                Indicators.UnityMenuModelCache.registerModel(cachedModel.menuObjectPath, unityModel);
-            }
-        }
+    property var model: {
+        if (!ready) return null;
+
+        return Indicators.UnityMenuModelCache.model(cachedModel.busName,
+                                                    cachedModel.menuObjectPath,
+                                                    { "indicator": cachedModel.actionsObjectPath });
     }
 }

=== modified file 'qml/Panel/Indicators/DefaultIndicatorWidget.qml'
--- qml/Panel/Indicators/DefaultIndicatorWidget.qml	2014-07-03 14:47:28 +0000
+++ qml/Panel/Indicators/DefaultIndicatorWidget.qml	2014-08-20 09:19:41 +0000
@@ -63,6 +63,7 @@
         }
 
         Row {
+            id: iconRow
             anchors {
                 top: parent.top
                 bottom: parent.bottom
@@ -73,7 +74,7 @@
 
                 Item {
                     width: itemImage.width + units.gu(1)
-                    anchors { top: parent.top; bottom: parent.bottom }
+                    height: iconRow.height
 
                     StatusIcon {
                         id: itemImage

=== modified file 'qml/Panel/Indicators/IndicatorBase.qml'
--- qml/Panel/Indicators/IndicatorBase.qml	2014-06-27 09:16:16 +0000
+++ qml/Panel/Indicators/IndicatorBase.qml	2014-08-20 09:19:41 +0000
@@ -34,6 +34,7 @@
     property string deviceMenuObjectPath: menuObjectPath
 
     property alias menuModel: cachedModel.model
+    property alias rootActionState: rootAction
 
     CachedUnityMenuModel {
         id: cachedModel
@@ -42,8 +43,9 @@
         menuObjectPath: indicatorItem.deviceMenuObjectPath
     }
 
-    property RootActionState rootActionState: RootActionState {
-        menu: menuModel
+    RootActionState {
+        id: rootAction
+        menu: menuModel ? menuModel : null
         onUpdated: indicatorItem.rootActionStateChanged()
     }
 }

=== modified file 'tests/mocks/QMenuModel/unitymenumodel.cpp'
--- tests/mocks/QMenuModel/unitymenumodel.cpp	2014-07-22 14:46:01 +0000
+++ tests/mocks/QMenuModel/unitymenumodel.cpp	2014-08-20 09:19:41 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "unitymenumodel.h"
-#include <QDebug>
 
 enum MenuRoles {
     LabelRole  = Qt::DisplayRole + 1,
@@ -38,6 +37,10 @@
 {
 }
 
+UnityMenuModel::~UnityMenuModel()
+{
+}
+
 QVariant UnityMenuModel::modelData() const
 {
     return m_modelData;
@@ -83,10 +86,6 @@
     endRemoveRows();
 }
 
-UnityMenuModel::~UnityMenuModel()
-{
-}
-
 QByteArray UnityMenuModel::busName() const
 {
     return m_busName;

=== modified file 'tests/mocks/Unity/Indicators/CMakeLists.txt'
--- tests/mocks/Unity/Indicators/CMakeLists.txt	2014-05-02 23:35:51 +0000
+++ tests/mocks/Unity/Indicators/CMakeLists.txt	2014-08-20 09:19:41 +0000
@@ -14,6 +14,7 @@
     fakeplugin.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelcache.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp
     ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp
     fakeindicatorsmodel.cpp
@@ -33,7 +34,11 @@
 )
 add_definitions(-DUNITYINDICATORS_LIBRARY)
 
-target_link_libraries(IndicatorsFakeQml)
+add_dependencies(IndicatorsFakeQml QMenuModelQml)
+target_link_libraries(IndicatorsFakeQml
+    -L${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel
+    -lqmenumodel
+)
 
 qt5_use_modules(IndicatorsFakeQml Core Qml Quick)
 

=== removed file 'tests/mocks/Unity/Indicators/CachedUnityMenuModel.qml'
--- tests/mocks/Unity/Indicators/CachedUnityMenuModel.qml	2013-10-11 18:58:51 +0000
+++ tests/mocks/Unity/Indicators/CachedUnityMenuModel.qml	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-/*
- * 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]>
- */
-
-import QtQuick 2.0
-
-Item {
-    property string busName: ""
-    property string actionsObjectPath: ""
-    property string menuObjectPath: ""
-
-    readonly property bool ready: false
-
-    property QtObject model: null
-}

=== modified file 'tests/mocks/Unity/Indicators/fakeplugin.cpp'
--- tests/mocks/Unity/Indicators/fakeplugin.cpp	2014-03-03 12:03:30 +0000
+++ tests/mocks/Unity/Indicators/fakeplugin.cpp	2014-08-20 09:19:41 +0000
@@ -26,9 +26,16 @@
 #include "fakeindicatorsmodel.h"
 #include "indicators.h"
 #include "menucontentactivator.h"
+#include "unitymenumodelcache.h"
 #include "unitymenumodelstack.h"
 #include "visibleindicatorsmodel.h"
 
+static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
+  Q_UNUSED(engine);
+  Q_UNUSED(scriptEngine);
+  return new UnityMenuModelCache;
+}
+
 void IndicatorsFakePlugin::registerTypes(const char * uri)
 {
     Q_INIT_RESOURCE(indicators_fake);
@@ -41,6 +48,8 @@
     qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
     qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
 
+    qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);
+
     // external uncreatables
     qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");
     qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");

=== modified file 'tests/mocks/Unity/Indicators/qmldir'
--- tests/mocks/Unity/Indicators/qmldir	2014-06-27 09:16:16 +0000
+++ tests/mocks/Unity/Indicators/qmldir	2014-08-20 09:19:41 +0000
@@ -2,7 +2,6 @@
 plugin IndicatorsFakeQml
 typeinfo Indicators.qmltypes
 
-CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
 IndicatorsModel 0.1 IndicatorsModel.qml
 FakeMenuPage 0.1 FakeMenuPage.qml
 RootActionState 0.1 RootActionState.qml

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-08-14 11:35:05 +0000
+++ tests/qmltests/CMakeLists.txt	2014-08-20 09:19:41 +0000
@@ -72,6 +72,7 @@
 add_qml_test(Panel SearchIndicator)
 add_qml_test(Panel/Indicators DefaultIndicatorWidget ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
 add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
+add_qml_test(Panel/Indicators CachedUnityMenuModel ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
 # These MenuItemFactory tests need the test/mocks/ to come before plugins/
 add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
 add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

=== added file 'tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qml'
--- tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Panel/Indicators/tst_CachedUnityMenuModel.qml	2014-08-20 09:19:41 +0000
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Unity.Test 0.1 as UT
+import QMenuModel 0.1
+import Unity.Indicators 0.1 as Indicators
+import "../../../../qml/Panel/Indicators"
+
+Item {
+    id: root
+    width: units.gu(40)
+    height: units.gu(70)
+
+    Component {
+        id: model
+        CachedUnityMenuModel {}
+    }
+
+    UT.UnityTestCase {
+        name: "CachedUnityMenuModel"
+        when: windowShown
+
+        function cleanup() {
+            doGC();
+        }
+
+        function doGC() {
+            // need to put some wait cycles here to get gc going properly.
+            wait(10);
+            gc();
+            wait(10);
+        }
+
+        function test_createDifferent() {
+            var cachedObject = model.createObject(null,
+                               {
+                                   "busName": "com.canonical.test1",
+                                   "menuObjectPath": "/com/canonical/test1",
+                                   "actionsObjectPath": "/com/canonical/test1"
+                               });
+
+            var cachedObject2 = model.createObject(null,
+                               {
+                                   "busName": "com.canonical.test2",
+                                   "menuObjectPath": "/com/canonical/test2",
+                                   "actionsObjectPath": "/com/canonical/test2"
+                               });
+
+            verify(cachedObject.model !== cachedObject2.model);
+        }
+
+        function test_createSame() {
+            var cachedObject = model.createObject(null,
+                               {
+                                   "busName": "com.canonical.test3",
+                                   "menuObjectPath": "/com/canonical/test3",
+                                   "actionsObjectPath": "/com/canonical/test3"
+                               });
+
+            var cachedObject2 = model.createObject(null,
+                               {
+                                   "busName": "com.canonical.test3",
+                                   "menuObjectPath": "/com/canonical/test3",
+                                   "actionsObjectPath": "/com/canonical/test3"
+                               });
+
+            verify(cachedObject.model === cachedObject2.model);
+        }
+
+        // Tests that changing cached model data does not change the model path of others
+        function test_lp1328646() {
+            var cachedObject = model.createObject(null,
+                               {
+                                   "busName": "com.canonical.test4",
+                                   "menuObjectPath": "/com/canonical/test4",
+                                   "actionsObjectPath": "/com/canonical/test4"
+                               });
+
+            var cachedObject2 = model.createObject(null,
+                               {
+                                   "busName": "com.canonical.test4",
+                                   "menuObjectPath": "/com/canonical/test4",
+                                   "actionsObjectPath": "/com/canonical/test4"
+                               });
+
+            cachedObject.menuObjectPath = "/com/canonical/test5";
+            compare(cachedObject.model.menuObjectPath, "/com/canonical/test5");
+            compare(cachedObject2.model.menuObjectPath, "/com/canonical/test4");
+
+            verify(cachedObject.model !== cachedObject2.model);
+        }
+
+        function createAndDestroy(test) {
+            var cachedObject = model.createObject(null,
+                               {
+                                   "busName": "com.canonical."+test,
+                                   "menuObjectPath": "/com/canonical/"+test,
+                                   "actionsObjectPath": "/com/canonical/"+test
+                               });
+            var cachedObject2 = model.createObject(null,
+                               {
+                                   "busName": "com.canonical."+test,
+                                   "menuObjectPath": "/com/canonical/"+test,
+                                   "actionsObjectPath": "/com/canonical/"+test
+                               });
+            cachedObject.destroy();
+            return cachedObject2;
+        }
+
+        function test_destroyAllDeletesModel() {
+            createAndDestroy("test6");
+            doGC();
+            compare(Indicators.UnityMenuModelCache.contains("/com/canonical/test6"), false);
+        }
+
+        function test_destroyPartialKeepsModel() {
+            var model = createAndDestroy("test7");
+            doGC();
+            compare(Indicators.UnityMenuModelCache.contains("/com/canonical/test7"), true);
+        }
+    }
+}