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

Added support for mocking protected member function

Browse source
This commit is contained in:
Mathieu Champlon 2015-04-07 07:21:14 +02:00
parent 12a252a850
commit ed36823235
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/changelog.qbk
View file

@ -14,6 +14,7 @@ Not yet released
* Added support for multiple parameters constraints * Added support for multiple parameters constraints
* Added inline to generated MOCK_FUNCTION * Added inline to generated MOCK_FUNCTION
* Documented limitation concerning MOCK_METHOD_TPL * Documented limitation concerning MOCK_METHOD_TPL
* Fixed mocking protected member function
[section 1.2.6] [section 1.2.6]
Released 24 May 2014 Released 24 May 2014

12
include/turtle/mock.hpp
View file

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

5
test/test_mock.cpp
View file

@ -361,6 +361,7 @@ namespace
{ {
virtual ~base() virtual ~base()
{} {}
protected:
virtual void m1() = 0; virtual void m1() = 0;
}; };
@ -439,6 +440,10 @@ namespace stdcall
{ {
struct base struct base
{ {
virtual ~base()
{}
protected:
virtual void MOCK_STDCALL m1() = 0; virtual void MOCK_STDCALL m1() = 0;
}; };