3dbd58b · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

A test that failed with the old code

3dbd58bAlbert Astals12 years ago

tests/mocks/Unity/fake_categories.cpp+94−136

compare with xenial

unifiedsplit

@@ -29,25 +29,12 @@ Categories::Categories(int category_count, QObject* parent)

30int Categories::rowCount(const QModelIndex& /*parent*/) const

31{

32− return m_category_count + m_specialCategories.count();

32+ return m_category_count;

33}

35−void Categories::addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject)

35+void Categories::addSpecialCategory(QString const& /*categoryId*/, QString const& /*name*/, QString const& /*icon*/, QString const& /*rawTemplate*/, QObject* /*countObject*/)

36{

37− CategoryData catData;

37+ qFatal("Using un-implemented Categories::addSpecialCategory");

38− catData.categoryId = categoryId;

39− catData.name = name;

40− catData.icon = icon;

41− catData.rawTemplate = rawTemplate;

42− catData.countObject = countObject;

43−

44− beginInsertRows(QModelIndex(), 0, 0);

45− m_specialCategories.prepend(catData);

46− endInsertRows();

47−

48− if (countObject) {

49− connect(countObject, SIGNAL(countChanged()), this, SLOT(countChanged()));

50− }

51}

38}

53bool Categories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)

40bool Categories::overrideCategoryJson(QString const& /* categoryId */, QString const& /* json */)

@@ -55,23 +42,6 @@ bool Categories::overrideCategoryJson(QString const& /* categoryId */, QString c

55 qFatal("Using un-implemented Categories::overrideCategoryJson");

42 qFatal("Using un-implemented Categories::overrideCategoryJson");

56}

43}

58−void Categories::countChanged()

59−{

60− QObject* countObject = sender();

61−

62− for (int i = 0; i < m_specialCategories.count(); ++i) {

63− const CategoryData &catData = m_specialCategories.at(i);

64− if (catData.countObject == countObject) {

65− QVector<int> roles;

66− roles.append(RoleCount);

67−

68− QModelIndex changedIndex(index(i));

69− dataChanged(changedIndex, changedIndex, roles);

70− break;

71− }

72− }

73−}

74−

75QVariant

45QVariant

76Categories::data(const QModelIndex& index, int role) const

46Categories::data(const QModelIndex& index, int role) const

77{

47{

@@ -79,115 +49,74 @@ Categories::data(const QModelIndex& index, int role) const

79 return QVariant();

49 return QVariant();

80 }

50 }

82− ResultsModel *resultsModel = m_resultsModels[index.row()];

52+ ResultsModel *resultsModel = resultModel(index.row());

83− if (!resultsModel) {

84− resultsModel = new ResultsModel(15, index.row());

85− m_resultsModels[index.row()] = resultsModel;

86− }

87− if (index.row() < m_specialCategories.count()) {

88− const CategoryData &catData = m_specialCategories.at(index.row());

89− switch (role) {

53+ switch (role) {

90− case RoleCategoryId:

54+ case RoleCategoryId:

91− return catData.categoryId;

55+ return QString("%1").arg(index.row());

92− case RoleName:

56+ case RoleName:

93− return catData.name;

57+ return QString("Category %1").arg(index.row());

94− case RoleIcon:

58+ case RoleIcon:

95− return catData.icon;

59+ return "gtk-apply";

96− case RoleRawRendererTemplate:

60+ case RoleRawRendererTemplate:

97− return catData.rawTemplate;

61+ qFatal("Using un-implemented RoleRawRendererTemplate Categories role");

62+ return QVariant();

98− case RoleRenderer:

63+ case RoleRenderer:

99− {

64+ {

100− QVariantMap map;

65+ QVariantMap map;

101− if (index.row() % 2 == 0) {

66+ if (index.row() % 2 == 0) {

102− map["category-layout"] = "grid";

67+ map["category-layout"] = "grid";

103− } else {

68+ } else {

104− map["category-layout"] = "carousel";

69+ map["category-layout"] = "carousel";

105− map["overlay"] = true;

106− }

107− map["card-size"] = "small";

108− return map;

109 }

70 }

110− case RoleComponents:

71+ if (index.row() == 18) {

111− {

72+ map["category-layout"] = "horizontal-list";

112− QVariantMap map, artMap, attributeMap;

73+ }

113− artMap["aspect-ratio"] = "1.0";

74+ if (index.row() == 19) {

114− artMap["field"] = "art";

75+ map["category-layout"] = "grid";

115− map["art"] = artMap;

76+ map["collapsed-rows"] = 0;

116− map["title"] = "HOLA";

77+ }

117− attributeMap["field"] = "attribute";

78+ map["card-size"] = "small";

118− map["attributes"] = attributeMap;

79+

119− return map;

80+ map["category-layout"] = m_layouts.value(index.row(), map["category-layout"].toString());

81+

82+ if (map["category-layout"] == "carousel") {

83+ map["overlay"] = true;

120 }

84 }

121− case RoleHeaderLink:

85+

122− return QString();

123− case RoleResults:

124− return QVariant();

86+ return map;

125− case RoleCount:

126− return catData.countObject->property("count");

127− default:

128− qFatal("Using un-implemented Categories role");

129− return QVariant();

130 }

87 }

131− } else {

88+ case RoleComponents:

132− switch (role) {

133− case RoleCategoryId:

134− return QString("%1").arg(index.row());

135− case RoleName:

136− return QString("Category %1").arg(index.row());

137− case RoleIcon:

138− return "gtk-apply";

139− case RoleRawRendererTemplate:

140− qFatal("Using un-implemented RoleRawRendererTemplate Categories role");

141− return QVariant();

142− case RoleRenderer:

143− {

89+ {

144− QVariantMap map;

90+ QVariantMap map, artMap, attributeMap;

145− if (index.row() % 2 == 0) {

91+ if (index.row() % 2 != 0) {

146− map["category-layout"] = "grid";

92+ artMap["aspect-ratio"] = QString("1.%1").arg(index.row());

147− } else {

93+ } else {

148− map["category-layout"] = "carousel";

94+ artMap["aspect-ratio"] = "1.0";

149− map["card-size"] = "medium";

150− map["overlay"] = true;

151− }

152− if (index.row() == 18) {

153− map["category-layout"] = "horizontal-list";

154− }

155− if (index.row() == 19) {

156− map["category-layout"] = "grid";

157− map["collapsed-rows"] = 0;

158− }

159− map["card-size"] = "small";

160− return map;

161 }

95 }

162− case RoleComponents:

163− {

164− QVariantMap map, artMap, attributeMap;

165− if (index.row() % 2 != 0) {

166− artMap["aspect-ratio"] = QString("1.%1").arg(index.row());

167− } else {

168− artMap["aspect-ratio"] = "1.0";

169− }

170− artMap["field"] = "art";

96+ artMap["field"] = "art";

171− map["art"] = artMap;

97+ map["art"] = artMap;

172− map["title"] = "HOLA";

98+ map["title"] = "HOLA";

173− map["subtitle"] = "HOLA";

99+ map["subtitle"] = "HOLA";

174− attributeMap["field"] = "attribute";

100+ attributeMap["field"] = "attribute";

175− map["attributes"] = attributeMap;

101+ map["attributes"] = attributeMap;

176− return map;

102+ return map;

103+ }

104+ case RoleHeaderLink:

105+ {

106+ QString res;

107+ if (index.row() == 1 || index.row() == 4) {

108+ res = QString("scope://query/1");

177 }

109 }

178− case RoleHeaderLink:

110+ res = m_headerLinks.value(index.row(), res);

179− if (index.row() == 1 || index.row() == 4) {

180− return QString("scope://query/1");

181− }

182− return QString();

183− case RoleResults:

184− return QVariant::fromValue(resultsModel);

185− case RoleCount:

186− return resultsModel->rowCount();

187− default:

188− qFatal("Using un-implemented Categories role");

189− return QVariant();

111+ return res;

190 }

112 }

113+ case RoleResults:

114+ return QVariant::fromValue(resultsModel);

115+ case RoleCount:

116+ return resultsModel->rowCount();

117+ default:

118+ qFatal("Using un-implemented Categories role");

119+ return QVariant();

191 }

120 }

192}

121}

193

122

@@ -196,3 +125,32 @@ Categories::data(int row, int role) const

196{

125{

197 return data(index(row, 0), role);

126 return data(index(row, 0), role);

198}

127}

128+

129+void Categories::setCount(int count)

130+{

131+ if (m_category_count != count) {

132+ beginResetModel(); // This is just for test setup so we can be lazy and reset

133+ m_category_count = count;

134+ endResetModel();

135+ }

136+}

137+

138+ResultsModel* Categories::resultModel(int row) const

139+{

140+ ResultsModel *result = m_resultsModels[row];

141+ if (!result) {

142+ result = new ResultsModel(15, row);

143+ m_resultsModels[row] = result;

144+ }

145+ return result;

146+}

147+

148+void Categories::setLayout(int row, const QString &layout)

149+{

150+ m_layouts[row] = layout;

151+}

152+

153+void Categories::setHeaderLink(int row, const QString &headerLink)

154+{

155+ m_headerLinks[row] = headerLink;

156+}

tests/mocks/Unity/fake_categories.h+7−12

@@ -39,22 +39,17 @@ public:

40 Q_INVOKABLE QVariant data(int row, int role) const;

42−private Q_SLOTS:

42+ // For testing purposes

43− void countChanged();

43+ Q_INVOKABLE void setCount(int count);

44+ Q_INVOKABLE ResultsModel* resultModel(int row) const;

45+ Q_INVOKABLE void setLayout(int row, const QString &layout);

46+ Q_INVOKABLE void setHeaderLink(int row, const QString &headerLink);

45private:

48private:

46 mutable QHash<int, ResultsModel*> m_resultsModels;

49 mutable QHash<int, ResultsModel*> m_resultsModels;

50+ QHash<int, QString> m_layouts;

51+ QHash<int, QString> m_headerLinks;

47 int m_category_count;

52 int m_category_count;

48−

49− struct CategoryData {

50− QString categoryId;

51− QString name;

52− QString icon;

53− QString rawTemplate;

54− QObject* countObject;

55− };

56−

57− QList<CategoryData> m_specialCategories;

58};

53};

60#endif // FAKE_CATEGORIES_H

55#endif // FAKE_CATEGORIES_H

tests/mocks/Unity/fake_resultsmodel.cpp+9

@@ -44,6 +44,15 @@ void ResultsModel::setCategoryId(QString const& /*id*/)

44 qFatal("Calling un-implemented ResultsModel::setCategoryId");

45}

47+void ResultsModel::setResultCount(int result_count)

48+{

49+ if (m_result_count != result_count) {

50+ beginResetModel(); // This is just for test setup so we can be lazy and reset

51+ m_result_count = result_count;

52+ endResetModel();

53+ }

54+}

55+

47int ResultsModel::rowCount(const QModelIndex& parent) const

56int ResultsModel::rowCount(const QModelIndex& parent) const

48{

57{

49 Q_UNUSED(parent);

58 Q_UNUSED(parent);

tests/mocks/Unity/fake_resultsmodel.h+3

@@ -41,6 +41,9 @@ public:

41 /* setters */

42 void setCategoryId(QString const& id) override;

44+ // For testing purposes

45+ Q_INVOKABLE void setResultCount(int result_count);

46+

44private:

47private:

45 int m_result_count;

48 int m_result_count;

46 int m_categoryId;

49 int m_categoryId;

tests/mocks/Unity/fake_scope.cpp+17

@@ -143,6 +143,23 @@ void Scope::setFavorite(const bool favorite)

143 Q_EMIT favoriteChanged();

144 }

145}

146+

147+void Scope::setId(const QString &id)

148+{

149+ if (id != m_id) {

150+ m_id = id;

151+ Q_EMIT idChanged();

152+ }

153+}

154+

155+void Scope::setName(const QString &name)

156+{

157+ if (name != m_name) {

158+ m_name = name;

159+ Q_EMIT nameChanged();

160+ }

161+}

162+

146void Scope::setSearchInProgress(const bool inProg)

163void Scope::setSearchInProgress(const bool inProg)

147{

164{

148 if (inProg != m_searching) {

165 if (inProg != m_searching) {

tests/mocks/Unity/fake_scope.h+2

@@ -56,6 +56,8 @@ public:

56 void setFormFactor(const QString& form_factor) override;

57 void setActive(const bool) override;

58 void setFavorite(const bool) override;

59+ Q_INVOKABLE void setId(const QString &id); // This is not invokable in the Interface, here for testing benefits

60+ Q_INVOKABLE void setName(const QString &name); // This is not invokable in the Interface, here for testing benefits

59 Q_INVOKABLE void setSearchInProgress(const bool inProg); // This is not invokable in the Interface, here for testing benefits

61 Q_INVOKABLE void setSearchInProgress(const bool inProg); // This is not invokable in the Interface, here for testing benefits

61 Q_INVOKABLE void activate(QVariant const& result) override;

63 Q_INVOKABLE void activate(QVariant const& result) override;

tests/qmltests/Dash/tst_GenericScopeView.qml+43

@@ -41,6 +41,10 @@ Item {

41 id: scopes

42 }

44+ MockScope {

45+ id: mockScope

46+ }

47+

44 SignalSpy {

48 SignalSpy {

45 id: spy

49 id: spy

46 }

50 }

@@ -390,6 +394,45 @@ Item {

390 verify(image, "Could not find the title image.");

394 verify(image, "Could not find the title image.");

391 compare(image.source, data.logo, "Title image has the wrong source");

395 compare(image.source, data.logo, "Title image has the wrong source");

392 }

396 }

397+

398+ function test_seeAllTwoCategoriesScenario1() {

399+ mockScope.setId("mockScope");

400+ mockScope.setName("Mock Scope");

401+ mockScope.categories.setCount(2);

402+ mockScope.categories.resultModel(0).setResultCount(50);

403+ mockScope.categories.setLayout(1, "grid");

404+ mockScope.categories.setHeaderLink(1, "");

405+ genericScopeView.scope = mockScope;

406+ waitForRendering(genericScopeView.categoryView);

407+

408+ var category0 = findChild(genericScopeView, "dashCategory0")

409+ var seeAll0 = findChild(category0, "seeAll")

410+

411+ waitForRendering(seeAll0);

412+ verify(category0.expandable);

413+ verify(!category0.expanded);

414+

415+ mouseClick(seeAll0, seeAll0.width / 2, seeAll0.height / 2);

416+ verify(category0.expanded);

417+ tryCompare(category0, "height", category0.item.expandedHeight + seeAll0.height);

418+ tryCompare(genericScopeView.categoryView, "contentY", units.gu(13.5));

419+

420+ scrollToCategory("dashCategory1");

421+

422+ var category1 = findChild(genericScopeView, "dashCategory1")

423+ var seeAll1 = findChild(category1, "seeAll")

424+ verify(category1.expandable);

425+ verify(!category1.expanded);

426+

427+ mouseClick(seeAll1, seeAll1.width / 2, seeAll1.height / 2);

428+ verify(!category0.expanded);

429+ verify(category1.expanded);

430+ tryCompare(category1, "height", category1.item.expandedHeight + seeAll1.height);

431+ tryCompareFunction(function() {

432+ return genericScopeView.categoryView.contentY + category1.y + category1.height + genericScopeView.categoryView.pageHeader.height

433+ == genericScopeView.categoryView.contentHeight;}

434+ , true);

435+ }

393 }

436 }

394 }

437 }

395}

438}