MockCategories: ensure we override the category getter

(bzr r4253.1.12)

1 files changed, 19 insertions, 9 deletions

diff --git a/tests/MockCategories.h b/tests/MockCategories.h
index c7458623a..604022b9d 100644
--- a/tests/MockCategories.h
+++ b/tests/MockCategories.h
@@ -28,29 +28,39 @@ namespace unity
 namespace dash
 {
 
-struct MockCategories : public Categories
+Category generate_mock_category(size_t index)
+{
+ Category mock_category(nullptr, nullptr, nullptr);
+ mock_category.id.SetGetterFunction([index] { return "mock-cat"+std::to_string(index); });
+ mock_category.name.SetGetterFunction([index] { return "MockCategory "+std::to_string(index); });
+ mock_category.icon_hint.SetGetterFunction([index] { return "mock-category-icon-"+std::to_string(index); });
+ mock_category.renderer_name.SetGetterFunction([] { return "grid"; });
+ mock_category.index.SetGetterFunction([index] { return index; });
+ return mock_category;
+}
+
+struct MockCategories : Categories
 {
 MockCategories(unsigned count_)
 : Categories(LOCAL)
 {
 count.SetGetterFunction([count_] { return count_; });
 }
+
+ const Category RowAtIndex(std::size_t index) const override
+ {
+ return generate_mock_category(index);
+ }
 };
 
 // Template specialization for Category in tests
 template<>
 const Category Model<Category>::RowAtIndex(std::size_t index) const
 {
- Category mock_category(nullptr, nullptr, nullptr);
- mock_category.id.SetGetterFunction([index] { return "cat"+std::to_string(index); });
- mock_category.name.SetGetterFunction([index] { return "Category "+std::to_string(index); });
- mock_category.icon_hint.SetGetterFunction([] { return "cmake"; });
- mock_category.renderer_name.SetGetterFunction([] { return "grid"; });
- mock_category.index.SetGetterFunction([index] { return index; });
- return mock_category;
+ return generate_mock_category(index);
 }
 
 }
 }
 
-#endif // _UNITY_MOCK_CATEGORIES_H \ No newline at end of file
+#endif // _UNITY_MOCK_CATEGORIES_H