mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed support for directly mocking a protected member function

Browse source 
Taking a function pointer on a base member protected function is actually invalid.
This could work with a pointer on the derived class member function, that is &derived::method instead of &base::method however there is no way to pass the derived class from MOCK_BASE_CLASS to the mock::detail::base helper if template classes are to be supported.

Anyway the now documented workaround is simple enough and the same as for private member functions.

As a side note the changes from ed36823235 might not be needed any more…
This commit is contained in:
Mathieu Champlon 2018-03-29 15:39:15 +02:00 • committed by Mathieu Champlon
parent caef00d2e3
commit 4455222a62
5 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/turtle/mock.hpp
View file

@ -43,8 +43,8 @@
#else // MOCK_VARIADIC_MACROS
#define MOCK_BASE_CLASS(T, B) \
struct T : B, mock::object, mock::detail::base< B >
#define MOCK_BASE_CLASS(T, I) \
struct T : I, mock::object, mock::detail::base< I >
#define MOCK_FUNCTOR(f, S) \
mock::detail::functor< MOCK_FUNCTION_TYPE((S),) > f, f##_mock
@ -177,11 +177,8 @@
#define MOCK_VARIADIC_ELEM_1(e0, e1, ...) e1
#define MOCK_VARIADIC_ELEM_2(e0, e1, e2, ...) e2
#define MOCK_METHOD_SIGNATURE(M, n, S, t) \
typedef MOCK_FUNCTION_TYPE((S),) BOOST_PP_CAT(t,_sig_type); \
MOCK_METHOD_EXT(M, n, BOOST_PP_CAT(t,_sig_type), t)
#define MOCK_METHOD(M, ...) \
MOCK_METHOD_SIGNATURE(M, \
MOCK_METHOD_EXT(M, \
MOCK_VARIADIC_ELEM_0(__VA_ARGS__ ), \
MOCK_VARIADIC_ELEM_1(__VA_ARGS__, MOCK_SIGNATURE(M)), \
MOCK_VARIADIC_ELEM_2(__VA_ARGS__, M, M))
@ -228,8 +225,7 @@
#else // MOCK_VARIADIC_MACROS
#define MOCK_METHOD(M, n) \
typedef MOCK_SIGNATURE(M) M##_sig_type; \
MOCK_METHOD_EXT(M, n, M##_sig_type, M)
MOCK_METHOD_EXT(M, n, MOCK_SIGNATURE(M), M)
#define MOCK_FUNCTION(F, n, S, t) \
MOCK_FUNCTION_AUX(F, n, S, t, inline,)