From 6d601f26edacd83799b74bc33eafa0d7149ad540 Mon Sep 17 00:00:00 2001 From: mat007 Date: Sun, 1 Apr 2012 21:18:45 +0000 Subject: [PATCH] Cleanup git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@435 860be788-9bd5-4423-9f1e-828f051e677b --- src/libraries/turtle/function.hpp | 38 +++++------ src/libraries/turtle/mock.hpp | 102 ++++++++++++++-------------- src/tests/turtle_test/mock_test.cpp | 74 ++++++++++---------- 3 files changed, 107 insertions(+), 107 deletions(-) diff --git a/src/libraries/turtle/function.hpp b/src/libraries/turtle/function.hpp index 622fe22..c9770e2 100644 --- a/src/libraries/turtle/function.hpp +++ b/src/libraries/turtle/function.hpp @@ -96,13 +96,13 @@ namespace mock return (*impl_)(); } -#define MOCK_EXPECTATION_OPERATOR(z, n, d) \ +#define MOCK_FUNCTION_OPERATOR(z, n, d) \ MOCK_DECL(operator(), n, Signature, const, BOOST_DEDUCED_TYPENAME) \ { \ return (*impl_)( BOOST_PP_ENUM_PARAMS(n, p) ); \ } - BOOST_PP_REPEAT_FROM_TO(1, BOOST_PP_INC(MOCK_MAX_ARGS), MOCK_EXPECTATION_OPERATOR, BOOST_PP_EMPTY) -#undef MOCK_EXPECTATION_OPERATOR + BOOST_PP_REPEAT_FROM_TO(1, BOOST_PP_INC(MOCK_MAX_ARGS), MOCK_FUNCTION_OPERATOR, BOOST_PP_EMPTY) +#undef MOCK_FUNCTION_OPERATOR friend std::ostream& operator<<( std::ostream& s, const function& e ) { @@ -200,14 +200,14 @@ namespace mock return expectations_.back(); } -#define MOCK_EXPECTATION_FORMAT(z, n, N) \ +#define MOCK_FUNCTION_FORMAT(z, n, N) \ << " " << mock::format( p##n ) << BOOST_PP_IF(BOOST_PP_EQUAL(N,n), " ", ",") -#define MOCK_EXPECTATION_CALL_CONTEXT(n) \ +#define MOCK_FUNCTION_CALL_CONTEXT(n) \ boost::unit_test::lazy_ostream::instance() \ << lazy_context( this ) \ - << "(" BOOST_PP_REPEAT(n, MOCK_EXPECTATION_FORMAT, BOOST_PP_DEC(n)) << ")" \ + << "(" BOOST_PP_REPEAT(n, MOCK_FUNCTION_FORMAT, BOOST_PP_DEC(n)) << ")" \ << lazy_expectations( this ) -#define MOCK_EXPECTATION_INVOKE(z, n, A) \ +#define MOCK_FUNCTION_INVOKE(z, n, A) \ { \ valid_ = false; \ for( expectations_cit it = expectations_.begin(); it != expectations_.end(); ++it ) \ @@ -215,34 +215,34 @@ namespace mock { \ if( ! it->invoke() ) \ { \ - error_type::sequence_failed( MOCK_EXPECTATION_CALL_CONTEXT(n), it->file(), it->line() ); \ + error_type::sequence_failed( MOCK_FUNCTION_CALL_CONTEXT(n), it->file(), it->line() ); \ return A; \ } \ if( ! it->functor() ) \ { \ - error_type::missing_action( MOCK_EXPECTATION_CALL_CONTEXT(n), it->file(), it->line() ); \ + error_type::missing_action( MOCK_FUNCTION_CALL_CONTEXT(n), it->file(), it->line() ); \ return A; \ } \ valid_ = true; \ - error_type::expected_call( MOCK_EXPECTATION_CALL_CONTEXT(n), it->file(), it->line() ); \ + error_type::expected_call( MOCK_FUNCTION_CALL_CONTEXT(n), it->file(), it->line() ); \ return it->functor()( BOOST_PP_ENUM_PARAMS(n, p) ); \ } \ - error_type::unexpected_call( MOCK_EXPECTATION_CALL_CONTEXT(n) ); \ + error_type::unexpected_call( MOCK_FUNCTION_CALL_CONTEXT(n) ); \ return A; \ } -#define MOCK_EXPECTATION_OPERATOR(z, n, P) \ +#define MOCK_FUNCTION_OPERATOR(z, n, P) \ MOCK_DECL(operator(), n, Signature, const, BOOST_DEDUCED_TYPENAME) \ - MOCK_EXPECTATION_INVOKE(z, n, P) + MOCK_FUNCTION_INVOKE(z, n, P) - BOOST_PP_REPEAT(BOOST_PP_INC(MOCK_MAX_ARGS), MOCK_EXPECTATION_OPERATOR, error_type::abort()) + BOOST_PP_REPEAT(BOOST_PP_INC(MOCK_MAX_ARGS), MOCK_FUNCTION_OPERATOR, error_type::abort()) void test() const - MOCK_EXPECTATION_INVOKE(, 0,) + MOCK_FUNCTION_INVOKE(, 0,) -#undef MOCK_EXPECTATION_FORMAT -#undef MOCK_EXPECTATION_OPERATOR -#undef MOCK_EXPECTATION_INVOKE -#undef MOCK_EXPECTATION_CALL_CONTEXT +#undef MOCK_FUNCTION_FORMAT +#undef MOCK_FUNCTION_OPERATOR +#undef MOCK_FUNCTION_INVOKE +#undef MOCK_FUNCTION_CALL_CONTEXT friend std::ostream& operator<<( std::ostream& s, const function_impl& e ) { diff --git a/src/libraries/turtle/mock.hpp b/src/libraries/turtle/mock.hpp index ac9e712..1bf71f6 100644 --- a/src/libraries/turtle/mock.hpp +++ b/src/libraries/turtle/mock.hpp @@ -81,24 +81,24 @@ namespace detail #define MOCK_CLASS(T) \ struct T : mock::object #define MOCK_FUNCTOR(f, S) \ - mock::detail::functor< S > f, f##_mocker + mock::detail::functor< S > f, f##_mock -#define MOCK_MOCKER(t) \ - t##_mocker( mock::detail::root, BOOST_PP_STRINGIZE(t) ) -#define MOCK_ANONYMOUS_MOCKER(t) \ - t##_mocker( mock::detail::root, "?." ) +#define MOCK_HELPER(t) \ + t##_mock( mock::detail::root, BOOST_PP_STRINGIZE(t) ) +#define MOCK_ANONYMOUS_HELPER(t) \ + t##_mock( mock::detail::root, "?." ) -#define MOCK_METHOD_EXPECTATION(S, t) \ - mutable mock::function< S > t##_mocker_; \ - mock::function< S >& t##_mocker( \ +#define MOCK_METHOD_HELPER(S, t) \ + mutable mock::function< S > t##_mock_; \ + mock::function< S >& t##_mock( \ const mock::detail::context&, \ boost::unit_test::const_string instance ) const \ { \ - mock::detail::configure( *this, t##_mocker_, \ + mock::detail::configure( *this, t##_mock_, \ instance.substr( 0, instance.rfind( BOOST_PP_STRINGIZE(t) ) ), \ mock::detail::type_name( typeid( *this ) ), \ BOOST_PP_STRINGIZE(t) ); \ - return t##_mocker_; \ + return t##_mock_; \ } #define MOCK_SIGNATURE(M) \ @@ -106,50 +106,50 @@ namespace detail BOOST_TYPEOF( mock::invalid_pointer_to_member( &base_type::M ) ) \ >::type -#define MOCK_METHOD_STUB(M, n, S, t, c, tpn) \ +#define MOCK_METHOD_AUX(M, n, S, t, c, tpn) \ MOCK_DECL(M, n, S, c, tpn) \ { \ - return MOCK_ANONYMOUS_MOCKER(t)( \ + return MOCK_ANONYMOUS_HELPER(t)( \ BOOST_PP_ENUM_PARAMS(n, p) ); \ } #define MOCK_METHOD_EXT(M, n, S, t) \ - MOCK_METHOD_STUB(M, n, S, t,,) \ - MOCK_METHOD_STUB(M, n, S, t, const,) \ - MOCK_METHOD_EXPECTATION(S, t) + MOCK_METHOD_AUX(M, n, S, t,,) \ + MOCK_METHOD_AUX(M, n, S, t, const,) \ + MOCK_METHOD_HELPER(S, t) #define MOCK_CONST_METHOD_EXT(M, n, S, t) \ - MOCK_METHOD_STUB(M, n, S, t, const,) \ - MOCK_METHOD_EXPECTATION(S, t) + MOCK_METHOD_AUX(M, n, S, t, const,) \ + MOCK_METHOD_HELPER(S, t) #define MOCK_NON_CONST_METHOD_EXT(M, n, S, t) \ - MOCK_METHOD_STUB(M, n, S, t,,) \ - MOCK_METHOD_EXPECTATION(S, t) + MOCK_METHOD_AUX(M, n, S, t,,) \ + MOCK_METHOD_HELPER(S, t) #define MOCK_METHOD(M, n) \ MOCK_METHOD_EXT(M, n, MOCK_SIGNATURE(M), M) #define MOCK_METHOD_EXT_TPL(M, n, S, t) \ - MOCK_METHOD_STUB(M, n, S, t,, BOOST_DEDUCED_TYPENAME) \ - MOCK_METHOD_STUB(M, n, S, t, const, BOOST_DEDUCED_TYPENAME) \ - MOCK_METHOD_EXPECTATION(S, t) + MOCK_METHOD_AUX(M, n, S, t,, BOOST_DEDUCED_TYPENAME) \ + MOCK_METHOD_AUX(M, n, S, t, const, BOOST_DEDUCED_TYPENAME) \ + MOCK_METHOD_HELPER(S, t) #define MOCK_CONST_METHOD_EXT_TPL(M, n, S, t) \ - MOCK_METHOD_STUB(M, n, S, t, const, BOOST_DEDUCED_TYPENAME) \ - MOCK_METHOD_EXPECTATION(S, t) + MOCK_METHOD_AUX(M, n, S, t, const, BOOST_DEDUCED_TYPENAME) \ + MOCK_METHOD_HELPER(S, t) #define MOCK_NON_CONST_METHOD_EXT_TPL(M, n, S, t) \ - MOCK_METHOD_STUB(M, n, S, t,, BOOST_DEDUCED_TYPENAME) \ - MOCK_METHOD_EXPECTATION(S, t) + MOCK_METHOD_AUX(M, n, S, t,, BOOST_DEDUCED_TYPENAME) \ + MOCK_METHOD_HELPER(S, t) #define MOCK_CONST_CONVERSION_OPERATOR(T, t) \ - operator T() const { return MOCK_ANONYMOUS_MOCKER(t)(); } \ - MOCK_METHOD_EXPECTATION(T(), t) + operator T() const { return MOCK_ANONYMOUS_HELPER(t)(); } \ + MOCK_METHOD_HELPER(T(), t) #define MOCK_NON_CONST_CONVERSION_OPERATOR(T, t) \ - operator T() { return MOCK_ANONYMOUS_MOCKER(t)(); } \ - MOCK_METHOD_EXPECTATION(T(), t) + operator T() { return MOCK_ANONYMOUS_HELPER(t)(); } \ + MOCK_METHOD_HELPER(T(), t) #define MOCK_CONVERSION_OPERATOR(T, t) \ - operator T() const { return MOCK_ANONYMOUS_MOCKER(t)(); } \ - operator T() { return MOCK_ANONYMOUS_MOCKER(t)(); } \ - MOCK_METHOD_EXPECTATION(T(), t) + operator T() const { return MOCK_ANONYMOUS_HELPER(t)(); } \ + operator T() { return MOCK_ANONYMOUS_HELPER(t)(); } \ + MOCK_METHOD_HELPER(T(), t) -#define MOCK_FUNCTION_EXPECTATION(S, t, s) \ - s mock::function< S >& t##_mocker( \ +#define MOCK_FUNCTION_HELPER(S, t, s) \ + s mock::function< S >& t##_mock( \ mock::detail::context& context, \ boost::unit_test::const_string instance ) \ { \ @@ -157,37 +157,37 @@ namespace detail return f( context, instance ); \ } -#define MOCK_CONSTRUCTOR_STUB(T, n, A, t, tpn) \ - MOCK_FUNCTION_EXPECTATION(void A, t, static) \ +#define MOCK_CONSTRUCTOR_AUX(T, n, A, t, tpn) \ + MOCK_FUNCTION_HELPER(void A, t, static) \ T( MOCK_ARGS(n, void A, tpn) ) \ { \ - MOCK_MOCKER(t)( BOOST_PP_ENUM_PARAMS(n, p) ); \ + MOCK_HELPER(t)( BOOST_PP_ENUM_PARAMS(n, p) ); \ } #define MOCK_CONSTRUCTOR(T, n, A, t) \ - MOCK_CONSTRUCTOR_STUB(T, n, A, t,) + MOCK_CONSTRUCTOR_AUX(T, n, A, t,) #define MOCK_CONSTRUCTOR_TPL(T, n, A, t) \ - MOCK_CONSTRUCTOR_STUB(T, n, A, t, BOOST_DEDUCED_TYPENAME) + MOCK_CONSTRUCTOR_AUX(T, n, A, t, BOOST_DEDUCED_TYPENAME) #define MOCK_DESTRUCTOR(T, t) \ - ~T() { MOCK_ANONYMOUS_MOCKER(t).test(); } \ - MOCK_METHOD_EXPECTATION(void(), t) + ~T() { MOCK_ANONYMOUS_HELPER(t).test(); } \ + MOCK_METHOD_HELPER(void(), t) -#define MOCK_FUNCTION_STUB(F, n, S, t, s, tpn) \ - MOCK_FUNCTION_EXPECTATION(S, t, s) \ +#define MOCK_FUNCTION_AUX(F, n, S, t, s, tpn) \ + MOCK_FUNCTION_HELPER(S, t, s) \ s MOCK_DECL(F, n, S,,tpn) \ { \ - return MOCK_MOCKER(t)( BOOST_PP_ENUM_PARAMS(n, p) ); \ + return MOCK_HELPER(t)( BOOST_PP_ENUM_PARAMS(n, p) ); \ } #define MOCK_FUNCTION(F, n, S, t) \ - MOCK_FUNCTION_STUB(F, n, S, t,,) + MOCK_FUNCTION_AUX(F, n, S, t,,) #define MOCK_STATIC_METHOD(F, n, S, t) \ - MOCK_FUNCTION_STUB(F, n, S, t, static,) + MOCK_FUNCTION_AUX(F, n, S, t, static,) #define MOCK_STATIC_METHOD_TPL(F, n, S, t) \ - MOCK_FUNCTION_STUB(F, n, S, t, static, BOOST_DEDUCED_TYPENAME) + MOCK_FUNCTION_AUX(F, n, S, t, static, BOOST_DEDUCED_TYPENAME) -#define MOCK_EXPECT(t) MOCK_MOCKER(t).expect( __FILE__, __LINE__ ) -#define MOCK_RESET(t) MOCK_MOCKER(t).reset( __FILE__, __LINE__ ) -#define MOCK_VERIFY(t) MOCK_MOCKER(t).verify( __FILE__, __LINE__ ) +#define MOCK_EXPECT(t) MOCK_HELPER(t).expect( __FILE__, __LINE__ ) +#define MOCK_RESET(t) MOCK_HELPER(t).reset( __FILE__, __LINE__ ) +#define MOCK_VERIFY(t) MOCK_HELPER(t).verify( __FILE__, __LINE__ ) #endif // MOCK_MOCK_HPP_INCLUDED diff --git a/src/tests/turtle_test/mock_test.cpp b/src/tests/turtle_test/mock_test.cpp index 23d241e..5859c4e 100644 --- a/src/tests/turtle_test/mock_test.cpp +++ b/src/tests/turtle_test/mock_test.cpp @@ -187,48 +187,48 @@ namespace BOOST_AUTO_TEST_CASE( mock_object_is_named ) { my_mock m; - BOOST_CHECK_EQUAL( "?.my_mock::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m.my_method ) ) ); - BOOST_CHECK_EQUAL( "?.my_mock::my_method_2", to_string( MOCK_ANONYMOUS_MOCKER( m.my_method_2 ) ) ); - BOOST_CHECK_EQUAL( "m.my_mock::my_method", to_string( MOCK_MOCKER( m.my_method ) ) ); - BOOST_CHECK_EQUAL( "m.my_mock::my_method_2", to_string( MOCK_ANONYMOUS_MOCKER( m.my_method_2 ) ) ); - BOOST_CHECK_EQUAL( "m.my_mock::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m.my_method ) ) ); - BOOST_CHECK_EQUAL( "m.my_mock::my_method", to_string( MOCK_MOCKER( m.my_method ) ) ); + BOOST_CHECK_EQUAL( "?.my_mock::my_method", to_string( MOCK_ANONYMOUS_HELPER( m.my_method ) ) ); + BOOST_CHECK_EQUAL( "?.my_mock::my_method_2", to_string( MOCK_ANONYMOUS_HELPER( m.my_method_2 ) ) ); + BOOST_CHECK_EQUAL( "m.my_mock::my_method", to_string( MOCK_HELPER( m.my_method ) ) ); + BOOST_CHECK_EQUAL( "m.my_mock::my_method_2", to_string( MOCK_ANONYMOUS_HELPER( m.my_method_2 ) ) ); + BOOST_CHECK_EQUAL( "m.my_mock::my_method", to_string( MOCK_ANONYMOUS_HELPER( m.my_method ) ) ); + BOOST_CHECK_EQUAL( "m.my_mock::my_method", to_string( MOCK_HELPER( m.my_method ) ) ); } BOOST_AUTO_TEST_CASE( mock_object_auto_pointer_is_named ) { std::auto_ptr< my_mock > m( new my_mock ); - BOOST_CHECK_EQUAL( "?.my_mock::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m->my_method ) ) ); - BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_MOCKER( m->my_method ) ) ); - BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m->my_method ) ) ); - BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_MOCKER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "?.my_mock::my_method", to_string( MOCK_ANONYMOUS_HELPER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_HELPER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_ANONYMOUS_HELPER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_HELPER( m->my_method ) ) ); } BOOST_AUTO_TEST_CASE( mock_object_const_auto_pointer_is_named ) { const std::auto_ptr< my_mock > m( new my_mock ); - BOOST_CHECK_EQUAL( "?.my_mock::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m->my_method ) ) ); - BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_MOCKER( m->my_method ) ) ); - BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m->my_method ) ) ); - BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_MOCKER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "?.my_mock::my_method", to_string( MOCK_ANONYMOUS_HELPER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_HELPER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_ANONYMOUS_HELPER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_HELPER( m->my_method ) ) ); } BOOST_AUTO_TEST_CASE( mock_object_shared_pointer_is_named ) { boost::shared_ptr< my_mock > m( new my_mock ); - BOOST_CHECK_EQUAL( "?.my_mock::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m->my_method ) ) ); - BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_MOCKER( m->my_method ) ) ); - BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m->my_method ) ) ); - BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_MOCKER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "?.my_mock::my_method", to_string( MOCK_ANONYMOUS_HELPER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_HELPER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_ANONYMOUS_HELPER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_HELPER( m->my_method ) ) ); } BOOST_AUTO_TEST_CASE( mock_object_const_shared_pointer_is_named ) { const boost::shared_ptr< my_mock > m( new my_mock ); - BOOST_CHECK_EQUAL( "?.my_mock::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m->my_method ) ) ); - BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_MOCKER( m->my_method ) ) ); - BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m->my_method ) ) ); - BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_MOCKER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "?.my_mock::my_method", to_string( MOCK_ANONYMOUS_HELPER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_HELPER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_ANONYMOUS_HELPER( m->my_method ) ) ); + BOOST_CHECK_EQUAL( "m->my_mock::my_method", to_string( MOCK_HELPER( m->my_method ) ) ); } namespace @@ -243,12 +243,12 @@ namespace BOOST_AUTO_TEST_CASE( custom_mock_object_without_macros_and_without_inheriting_from_object_is_named ) { my_custom_mock m; - BOOST_CHECK_EQUAL( "?.my_custom_mock::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m.my_method ) ) ); - BOOST_CHECK_EQUAL( "?.my_custom_mock::my_method_2", to_string( MOCK_ANONYMOUS_MOCKER( m.my_method_2 ) ) ); - BOOST_CHECK_EQUAL( "m.my_custom_mock::my_method", to_string( MOCK_MOCKER( m.my_method ) ) ); - BOOST_CHECK_EQUAL( "m.my_custom_mock::my_method_2", to_string( MOCK_ANONYMOUS_MOCKER( m.my_method_2 ) ) ); - BOOST_CHECK_EQUAL( "m.my_custom_mock::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m.my_method ) ) ); - BOOST_CHECK_EQUAL( "m.my_custom_mock::my_method", to_string( MOCK_MOCKER( m.my_method ) ) ); + BOOST_CHECK_EQUAL( "?.my_custom_mock::my_method", to_string( MOCK_ANONYMOUS_HELPER( m.my_method ) ) ); + BOOST_CHECK_EQUAL( "?.my_custom_mock::my_method_2", to_string( MOCK_ANONYMOUS_HELPER( m.my_method_2 ) ) ); + BOOST_CHECK_EQUAL( "m.my_custom_mock::my_method", to_string( MOCK_HELPER( m.my_method ) ) ); + BOOST_CHECK_EQUAL( "m.my_custom_mock::my_method_2", to_string( MOCK_ANONYMOUS_HELPER( m.my_method_2 ) ) ); + BOOST_CHECK_EQUAL( "m.my_custom_mock::my_method", to_string( MOCK_ANONYMOUS_HELPER( m.my_method ) ) ); + BOOST_CHECK_EQUAL( "m.my_custom_mock::my_method", to_string( MOCK_HELPER( m.my_method ) ) ); } namespace @@ -263,12 +263,12 @@ namespace BOOST_AUTO_TEST_CASE( custom_mock_object_without_macros_is_named ) { my_custom_mock_object m; - BOOST_CHECK_EQUAL( "?.my_custom_mock_object::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m.my_method ) ) ); - BOOST_CHECK_EQUAL( "?.my_custom_mock_object::my_method_2", to_string( MOCK_ANONYMOUS_MOCKER( m.my_method_2 ) ) ); - BOOST_CHECK_EQUAL( "m.my_custom_mock_object::my_method", to_string( MOCK_MOCKER( m.my_method ) ) ); - BOOST_CHECK_EQUAL( "m.my_custom_mock_object::my_method_2", to_string( MOCK_ANONYMOUS_MOCKER( m.my_method_2 ) ) ); - BOOST_CHECK_EQUAL( "m.my_custom_mock_object::my_method", to_string( MOCK_ANONYMOUS_MOCKER( m.my_method ) ) ); - BOOST_CHECK_EQUAL( "m.my_custom_mock_object::my_method", to_string( MOCK_MOCKER( m.my_method ) ) ); + BOOST_CHECK_EQUAL( "?.my_custom_mock_object::my_method", to_string( MOCK_ANONYMOUS_HELPER( m.my_method ) ) ); + BOOST_CHECK_EQUAL( "?.my_custom_mock_object::my_method_2", to_string( MOCK_ANONYMOUS_HELPER( m.my_method_2 ) ) ); + BOOST_CHECK_EQUAL( "m.my_custom_mock_object::my_method", to_string( MOCK_HELPER( m.my_method ) ) ); + BOOST_CHECK_EQUAL( "m.my_custom_mock_object::my_method_2", to_string( MOCK_ANONYMOUS_HELPER( m.my_method_2 ) ) ); + BOOST_CHECK_EQUAL( "m.my_custom_mock_object::my_method", to_string( MOCK_ANONYMOUS_HELPER( m.my_method ) ) ); + BOOST_CHECK_EQUAL( "m.my_custom_mock_object::my_method", to_string( MOCK_HELPER( m.my_method ) ) ); } BOOST_AUTO_TEST_CASE( mock_functor ) @@ -294,7 +294,7 @@ BOOST_AUTO_TEST_CASE( mock_functor_verify ) BOOST_AUTO_TEST_CASE( mock_functor_is_named ) { MOCK_FUNCTOR( f, void() ); - BOOST_CHECK_EQUAL( "f", to_string( MOCK_MOCKER( f ) ) ); + BOOST_CHECK_EQUAL( "f", to_string( MOCK_HELPER( f ) ) ); } namespace @@ -304,7 +304,7 @@ namespace BOOST_AUTO_TEST_CASE( mock_function_is_named ) { - BOOST_CHECK_EQUAL( "mock_function", to_string( MOCK_MOCKER( mock_function ) ) ); + BOOST_CHECK_EQUAL( "mock_function", to_string( MOCK_HELPER( mock_function ) ) ); } namespace @@ -317,5 +317,5 @@ namespace BOOST_AUTO_TEST_CASE( mock_static_function_is_named ) { - BOOST_CHECK_EQUAL( "static_function_class::f", to_string( MOCK_MOCKER( static_function_class::f ) ) ); + BOOST_CHECK_EQUAL( "static_function_class::f", to_string( MOCK_HELPER( static_function_class::f ) ) ); }