git.iko.soy/unity8
on xenial help sign in
Fixed indicator model mock + tests.
53b142dNick Dedekind
tests/mocks/Unity/Indicators/CMakeLists.txt+1
compare with xenial
unifiedsplit
@@ -16,6 +16,7 @@ set(IndicatorsFakeQml_SOURCES
16 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp
16 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp
17 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp
17 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp
18 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp
18 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp
19+ fakeindicatorsmodel.cpp
19)
20)
20
21
21set(IndicatorsFakeQml_RESOURCES
22set(IndicatorsFakeQml_RESOURCES
tests/mocks/Unity/Indicators/IndicatorsModel.qml+3−5
@@ -17,12 +17,10 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import Unity.Indicators 0.1 as Indicators
18import Unity.Indicators 0.1 as Indicators
19
19
20−ListModel {
20+Indicators.FakeIndicatorsModel {
21
21
22− property var indicatorData : undefined
23−
24− function load() {
22+ function load(profile) {
25− clear();
23+ unload();
26
24
27 append({ "identifier": "indicator-fake1",
25 append({ "identifier": "indicator-fake1",
28 "position": 0,
26 "position": 0,
tests/mocks/Unity/Indicators/fakeindicatorsmodel.cppnew file+122
@@ -0,0 +1,122 @@
1+/*
2+ * Copyright 2014 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+#include "fakeindicatorsmodel.h"
21+#include "indicators.h"
22+
23+#include <paths.h>
24+
25+#include <QQmlContext>
26+#include <QQmlEngine>
27+#include <QDebug>
28+
29+FakeIndicatorsModel::FakeIndicatorsModel(QObject *parent)
30+ : QAbstractListModel(parent)
31+{
32+ QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
33+ QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
34+ QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));
35+}
36+
37+/*! \internal */
38+FakeIndicatorsModel::~FakeIndicatorsModel()
39+{
40+ unload();
41+}
42+
43+int FakeIndicatorsModel::count() const
44+{
45+ return rowCount();
46+}
47+
48+void FakeIndicatorsModel::load(const QString&)
49+{
50+}
51+
52+void FakeIndicatorsModel::unload()
53+{
54+ beginResetModel();
55+
56+ qDeleteAll(m_indicators);
57+ m_indicators.clear();
58+
59+ endResetModel();
60+}
61+
62+
63+void FakeIndicatorsModel::append(const QVariantMap& row)
64+{
65+ Indicator* new_row = new QHash<int, QVariant>();
66+ for (auto iter = row.begin(); iter != row.end(); ++iter )
67+ {
68+ int key = roleNames().key(iter.key().toUtf8(), -1);
69+ if (key != -1) {
70+ new_row->insert(key, iter.value());
71+ }
72+ }
73+
74+ beginInsertRows(QModelIndex(), m_indicators.count(), m_indicators.count());
75+
76+ m_indicators.append(new_row);
77+
78+ endInsertRows();
79+}
80+
81+QHash<int, QByteArray> FakeIndicatorsModel::roleNames() const
82+{
83+ static QHash<int, QByteArray> roles;
84+ if (roles.isEmpty())
85+ {
86+ roles[IndicatorsModelRole::Identifier] = "identifier";
87+ roles[IndicatorsModelRole::Position] = "position";
88+ roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
89+ roles[IndicatorsModelRole::PageSource] = "pageSource";
90+ roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
91+ }
92+ return roles;
93+}
94+
95+int FakeIndicatorsModel::columnCount(const QModelIndex &) const
96+{
97+ return 1;
98+}
99+
100+Q_INVOKABLE QVariant FakeIndicatorsModel::data(int row, int role) const
101+{
102+ return data(index(row, 0), role);
103+}
104+
105+QVariant FakeIndicatorsModel::data(const QModelIndex &index, int role) const
106+{
107+ if (!index.isValid() || index.row() >= m_indicators.size())
108+ return QVariant();
109+
110+ Indicator* indicator = m_indicators[index.row()];
111+ return indicator->value(role, QVariant());
112+}
113+
114+QModelIndex FakeIndicatorsModel::parent(const QModelIndex&) const
115+{
116+ return QModelIndex();
117+}
118+
119+int FakeIndicatorsModel::rowCount(const QModelIndex&) const
120+{
121+ return m_indicators.count();
122+}
tests/mocks/Unity/Indicators/fakeindicatorsmodel.hnew file+61
@@ -0,0 +1,61 @@
1+/*
2+ * Copyright 2014 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+#ifndef FAKE_INDICATORSMODEL_H
21+#define FAKE_INDICATORSMODEL_H
22+
23+#include <QAbstractListModel>
24+
25+class IndicatorsManager;
26+
27+class FakeIndicatorsModel : public QAbstractListModel
28+{
29+ Q_OBJECT
30+ Q_ENUMS(Roles)
31+ Q_PROPERTY(int count READ count NOTIFY countChanged)
32+public:
33+
34+ FakeIndicatorsModel(QObject *parent=0);
35+ ~FakeIndicatorsModel();
36+
37+ Q_INVOKABLE void load(const QString& profile);
38+ Q_INVOKABLE void unload();
39+
40+ Q_INVOKABLE void append(const QVariantMap& row);
41+
42+ Q_INVOKABLE QVariant data(int row, int role) const;
43+
44+ /* QAbstractItemModel */
45+ QHash<int, QByteArray> roleNames() const;
46+ int columnCount(const QModelIndex &parent = QModelIndex()) const;
47+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
48+ QModelIndex parent (const QModelIndex &index) const;
49+ int rowCount(const QModelIndex &parent = QModelIndex()) const;
50+
51+Q_SIGNALS:
52+ void countChanged();
53+
54+private:
55+ int count() const;
56+
57+ typedef QHash<int, QVariant> Indicator;
58+ QList<Indicator*> m_indicators;
59+};
60+
61+#endif // FAKE_INDICATORSMODEL_H
tests/mocks/Unity/Indicators/fakeplugin.cpp+3
@@ -23,6 +23,7 @@
23#include "fakeplugin.h"
23#include "fakeplugin.h"
24
24
25// local
25// local
26+#include "fakeindicatorsmodel.h"
26#include "indicators.h"
27#include "indicators.h"
27#include "menucontentactivator.h"
28#include "menucontentactivator.h"
28#include "unitymenumodelstack.h"
29#include "unitymenumodelstack.h"
@@ -32,6 +33,8 @@ void IndicatorsFakePlugin::registerTypes(const char * uri)
32{
33{
33 Q_INIT_RESOURCE(indicators_fake);
34 Q_INIT_RESOURCE(indicators_fake);
34
35
36+ qmlRegisterType<FakeIndicatorsModel>(uri, 0, 1, "FakeIndicatorsModel");
37+
35 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
38 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
36 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
39 qmlRegisterType<UnityMenuModelStack>(uri, 0, 1, "UnityMenuModelStack");
37 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
40 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
tests/qmltests/Panel/tst_IndicatorRow.qml+3−3
@@ -70,13 +70,13 @@ Item {
70 function test_set_current_item() {
70 function test_set_current_item() {
71 init_test();
71 init_test();
72 indicatorRow.setCurrentItemIndex(0);
72 indicatorRow.setCurrentItemIndex(0);
73− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake1", "Incorrect item at position 0");
73+ compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake1", "Incorrect item at position 0");
74
74
75 indicatorRow.setCurrentItemIndex(1);
75 indicatorRow.setCurrentItemIndex(1);
76− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake2", "Incorrect item at position 1");
76+ compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake2", "Incorrect item at position 1");
77
77
78 indicatorRow.setCurrentItemIndex(2);
78 indicatorRow.setCurrentItemIndex(2);
79− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake3", "Incorrect item at position 2");
79+ compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake3", "Incorrect item at position 2");
80 }
80 }
81
81
82 function test_highlight_data() {
82 function test_highlight_data() {
tests/qmltests/Panel/tst_MenuContent.qml+1−1
@@ -133,7 +133,7 @@ Item {
133 var menuIndex = i%menuCount;
133 var menuIndex = i%menuCount;
134
134
135 activate_content(menuIndex);
135 activate_content(menuIndex);
136− testTabObjectName = indicatorsModel.get(menuIndex).identifier;
136+ testTabObjectName = indicatorsModel.data(menuIndex, Indicators.IndicatorsModelRole.Identifier);
137 compare(tabs.selectedTabIndex, menuIndex, "Current tab index does not match selected tab index");
137 compare(tabs.selectedTabIndex, menuIndex, "Current tab index does not match selected tab index");
138 tryCompareFunction(selected_tab_equals_test_tab, true);
138 tryCompareFunction(selected_tab_equals_test_tab, true);
139 }
139 }