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

Changed MOCK_DESTRUCTOR and MOCK_*CONVERSION_OPERATOR to support different calling conventions

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@707 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2014-02-07 14:26:21 +00:00
parent a6c6b5dd82
commit 53e67c0a81
5 changed files with 300 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/test_integration.cpp
View file

@ -321,7 +321,7 @@ namespace
{
MOCK_CLASS( my_destroyed_class )
{
MOCK_DESTRUCTOR( my_destroyed_class, destructor )
MOCK_DESTRUCTOR( ~my_destroyed_class, destructor )
};
}

44
test/test_mock.cpp
View file

@ -54,7 +54,7 @@ namespace
{
MOCK_CLASS( mock_class_with_conversion_operator )
{
MOCK_CONVERSION_OPERATOR( int, conversion )
MOCK_CONVERSION_OPERATOR( operator, int, conversion )
};
}
@ -71,7 +71,7 @@ namespace
template< typename T >
MOCK_CLASS( mock_template_class_with_conversion_operator )
{
MOCK_CONVERSION_OPERATOR_TPL( T, conversion )
MOCK_CONVERSION_OPERATOR_TPL( operator, T, conversion )
};
}
@ -87,7 +87,7 @@ namespace
{
MOCK_CLASS( mock_class_with_const_conversion_operator )
{
MOCK_CONST_CONVERSION_OPERATOR( int, conversion )
MOCK_CONST_CONVERSION_OPERATOR( operator, int, conversion )
};
}
@ -104,7 +104,7 @@ namespace
{
MOCK_CLASS( mock_class_with_non_const_conversion_operator )
{
MOCK_CONST_CONVERSION_OPERATOR( int, conversion )
MOCK_CONST_CONVERSION_OPERATOR( operator, int, conversion )
};
}
@ -122,7 +122,7 @@ namespace
template< typename T >
MOCK_CLASS( mock_template_class_with_const_conversion_operator )
{
MOCK_CONST_CONVERSION_OPERATOR_TPL( T, conversion )
MOCK_CONST_CONVERSION_OPERATOR_TPL( operator, T, conversion )
};
}
@ -139,7 +139,7 @@ namespace
template< typename T >
MOCK_CLASS( mock_template_class_with_non_const_conversion_operator )
{
MOCK_NON_CONST_CONVERSION_OPERATOR_TPL( T, conversion )
MOCK_NON_CONST_CONVERSION_OPERATOR_TPL( operator, T, conversion )
};
}
@ -401,3 +401,35 @@ namespace
}
#endif // MOCK_VARIADIC_MACROS
#ifdef BOOST_MSVC
# define MOCK_STDCALL __stdcall
#elif defined( BOOST_GCC )
# define MOCK_STDCALL __attribute((stdcall))
#else
# define MOCK_STDCALL
#endif // BOOST_GCC
namespace stdcall
{
struct base
{
virtual void MOCK_STDCALL m1() = 0;
};
MOCK_BASE_CLASS( derived, base )
{
MOCK_CONSTRUCTOR( MOCK_STDCALL derived, 0, (), derived )
MOCK_DESTRUCTOR( MOCK_STDCALL ~derived, derived )
MOCK_CONVERSION_OPERATOR( MOCK_STDCALL operator, int, to_int )
MOCK_METHOD_EXT( MOCK_STDCALL m1, 0, void(), m1 )
MOCK_METHOD_EXT( MOCK_STDCALL m2, 0, void(), m2 )
#ifdef MOCK_VARIADIC_MACROS
MOCK_METHOD( MOCK_STDCALL m3, 0, void(), m3 )
#endif
MOCK_STATIC_METHOD( MOCK_STDCALL m4, 0, void(), m4 )
};
MOCK_FUNCTOR( MOCK_STDCALL f, void() )
MOCK_FUNCTION( MOCK_STDCALL f, 0, void(), f )
}