4d86fb7 · unity8 · git.iko.soy

on xenial help sign in

Fixed indicator model test

4d86fb7Nick Dedekind13 years ago

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

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

285 {

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

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

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

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

289 };

290 }

291 return defaultData(indicator, role);

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

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

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

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

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

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

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

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

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

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

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

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

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

78 IndicatorsModel model;

76 IndicatorsModel model;

79 model.setIndicatorData(map);

77 model.setIndicatorData(map);

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

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

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

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

88 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"));

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

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

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

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