on xenial help sign in
fixed indicator tests
commita510c7f64c6f56736ce90159251e2e588ad1e58c authorNick Dedekind <nicholas.dedekind@gmail.com> dateMon 2 Sep 2013, 09:11 (13 years ago) parentf5c8353
5 files changed+30−69
plugins/Unity/Indicators/visibleindicatorsmodel.cpp+8−2 tests/mocks/Unity/Indicators/CMakeLists.txt+1 tests/mocks/Unity/Indicators/IndicatorsModel.qml+10−65 tests/mocks/Unity/Indicators/fakeplugin.cpp+2 tests/qmltests/Panel/tst_MenuContent.qml+9−2
plugins/Unity/Indicators/visibleindicatorsmodel.cpp+8−2
@@ -29,9 +29,15 @@ VisibleIndicatorsModel::VisibleIndicatorsModel(QObject *parent)
2929QHash<int, QByteArray> VisibleIndicatorsModel::roleNames() const
3030{
3131 static QHash<int, QByteArray> roles;
32− if (roles.isEmpty() && sourceModel())
32+ if (roles.isEmpty())
3333 {
34− roles = sourceModel()->roleNames();
34+ roles[IndicatorsModelRole::Identifier] = "identifier";
35+ roles[IndicatorsModelRole::Position] = "position";
36+ roles[IndicatorsModelRole::Title] = "title";
37+ roles[IndicatorsModelRole::Description] = "description";
38+ roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
39+ roles[IndicatorsModelRole::PageSource] = "pageSource";
40+ roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
3541 roles[IndicatorsModelRole::IsVisible] = "isVisible";
3642 }
3743 return roles;
tests/mocks/Unity/Indicators/CMakeLists.txt+1
@@ -13,6 +13,7 @@ set(IndicatorsFakeQml_SOURCES
1313 fakeplugin.cpp
1414 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/indicators.h
1515 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp
16+ ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp
1617)
1718
1819set(IndicatorsFakeQml_RESOURCES
tests/mocks/Unity/Indicators/IndicatorsModel.qml+10−65
@@ -33,8 +33,8 @@ ListModel {
3333 "description": "",
3434 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget1.qml",
3535 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page1.qml",
36− "indicatorProperties": "",
37− "isVisible": true});
36+ "indicatorProperties": ""
37+ });
3838
3939 append({ "identifier": "indicator-fake2",
4040 "priority": 1,
@@ -42,8 +42,8 @@ ListModel {
4242 "description": "",
4343 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget2.qml",
4444 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page2.qml",
45− "indicatorProperties": "",
46− "isVisible": true});
45+ "indicatorProperties": ""
46+ });
4747
4848 append({ "identifier": "indicator-fake3",
4949 "priority": 2,
@@ -51,8 +51,8 @@ ListModel {
5151 "description": "",
5252 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget3.qml",
5353 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page3.qml",
54− "indicatorProperties": "",
55− "isVisible": true});
54+ "indicatorProperties": ""
55+ });
5656
5757 append({ "identifier": "indicator-fake4",
5858 "priority": 3,
@@ -60,8 +60,8 @@ ListModel {
6060 "description": "",
6161 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget4.qml",
6262 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page4.qml",
63− "indicatorProperties": "",
64− "isVisible": true});
63+ "indicatorProperties": ""
64+ });
6565
6666 append({ "identifier": "indicator-fake5",
6767 "priority": 4,
@@ -69,62 +69,7 @@ ListModel {
6969 "description": "",
7070 "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget5.qml",
7171 "pageSource": "qrc:/tests/indciators/qml/fake_menu_page5.qml",
72− "indicatorProperties": "",
73− "isVisible": true});
72+ "indicatorProperties": ""
73+ });
7474 }
75−
76− function data(row, role) {
77− if (role == Indicators.IndicatorsModelRole.Identifier) {
78− return get(row).identifier;
79− }
80− else if (role == Indicators.IndicatorsModelRole.Priority) {
81− return get(row).priority;
82− }
83− else if (role == Indicators.IndicatorsModelRole.Title) {
84− return get(row).title;
85− }
86− else if (role == Indicators.IndicatorsModelRole.Description) {
87− return get(row).description;
88− }
89− else if (role == Indicators.IndicatorsModelRole.WidgetSource) {
90− return get(row).widgetSource;
91− }
92− else if (role == Indicators.IndicatorsModelRole.PageSource) {
93− return get(row).pageSource;
94− }
95− else if (role == Indicators.IndicatorsModelRole.IndicatorProperties) {
96− return get(row).indicatorProperties;
97− }
98− else if (role == Indicators.IndicatorsModelRole.IsVisible) {
99− return get(row).isVisible;
100− }
101− }
102−
103− function setData(row, value, role) {
104− if (role == Indicators.IndicatorsModelRole.Identifier) {
105− return set(row, {"identifier": value});
106− }
107− else if (role == Indicators.IndicatorsModelRole.Priority) {
108− return set(row, {"priority": value});
109− }
110− else if (role == Indicators.IndicatorsModelRole.Title) {
111− return set(row, {"title": value});
112− }
113− else if (role == Indicators.IndicatorsModelRole.Description) {
114− return set(row, {"description": value});
115− }
116− else if (role == Indicators.IndicatorsModelRole.WidgetSource) {
117− return set(row, {"widgetSource": value});
118− }
119− else if (role == Indicators.IndicatorsModelRole.PageSource) {
120− return set(row, {"pageSource": value});
121− }
122− else if (role == Indicators.IndicatorsModelRole.IndicatorProperties) {
123− return set(row, {"indicatorProperties": value});
124− }
125− else if (role == Indicators.IndicatorsModelRole.IsVisible) {
126− return set(row, {"isVisible": value});
127− }
128− }
129−
13075}
tests/mocks/Unity/Indicators/fakeplugin.cpp+2
@@ -25,12 +25,14 @@
2525// local
2626#include "indicators.h"
2727#include "menucontentactivator.h"
28+#include "visibleindicatorsmodel.h"
2829
2930void IndicatorsFakePlugin::registerTypes(const char * uri)
3031{
3132 Q_INIT_RESOURCE(indicators_fake);
3233
3334 qmlRegisterType<MenuContentActivator>(uri, 0, 1, "MenuContentActivator");
35+ qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");
3436
3537 qmlRegisterUncreatableType<MenuContentState>(uri, 0, 1, "MenuContentState", "Can't create MenuContentState class");
3638 qmlRegisterUncreatableType<ActionState>(uri, 0, 1, "ActionState", "Can't create ActionState class");
tests/qmltests/Panel/tst_MenuContent.qml+9−2
@@ -48,8 +48,15 @@ Item {
4848 id: menuContent
4949 indicatorsModel: indicatorsModel
5050 contentReleaseInterval: 50
51−
5251 height: parent.height - 50
52+
53+ visibleIndicators: {
54+ 'indicator-fake1': true,
55+ 'indicator-fake2': true,
56+ 'indicator-fake3': true,
57+ 'indicator-fake4': true,
58+ 'indicator-fake5': true
59+ }
5360 }
5461
5562 Rectangle {
@@ -134,7 +141,7 @@ Item {
134141 var menuIndex = i%menuCount;
135142
136143 activate_content(menuIndex);
137− testTabObjectName = indicatorsModel.data(menuIndex, Indicators.IndicatorsModelRole.Identifier);
144+ testTabObjectName = indicatorsModel.get(menuIndex).identifier;
138145 compare(tabs.selectedTabIndex, menuIndex, "Current tab index does not match selected tab index");
139146 tryCompareFunction(selected_tab_equals_test_tab, true);
140147 }