on xenial help sign in
fixed tests
commit30bfc5a6542fa8d5602dec5c773e224b91cdebe5 authorNick Dedekind <nicholas.dedekind@gmail.com> dateFri 27 Jun 2014, 10:16 (12 years ago) parent2d4caa6
5 files changed+5−43
qml/Panel/Indicators/IndicatorBase.qml+3−4 tests/mocks/Unity/Indicators/IndicatorBase.qml−38 tests/mocks/Unity/Indicators/qmldir−1 tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml+1 tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml+1
qml/Panel/Indicators/IndicatorBase.qml+3−4
@@ -18,8 +18,7 @@
1818 */
1919
2020import QtQuick 2.0
21−import QMenuModel 0.1 as QMenuModel
22−import Unity.Indicators 0.1 as Indicators
21+import Unity.Indicators 0.1
2322
2423Item {
2524 id: indicatorItem
@@ -36,14 +35,14 @@ Item {
3635
3736 property alias menuModel: cachedModel.model
3837
39− Indicators.CachedUnityMenuModel {
38+ CachedUnityMenuModel {
4039 id: cachedModel
4140 busName: indicatorItem.busName
4241 actionsObjectPath: indicatorItem.actionsObjectPath
4342 menuObjectPath: indicatorItem.deviceMenuObjectPath
4443 }
4544
46− property var rootActionState: Indicators.RootActionState {
45+ property RootActionState rootActionState: RootActionState {
4746 menu: menuModel
4847 onUpdated: indicatorItem.rootActionStateChanged()
4948 }
tests/mocks/Unity/Indicators/IndicatorBase.qmldeleted−38
@@ -1,38 +0,0 @@
1−/*
2− * Copyright 2013 Canonical Ltd.
3− *
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
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU Lesser General Public License for more details.
12− *
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/>.
15− *
16− * Authors:
17− * Nick Dedekind <nick.dedekind@canonical.com>
18− */
19−
20−import QtQuick 2.0
21−import QMenuModel 0.1
22−
23−Item {
24− id: indicatorBase
25−
26− //const
27− property string busName
28− property string actionsObjectPath
29− property string menuObjectPath
30− property string rootMenuType: "com.canonical.indicator.root"
31− property string deviceMenuObjectPath: menuObjectPath
32−
33− property var menuModel: UnityMenuModel {}
34−
35− property RootActionState rootActionState: RootActionState {
36− onUpdated: indicatorBase.rootActionStateChanged()
37− }
38−}
tests/mocks/Unity/Indicators/qmldir−1
@@ -3,7 +3,6 @@ plugin IndicatorsFakeQml
33typeinfo Indicators.qmltypes
44
55CachedUnityMenuModel 0.1 CachedUnityMenuModel.qml
6−IndicatorBase 0.1 IndicatorBase.qml
76IndicatorsModel 0.1 IndicatorsModel.qml
87FakeMenuPage 0.1 FakeMenuPage.qml
98RootActionState 0.1 RootActionState.qml
tests/qmltests/Panel/Indicators/tst_DefaultIndicatorPage.qml+1
@@ -31,6 +31,7 @@ Item {
3131 anchors.fill: parent
3232 contentActive: true
3333
34+ menuModel: UnityMenuModel {}
3435 busName: "test"
3536 actionsObjectPath: "test"
3637 menuObjectPath: "test"
tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml+1
@@ -33,6 +33,7 @@ Item {
3333 top: parent.top
3434 }
3535
36+ menuModel: UnityMenuModel {}
3637 busName: "test"
3738 actionsObjectPath: "test"
3839 deviceMenuObjectPath: "test"