4d86fb7 · unity8 · git.iko.soy

git.iko.soy/unity8

Fixed indicator model test

commit4d86fb793aa64756c1c2dcc63295059f2f16b84d authorNick Dedekind <nicholas.dedekind@gmail.com> dateTue 24 Sep 2013, 11:20 (13 years ago) parent59f6b4d

2 files changed+2−4

compare with xenial

unifiedsplit

plugins/Unity/Indicators/indicatorsmodel.cpp+1−1 tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp+1−3

plugins/Unity/Indicators/indicatorsmodel.cpp+1−1

@@ -285,7 +285,7 @@ QVariant IndicatorsModel::indicatorData(const Indicator::Ptr& indicator, int rol

285285 {

286286 QVariantMap data = m_parsed_indicator_data[indicator->identifier()];

287287 if (data.contains(roleNames()[role])) {

288− data[roleNames()[role]];

288+ return data[roleNames()[role]];

289289 };

290290 }

291291 return defaultData(indicator, role);

tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp+1−3

@@ -69,11 +69,9 @@ private Q_SLOTS:

6969 QVariantMap map1; map1["title"] = "fake1";

7070 QVariantMap map2; map2["title"] = "fake2";

7171 QVariantMap map3; map3["title"] = "fake3";

72− QVariantMap map4; map4["title"] = "fake4";

7372 map["indicator-fake1"] = map1;

7473 map["indicator-fake2"] = map2;

7574 map["indicator-fake3"] = map3;

76− map["indicator-fake4"] = map4;

7775

7876 IndicatorsModel model;

7977 model.setIndicatorData(map);

@@ -88,7 +86,7 @@ private Q_SLOTS:

8886 QCOMPARE(model.data(0, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake3"));

8987

9088 QCOMPARE(model.data(1, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake4"));

91− QCOMPARE(model.data(1, IndicatorsModelRole::Title).toString(), QString("fake4"));

89+ QCOMPARE(model.data(1, IndicatorsModelRole::Title).toString(), QString("indicator-fake4"));

9290 QCOMPARE(model.data(1, IndicatorsModelRole::Position).toInt(), 2);

9391 QCOMPARE(model.data(1, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake4"));

9492