From 9c868601591b60cf066eb576e85b0dbf4e1fd7ae Mon Sep 17 00:00:00 2001 From: HampusM Date: Sat, 25 Jun 2022 16:20:51 +0200 Subject: test: replace gtest with Catch2 & Trompeloeil --- test/mocks/matrix.hpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'test/mocks') diff --git a/test/mocks/matrix.hpp b/test/mocks/matrix.hpp index 1602ebf..4b193b2 100644 --- a/test/mocks/matrix.hpp +++ b/test/mocks/matrix.hpp @@ -2,30 +2,30 @@ #include "interfaces/matrix.hpp" -#include +#include template class MockMatrix : public IMatrix { public: - // NOLINTNEXTLINE(modernize-use-trailing-return-type) - MOCK_METHOD(void, fill, (Element element), (noexcept, override)); + // NOLINTNEXTLINE(modernize-use-trailing-return-type, readability-identifier-length) + MAKE_MOCK1(fill, void(Element element), noexcept override); - // NOLINTNEXTLINE(modernize-use-trailing-return-type) - MOCK_METHOD(Element, get, (const Vector2 &pos), (const, noexcept, override)); + // NOLINTNEXTLINE(modernize-use-trailing-return-type, readability-identifier-length) + MAKE_MOCK1(get, Element(const Vector2 &pos), const noexcept override); - // NOLINTNEXTLINE(modernize-use-trailing-return-type) - MOCK_METHOD(void, set, (const Vector2 &pos, Element element), (noexcept, override)); + // NOLINTNEXTLINE(modernize-use-trailing-return-type, readability-identifier-length) + MAKE_MOCK2(set, void(const Vector2 &pos, Element element), noexcept override); // NOLINTNEXTLINE(modernize-use-trailing-return-type) - MOCK_METHOD(uint32_t, get_row_cnt, (), (const, noexcept, override)); + MAKE_MOCK0(get_row_cnt, uint32_t(), const noexcept override); // NOLINTNEXTLINE(modernize-use-trailing-return-type) - MOCK_METHOD(uint32_t, get_column_cnt, (), (const, noexcept, override)); + MAKE_MOCK0(get_column_cnt, uint32_t(), const noexcept override); // NOLINTNEXTLINE(modernize-use-trailing-return-type) - MOCK_METHOD(MatrixIterator, begin, (), (const, noexcept, override)); + MAKE_MOCK0(begin, MatrixIterator(), const noexcept override); // NOLINTNEXTLINE(modernize-use-trailing-return-type) - MOCK_METHOD(MatrixIterator, end, (), (const, noexcept)); + MAKE_MOCK0(end, MatrixIterator(), const noexcept override); }; -- cgit v1.2.3-18-g5258