git.iko.soy/unity8
on xenial help sign in
merged with shared
8b2d4f1Nick Dedekind
tests/mocks/Unity/Indicators/fakeunitymenumodelcache.cpp+1−4
compare with xenial
unifiedsplit
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2014 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
5 * it under the terms of the GNU Lesser General Public License as published by
@@ -12,9 +12,6 @@
12 *
12 *
13 * You should have received a copy of the GNU Lesser General Public License
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Nick Dedekind <nick.dedekind@canonical.com>
18 */
15 */
19
16
20#include "fakeunitymenumodelcache.h"
17#include "fakeunitymenumodelcache.h"
tests/mocks/Unity/Indicators/fakeunitymenumodelcache.h+1−4
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013 Canonical Ltd.
2+ * Copyright 2014 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
5 * it under the terms of the GNU Lesser General Public License as published by
@@ -12,9 +12,6 @@
12 *
12 *
13 * You should have received a copy of the GNU Lesser General Public License
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Nick Dedekind <nick.dedekind@canonical.com>
18 */
15 */
19
16
20#ifndef FAKEUNITYMENUMODELCACHE_H
17#ifndef FAKEUNITYMENUMODELCACHE_H
tests/qmltests/Panel/tst_IndicatorPage.qml+7−7
@@ -25,7 +25,7 @@ Item {
25 width: units.gu(40)
25 width: units.gu(40)
26 height: units.gu(70)
26 height: units.gu(70)
27
27
28− IndicatorPage {
28+ IndicatorPage {
29 id: page
29 id: page
30 anchors.fill: parent
30 anchors.fill: parent
31
31
@@ -109,12 +109,12 @@ Item {
109 "submenu": []
109 "submenu": []
110 }]; // end row 1
110 }]; // end row 1
111
111
112− function initializeMenuData(data) {
112+ function initializeMenuData(data) {
113− Indicators.UnityMenuModelCache.setCachedModelData("com.canonical.indicator.test",
113+ Indicators.UnityMenuModelCache.setCachedModelData("com.canonical.indicator.test",
114− "/com/canonical/indicator/test",
114+ "/com/canonical/indicator/test",
115− "/com/canonical/indicator/test",
115+ "/com/canonical/indicator/test",
116− data);
116+ data);
117− }
117+ }
118
118
119 UT.UnityTestCase {
119 UT.UnityTestCase {
120 name: "IndicatorPage"
120 name: "IndicatorPage"