Unity 8

Merge lp:~3v1n0/unity8/fake-indicators-model into lp:unity8

fake-indicators-model
Merge into trunk

Proposed by Marco Trevisan (Treviño) on 2016-06-15

Status:	Merged
Approved by:	Lukáš Tinkl on 2016-09-08
Approved revision:	2449
Merged at revision:	2647
Proposed branch:	lp:~3v1n0/unity8/fake-indicators-model
Merge into:	lp:unity8
Prerequisite:	lp:~3v1n0/unity8/indicators-client-load-fix
Diff against target:	1251 lines (+1141/-7) 4 files modified tests/mocks/Unity/Indicators/CMakeLists.txt (+1/-0) tests/mocks/Unity/Indicators/IndicatorsModel.qml (+32/-7) tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js (+1106/-0) tests/mocks/Unity/Indicators/fakeplugin.cpp (+2/-0)
To merge this branch:	bzr merge lp:~3v1n0/unity8/fake-indicators-model
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-09-09
Lukáš Tinkl (community)			Approve on 2016-09-08
Michał Sawicz			Needs Fixing on 2016-08-10
Albert Astals Cid (community)			Approve on 2016-08-08
Michael Terry		2016-06-15	Needs Fixing on 2016-06-30
Nick Dedekind		2016-06-15	Pending
Review via email: mp+297509@code.launchpad.net

Commit Message

Indicators, mocks: add fake indicators menuitem to populate mocks with different menu types

Also allow to use fake indicators model in IndicatorsClient

Description of the Change

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

Nope

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

Yes. make tryShell (or make tryMenuContent) is enough, or this will also allow to launch indicators-client with a fake data model when QML2_IMPORT_PATH points to the mocks path (i.e. builddir/tests/mocks:builddir/tests/utils/modules:builddir/plugins)

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

No debian change here

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

No UI change, although the indicators used in mocks will show some fake data.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-15:

FAILED: Continuous integration, rev:2445
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1489/
Executed test runs:
FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1985/console
FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2011/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1489/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-16:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1497/rebuild

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-06-30:

Looks like we're missing modelprinter.cpp and modelprinter.h

Michael Terry (mterry) on 2016-06-30:

review: Needs Fixing

Marco Trevisan (Treviño) (3v1n0) wrote on 2016-07-20:

> Looks like we're missing modelprinter.cpp and modelprinter.h

Actually they are already provided by unity8. I'm just ensuring they are added to the fake lib here.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-07-22:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1787/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-08-08:

Text conflict in tests/mocks/Unity/Indicators/IndicatorsModel.qml
1 conflicts encountered.

Marco Trevisan (Treviño) (3v1n0) wrote on 2016-08-08:

And... Fixed :-)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-08:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1903/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-08-08:

* 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.
Yes, except broken yakkety

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-10:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1928/rebuild

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2016-08-10:

Failing tests:

qmltestrunner.IndicatorItemRow::test_validCurrentItem
qmltestrunner.IndicatorsBar::test_expandSelectedItem
qmltestrunner.IndicatorsMenu::test_swipeForCurrentItem
qmltestrunner.Panel::test_drag_show

review: Needs Fixing

Lukáš Tinkl (lukas-kde) wrote on 2016-08-10:

Likely "conflicting" with https://code.launchpad.net/~lukas-kde/unity8/keyboardIndicator/+merge/297920

lp:~3v1n0/unity8/fake-indicators-model updated on 2016-09-08

2448. By Marco Trevisan (Treviño) on 2016-09-08

Merging with trunk

2449. By Marco Trevisan (Treviño) on 2016-09-08

fakeindicatorsmodeldata.js: mark indicator-files always visible

This fixes tests using mocks

Marco Trevisan (Treviño) (3v1n0) wrote on 2016-09-08:

Tests should run properly here... Let's wait CI confirmation.

Lukáš Tinkl (lukas-kde) wrote on 2016-09-08:

Yup, tests work fine now, thanks!

* 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.

Nope. not yet

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-09-09:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2134/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Marco Trevisan (Treviño)

Mohammad Rakibul Hasan

Unity Team

 === modified file 'tests/mocks/Unity/Indicators/CMakeLists.txt'
 --- tests/mocks/Unity/Indicators/CMakeLists.txt	2015-03-02 14:42:27 +0000
 +++ tests/mocks/Unity/Indicators/CMakeLists.txt	2016-09-08 16:44:47 +0000
@@ -16,6 +16,7 @@
      fakeunitymenumodelcache.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h
      ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp
++    ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/modelprinter.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/sharedunitymenumodel.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelcache.cpp
      ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp
 === modified file 'tests/mocks/Unity/Indicators/IndicatorsModel.qml'
 --- tests/mocks/Unity/Indicators/IndicatorsModel.qml	2016-07-30 16:15:23 +0000
 +++ tests/mocks/Unity/Indicators/IndicatorsModel.qml	2016-09-08 16:44:47 +0000
@@ -18,6 +18,7 @@
  import Unity.Indicators 0.1 as Indicators
  import Unity.InputInfo 0.1
  import AccountsService 0.1
++import "fakeindicatorsmodeldata.js" as FakeIndicators
  Indicators.FakeIndicatorsModel {
      id: root
@@ -60,7 +61,7 @@
+             }
          },
+         {
--            "identifier": "fake-indicator-sound",
++            "identifier": "fake-indicator-files",
              "indicatorProperties": {
                  "enabled": true,
                  "busName": "com.canonical.indicators.fake4",
@@ -69,7 +70,7 @@
+             }
          },
+         {
--            "identifier": "fake-indicator-power",
++            "identifier": "fake-indicator-sound",
              "indicatorProperties": {
                  "enabled": true,
                  "busName": "com.canonical.indicators.fake5",
@@ -78,7 +79,7 @@
+             }
          },
+         {
--            "identifier": "fake-indicator-datetime",
++            "identifier": "fake-indicator-power",
              "indicatorProperties": {
                  "enabled": true,
                  "busName": "com.canonical.indicators.fake6",
@@ -87,13 +88,22 @@
+             }
          },
+         {
--            "identifier": "fake-indicator-session",
++            "identifier": "fake-indicator-datetime",
              "indicatorProperties": {
                  "enabled": true,
                  "busName": "com.canonical.indicators.fake7",
                  "menuObjectPath": "/com/canonical/indicators/fake7",
                  "actionsObjectPath": "/com/canonical/indicators/fake7"
+             }
++        },
++        {
++            "identifier": "fake-indicator-session",
++            "indicatorProperties": {
++                "enabled": true,
++                "busName": "com.canonical.indicators.fake8",
++                "menuObjectPath": "/com/canonical/indicators/fake8",
++                "actionsObjectPath": "/com/canonical/indicators/fake8"
++            }
+         }
+     ]
@@ -133,21 +143,26 @@
                                                                   "",
                                                                   [ "image://theme/messages-new" ]));
          Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake4",
++                                           getUnityMenuModelData("fake-indicator-files",
++                                                                 "Files (F)",
++                                                                 "",
++                                                                 [ "image://theme/transfer-progress" ]));
++        Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake5",
                                             getUnityMenuModelData("fake-indicator-sound",
                                                                   "Sound (F)",
                                                                   "",
                                                                   [ "image://theme/audio-volume-high" ]));
--        Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake5",
++        Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake6",
                                             getUnityMenuModelData("fake-indicator-power",
                                                                   "Battery (F)",
                                                                   "",
                                                                   [ "image://theme/battery-020" ]));
--        Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake6",
++        Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake7",
                                             getUnityMenuModelData("fake-indicator-datetime",
                                                                   "Upcoming Events (F)",
                                                                   "12:04",
                                                                   []));
--        Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake7",
++        Indicators.UnityMenuModelCache.setCachedModelData("/com/canonical/indicators/fake8",
                                             getUnityMenuModelData("fake-indicator-session",
                                                                   "System (F)",
                                                                   "",
@@ -155,6 +170,16 @@
+     }
      function getUnityMenuModelData(identifier, title, label, icons) {
++        var menudata = FakeIndicators.fakeMenuData[identifier];
++
++        if (menudata !== undefined) {
++            var rootState = menudata[0]["rowData"].actionState;
++            rootState.title = title;
++            rootState.label = label;
++            rootState.icons = icons;
++            return menudata;
++        }
++
          var root = [{
              "rowData": {                // 1
                  "label": "",
 === added file 'tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js'
 --- tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/Indicators/fakeindicatorsmodeldata.js	2016-09-08 16:44:47 +0000
@@ -0,0 +1,1106 @@
++var usageScenario = (typeof shell != 'undefined') ? shell.usageScenario : "desktop";
++
++var fakeMenuData = {
++    "fake-indicator-messages": [
++        {
++            "rowData": {
++                "action": "indicator._header",
++                "actionState": {
++                    "icons": [ "image://theme/messages-new" ],
++                    "label": "",
++                    "title": "Messages (F)",
++                    "visible": true
++                },
++                "icon": "",
++                "isCheck": false,
++                "isRadio": false,
++                "isSeparator": false,
++                "isToggled": false,
++                "label": "",
++                "sensitive": true,
++                "type": "com.canonical.indicator.root"
++            },
++            "submenu": [
++                {
++                    "rowData": {
++                        "label": "There's an updated system image.",
++                        "sensitive": true,
++                        "isSeparator": false,
++                        "icon": "file:///usr/share/ubuntu/settings/system/icons/settings-system-update.svg",
++                        "type": "com.canonical.indicator.messages.messageitem",
++                        "ext": {
++                                "icon": "file:///usr/share/ubuntu/settings/system/icons/settings-system-update.svg",
++                                "xCanonicalAppIcon": "file:///usr/share/ubuntu/settings/system/system-settings.png",
++                                "xCanonicalMessageActions": null,
++                                "xCanonicalText": "Tap to open the system updater.",
++                                "xCanonicalTime": ((new Date).getTime() - 350 * 1000) * 1000,
++                        },
++                        "action": "indicator.ubuntu-system-settings",
++                        "actionState": {},
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isToggled": false,
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.telephony-service-sms.msg.MSG_ID",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "file:///usr/share/telephony-service/assets/avatar-default@18.png",
++                        "type": "com.canonical.indicator.messages.messageitem",
++                        "ext": {
++                            "icon": "file:///usr/share/telephony-service/assets/avatar-default@18.png",
++                            "xCanonicalAppIcon": "image://theme/telephony-service-message",
++                            "xCanonicalMessageActions": "",
++                            "xCanonicalText": "This is a message sent to an awesome Ubuntu phone.",
++                            "xCanonicalTime": ((new Date).getTime() - 35 * 1000) * 1000
++                        },
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "+44391234567 - [SIM 1]",
++                        "sensitive": true
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.remove-all",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Clear All",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.button"
++                    }
++                },
++            ]
++        }
++    ],
++
++    "fake-indicator-session": [
++        {
++            "rowData": {
++                "action": "indicator._header",
++                "actionState": {
++                    "icons": [],
++                    "label": "",
++                    "title": "Session (F)",
++                    "visible": usageScenario == "desktop"
++                },
++                "icon": "",
++                "isCheck": false,
++                "isRadio": false,
++                "isSeparator": false,
++                "isToggled": false,
++                "label": "",
++                "sensitive": true,
++                "type": "com.canonical.indicator.root"
++            },
++            "submenu": [
++                {
++                    "rowData": {
++                        "action": "indicator.about",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "About this " + usageScenario,
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.help",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Ubuntu Help",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": true,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.settings",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "System Settings...",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": true,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.switch-to-screensaver",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Lock",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.switch-to-guest",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Guest Session",
++                        "sensitive": true,
++                        "type": "indicator.guest-menu-item"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.switch-to-user",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": true,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Marco",
++                        "sensitive": true,
++                        "type": "indicator.user-menu-item"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.switch-to-user",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": true,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Unity8",
++                        "sensitive": true,
++                        "type": "indicator.user-menu-item"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": true,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.logout",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Logout...",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": true,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.suspend",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Suspend",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.power-off",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Power off...",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                }
++            ]
++        }
++    ],
++
++    "fake-indicator-power": [
++        {
++            "rowData": {
++                "action": "indicator._header",
++                "actionState": {
++                    "icons": [ "image://theme/battery-020" ],
++                    "label": "",
++                    "title": "Battery (F)",
++                    "visible": true
++                },
++                "icon": "",
++                "isCheck": false,
++                "isRadio": false,
++                "isSeparator": false,
++                "isToggled": false,
++                "label": "",
++                "sensitive": true,
++                "type": "com.canonical.indicator.root"
++            },
++            "submenu": [
++                {
++                    "rowData": {
++                        "action": "indicator.activate-statistics",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "image://theme/battery-full-charged-symbolic",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Battery (full charged)",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.basic"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.activate-statistics",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "image://theme/battery-100",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Battery",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.basic"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": true,
++                        "isToggled": false,
++                        "label": " ",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.show-time",
++                        "actionState": false,
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": true,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Show time on menubar",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.show-percentage",
++                        "actionState": false,
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": true,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Show percentage on menubar",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.activate-settings",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Power Settings...",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                }
++            ]
++        }
++    ],
++
++    "fake-indicator-sound": [
++        {
++            "rowData": {
++                "action": "indicator._header",
++                "actionState": {
++                    "icons": [ "image://theme/audio-volume-high" ],
++                    "label": "",
++                    "title": "Sound (F)",
++                    "visible": true
++                },
++                "icon": "",
++                "isCheck": false,
++                "isRadio": false,
++                "isSeparator": false,
++                "isToggled": false,
++                "label": "",
++                "sensitive": true,
++                "type": "com.canonical.indicator.root"
++            },
++            "submenu": [
++                {
++                    "rowData": {
++                        "action": "indicator.silent-mode",
++                        "actionState": true,
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": true,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Silent Mode",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.switch"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.volume",
++                        "actionState": 0.35,
++                        "ext": {
++                            "maxIcon": "image://theme/audio-volume-high-panel",
++                            "maxValue": 1,
++                            "minIcon": "image://theme/audio-volume-low-zero-panel",
++                            "minValue": 0,
++                            "xCanonicalSyncAction": "indicator.volume-sync"
++                        },
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": true,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Volume",
++                        "sensitive": true,
++                        "type": "com.canonical.unity.slider"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": true,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.mediaplayer-app.desktop",
++                        "actionState": {
++                            "running": true,
++                            "state": "Stopped"
++                        },
++                        "ext": {},
++                        "icon": "file:///usr/share/mediaplayer-app/mediaplayer-app.png",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Media Player",
++                        "sensitive": false,
++                        "type": "com.canonical.unity.media-player"
++                    }
++                },
++                {
++                    "rowData": {
++                        "actionState": {},
++                        "ext": {
++                            "action": ""
++                        },
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": "com.canonical.unity.playback-item"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.phone-settings",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Sound Settings…",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                }
++            ]
++        }
++    ],
++
++
++   "fake-indicator-datetime": [
++        {
++            "rowData": {
++                "action": "indicator._header",
++                "actionState": {
++                    "icons": [],
++                    "label": "16.10",
++                    "title": "Upcoming Events (F)",
++                    "visible": true
++                },
++                "icon": "",
++                "isCheck": false,
++                "isRadio": false,
++                "isSeparator": false,
++                "isToggled": false,
++                "label": "",
++                "sensitive": true,
++                "type": "com.canonical.indicator.root"
++            },
++            "submenu": [
++                {
++                    "rowData": {
++                        "action": "indicator.phone.open-calendar-app",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "image://theme/calendar",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Saturday, 31 December 2016",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "fake-indicator-datetime",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": true,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.phone.open-alarm-app",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "image://theme/clock",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Clock",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.phone.open-appointment",
++                        "actionState": {},
++                        "ext": {
++                            "xCanonicalColor": Qt.rgba(32,74,135,1),
++                            "xCanonicalTime": (new Date).getTime() / 1000 + 35000
++                        },
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Finish Indicator mocks",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.appointment"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.phone.open-appointment",
++                        "actionState": {},
++                        "ext": {
++                            "xCanonicalColor": Qt.rgba(32,74,135,1),
++                            "xCanonicalTime": (new Date).getTime() / 1000 + 50474
++                        },
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Implement Desktop version",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.appointment"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.phone.open-appointment",
++                        "actionState": {},
++                        "ext": {
++                            "xCanonicalColor": Qt.rgba(32,74,135,1),
++                            "xCanonicalTime": (new Date).getTime() / 1000 + 385000
++                        },
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Ubuntu drinks event",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.appointment"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.phone.open-appointment",
++                        "actionState": {},
++                        "ext": {
++                            "xCanonicalColor": Qt.rgba(32,74,135,1),
++                            "xCanonicalTime": (new Date).getTime() / 1000 + 3500050
++                        },
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Land unity8",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.appointment"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": true,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.phone.open-settings-app",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Date and Time settings…",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                }
++            ]
++        }
++    ],
++
++
++    "fake-indicator-files": [
++        {
++            "rowData": {
++                "action": "indicator._header",
++                "actionState": {
++                    "icons": [],
++                    "label": "Files",
++                    "title": "Files",
++                    "visible": true
++                },
++                "icon": "",
++                "isCheck": false,
++                "isRadio": false,
++                "isSeparator": false,
++                "isToggled": false,
++                "label": "",
++                "sensitive": true,
++                "type": "com.canonical.indicator.root"
++            },
++            "submenu": [
++                {
++                    "rowData": {
++                        "action": "indicator.pause-all",
++                        "actionState": {},
++                        "ext": {
++                            "xCanonicalExtraLabel": "Pause all"
++                        },
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.button-section"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.activate-transfer",
++                        "actionState": {},
++                        "ext": {
++                            "xCanonicalUid": 1003
++                        },
++                        "icon": "file:///usr/share/webbrowser-app/webbrowser-app.png",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Ubuntu daily.iso",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.transfer"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": true,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.clear-all",
++                        "actionState": {},
++                        "ext": {
++                            "xCanonicalExtraLabel": "Clear all"
++                        },
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Successful Transfers",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.button-section"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.activate-transfer",
++                        "actionState": {},
++                        "ext": {
++                            "xCanonicalUid": 1002
++                        },
++                        "icon": "file:///usr/share/webbrowser-app/webbrowser-app.png",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Ubuntu Guide.pdf",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.transfer"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.activate-transfer",
++                        "actionState": {},
++                        "ext": {
++                            "xCanonicalUid": 1001
++                        },
++                        "icon": "file:///usr/share/webbrowser-app/webbrowser-app.png",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Unity8 Hacking.pdf",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.transfer"
++                    }
++                }
++            ]
++        }
++    ],
++
++    "fake-indicator-network": [
++        {
++            "rowData": {
++                "action": "indicator._header",
++                "actionState": {
++                    "icons": [],
++                    "label": "",
++                    "title": "Network",
++                    "visible": true
++                },
++                "icon": "",
++                "isCheck": false,
++                "isRadio": false,
++                "isSeparator": false,
++                "isToggled": false,
++                "label": "",
++                "sensitive": true,
++                "type": "com.canonical.indicator.root"
++            },
++            "submenu": [
++                {
++                    "rowData": {
++                        "action": "indicator.airplane.enabled",
++                        "actionState": false,
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": true,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Flight Mode",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.switch"
++                    }
++                },
++                /* Anything to see here, since no fake modem actions are implemented
++                {
++                    "rowData": {
++                        "actionState": false,
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": true,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "actionState": false,
++                        "ext": {
++                            "xCanonicalModemConnectivityIconAction": "indicator.modem.1::connectivity-icon",
++                            "xCanonicalModemLockedAction": "indicator.modem.1::locked",
++                            "xCanonicalModemRoamingAction": "indicator.modem.1::roaming",
++                            "xCanonicalModemSimIdentifierLabelAction": "indicator.modem.1::sim-identifier-label",
++                            "xCanonicalModemStatusIconAction": "indicator.modem.1::status-icon",
++                            "xCanonicalModemStatusLabelAction": "indicator.modem.1::status-label"
++                        },
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.network.modeminfoitem",
++                        "visible": false
++                    }
++                },
++                */
++                {
++                    "rowData": {
++                        "action": "indicator.wifi.enable",
++                        "actionState": true,
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": true,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": true,
++                        "label": "Wi-Fi",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.switch"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": true,
++                        "isToggled": false,
++                        "label": "",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.accesspoint.1",
++                        "actionState": true,
++                        "ext": {
++                            "xCanonicalWifiApIsAdhoc": 0,
++                            "xCanonicalWifiApIsSecure": 1,
++                            "xCanonicalWifiApStrengthAction": "indicator.accesspoint.1::strength"
++                        },
++                        "icon": "",
++                        "isCheck": true,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": true,
++                        "label": "Canonical",
++                        "sensitive": true,
++                        "type": "unity.widgets.systemsettings.tablet.accesspoint"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.accesspoint.2",
++                        "actionState": false,
++                        "ext": {
++                            "xCanonicalWifiApIsAdhoc": 0,
++                            "xCanonicalWifiApIsSecure": 1,
++                            "xCanonicalWifiApStrengthAction": "indicator.accesspoint.2::strength"
++                        },
++                        "icon": "",
++                        "isCheck": true,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Ubuntu",
++                        "sensitive": true,
++                        "type": "unity.widgets.systemsettings.tablet.accesspoint"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.accesspoint.3",
++                        "actionState": false,
++                        "ext": {
++                            "xCanonicalWifiApIsAdhoc": 0,
++                            "xCanonicalWifiApIsSecure": 0,
++                            "xCanonicalWifiApStrengthAction": "indicator.accesspoint.3::strength"
++                        },
++                        "icon": "",
++                        "isCheck": true,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Linux",
++                        "sensitive": true,
++                        "type": "unity.widgets.systemsettings.tablet.accesspoint"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.accesspoint.4",
++                        "actionState": false,
++                        "ext": {
++                            "xCanonicalWifiApIsAdhoc": 0,
++                            "xCanonicalWifiApIsSecure": 0,
++                            "xCanonicalWifiApStrengthAction": "indicator.accesspoint.4::strength"
++                        },
++                        "icon": "",
++                        "isCheck": true,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "for Human Beings",
++                        "sensitive": true,
++                        "type": "unity.widgets.systemsettings.tablet.accesspoint"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.wifi.settings",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Wi-Fi settings…",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                }
++            ]
++        }
++    ],
++
++    "fake-indicator-bluetooth": [
++        {
++            "rowData": {
++                "action": "indicator._header",
++                "actionState": {
++                    "icons": [],
++                    "label": "",
++                    "title": "Network",
++                    "visible": true
++                },
++                "icon": "",
++                "isCheck": false,
++                "isRadio": false,
++                "isSeparator": false,
++                "isToggled": false,
++                "label": "",
++                "sensitive": true,
++                "type": "com.canonical.indicator.root"
++            },
++            "submenu": [
++                {
++                    "rowData": {
++                        "action": "indicator.bluetooth.enable",
++                        "actionState": true,
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": true,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": true,
++                        "label": "Bluetooth",
++                        "sensitive": true,
++                        "type": "com.canonical.indicator.switch"
++                    }
++                },
++                {
++                    "rowData": {
++                        "action": "indicator.bluetooth.settings",
++                        "actionState": {},
++                        "ext": {},
++                        "icon": "",
++                        "isCheck": false,
++                        "isRadio": false,
++                        "isSeparator": false,
++                        "isToggled": false,
++                        "label": "Bluetooth settings…",
++                        "sensitive": true,
++                        "type": ""
++                    }
++                }
++            ]
++        }
++    ]
++}
 === modified file 'tests/mocks/Unity/Indicators/fakeplugin.cpp'
 --- tests/mocks/Unity/Indicators/fakeplugin.cpp	2015-01-20 16:21:07 +0000
 +++ tests/mocks/Unity/Indicators/fakeplugin.cpp	2016-09-08 16:44:47 +0000
@@ -29,6 +29,7 @@
  #include "sharedunitymenumodel.h"
  #include "fakeunitymenumodelcache.h"
  #include "unitymenumodelstack.h"
++#include "modelprinter.h"
  #include <unitymenumodel.h>
@@ -49,6 +50,7 @@
      qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
      qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
      qmlRegisterType<SharedUnityMenuModel>(uri, 0, 1, "SharedUnityMenuModel");
++    qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");
      qmlRegisterSingletonType<FakeUnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);