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

Auto-deduce method sig in MOCK_METHOD_(NON)CONST

Browse source 
Fixes #93
This commit is contained in:
Alexander Grund 2020-07-27 16:02:50 +02:00
parent 62494bccfd
commit 675969eafd
No known key found for this signature in database
GPG key ID: E92C451FC21EF13F
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/turtle/mock.hpp
View file

@ -188,14 +188,16 @@
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, ))
#define MOCK_CONST_METHOD(M, n, ...) \ #define MOCK_CONST_METHOD(M, ...) \
MOCK_CONST_METHOD_EXT(M, n, \ MOCK_CONST_METHOD_EXT(M, \
MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \ MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \
MOCK_VARIADIC_ELEM_1(__VA_ARGS__, M, )) MOCK_VARIADIC_ELEM_1(__VA_ARGS__, MOCK_SIGNATURE(M), ), \
#define MOCK_NON_CONST_METHOD(M, n, ...) \ MOCK_VARIADIC_ELEM_2(__VA_ARGS__, M, M, ))
MOCK_NON_CONST_METHOD_EXT(M, n, \ #define MOCK_NON_CONST_METHOD(M, ...) \
MOCK_NON_CONST_METHOD_EXT(M, \
MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \ MOCK_VARIADIC_ELEM_0(__VA_ARGS__, ), \
MOCK_VARIADIC_ELEM_1(__VA_ARGS__, M, )) MOCK_VARIADIC_ELEM_1(__VA_ARGS__, MOCK_SIGNATURE(M), ), \
MOCK_VARIADIC_ELEM_2(__VA_ARGS__, M, M, ))
#define MOCK_METHOD_TPL(M, n, ...) \ #define MOCK_METHOD_TPL(M, n, ...) \
MOCK_METHOD_EXT_TPL(M, n, \ MOCK_METHOD_EXT_TPL(M, n, \

4
test/test_mock.cpp
View file

@ -366,6 +366,8 @@ namespace
{} {}
virtual void m1() = 0; virtual void m1() = 0;
virtual void m10() const = 0;
virtual void m11() = 0;
}; };
MOCK_BASE_CLASS( variadic, base ) MOCK_BASE_CLASS( variadic, base )
@ -373,8 +375,10 @@ namespace
MOCK_METHOD( m1, 0 ) MOCK_METHOD( m1, 0 )
MOCK_METHOD( m2, 0, void() ) MOCK_METHOD( m2, 0, void() )
MOCK_METHOD( m3, 0, void(), m3 ) MOCK_METHOD( m3, 0, void(), m3 )
MOCK_CONST_METHOD( m10, 0 )
MOCK_CONST_METHOD( m4, 0, void() ) MOCK_CONST_METHOD( m4, 0, void() )
MOCK_CONST_METHOD( m5, 0, void(), m5 ) MOCK_CONST_METHOD( m5, 0, void(), m5 )
MOCK_NON_CONST_METHOD( m11, 0 )
MOCK_NON_CONST_METHOD( m6, 0, void() ) MOCK_NON_CONST_METHOD( m6, 0, void() )
MOCK_NON_CONST_METHOD( m7, 0, void(), m7 ) MOCK_NON_CONST_METHOD( m7, 0, void(), m7 )
MOCK_STATIC_METHOD( m8, 0, void() ) MOCK_STATIC_METHOD( m8, 0, void() )