@@ -29,14 +29,14 @@ Item {
2929 id: page
3030
3131 anchors.fill: parent
32− contentActive: true
3332
3433 menuModel: UnityMenuModel {}
3534 busName: "test"
3635 actionsObjectPath: "test"
3736 menuObjectPath: "test"
3837
39− rootMenuType: ""
38+ identifier: "test-indicator"
39+ rootMenuType: "com.canonical.indicator.root"
4040 }
4141
4242 property var fullMenuData: [{
@@ -117,13 +117,8 @@ Item {
117117 name: "DefaultIndicatorPage"
118118
119119 function init() {
120− page.stop();
121120 var mainMenu = findChild(page, "mainMenu");
122− verify(mainMenu.model === undefined);
123−
124− page.rootMenuType = "com.canonical.indicator.root";
125− page.start();
126−
121+ page.menuModel.modelData = [];
127122 verify(mainMenu.model !== null);
128123 }
129124
@@ -157,20 +152,5 @@ Item {
157152 var mainMenu = findChild(page, "mainMenu");
158153 tryCompare(mainMenu, "count", data.expectedCount);
159154 }
160−
161− function test_empty_data() {
162− return [
163− { tag: "EmptyNoData", modelData: [], visible: true},
164− { tag: "EmptySubmenu", modelData: emptySubMenuData, visible: true},
165− { tag: "NotEmpty", modelData: fullMenuData, visible: false},
166− ]
167− }
168−
169− function test_empty(data) {
170− page.menuModel.modelData = data.modelData;
171−
172− var emptyLabel = findChild(page, "emptyLabel");
173− tryCompare(emptyLabel, "visible", data.visible);
174− }
175155 }
176156}