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

Refactoring

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@488 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2012-07-22 07:03:26 +00:00
parent d18cc38ac1
commit 435dadf89d
2 changed files with 33 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

70
turtle/detail/function_template.hpp
View file

@ -64,11 +64,6 @@ namespace mock
return impl_->expect(); return impl_->expect();
} }
void test() const
{
impl_->test();
}
R operator()( BOOST_PP_ENUM_BINARY_PARAMS(MOCK_NUM_ARGS, T, t) ) const R operator()( BOOST_PP_ENUM_BINARY_PARAMS(MOCK_NUM_ARGS, T, t) ) const
{ {
return (*impl_)( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, t) ); return (*impl_)( BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, t) );
@ -176,50 +171,47 @@ namespace mock
#define MOCK_FORMAT(z, n, N) \ #define MOCK_FORMAT(z, n, N) \
<< " " << mock::format( t##n ) \ << " " << mock::format( t##n ) \
<< BOOST_PP_IF(BOOST_PP_EQUAL(N,n), " ", ",") << BOOST_PP_IF(BOOST_PP_EQUAL(N,n), " ", ",")
#define MOCK_CONTEXT(n) \ #define MOCK_CONTEXT \
boost::unit_test::lazy_ostream::instance() \ boost::unit_test::lazy_ostream::instance() \
<< lazy_context( this ) \ << lazy_context( this ) \
<< "(" BOOST_PP_REPEAT(n, MOCK_FORMAT, BOOST_PP_DEC(n)) \ << "(" BOOST_PP_REPEAT(MOCK_NUM_ARGS, MOCK_FORMAT, \
BOOST_PP_DEC(MOCK_NUM_ARGS)) \
<< ")" \ << ")" \
<< lazy_expectations( this ) << lazy_expectations( this )
#define MOCK_INVOKE(n, A) \
{ \
valid_ = false; \
for( expectations_cit it = expectations_.begin(); \
it != expectations_.end(); ++it ) \
if( it->is_valid( BOOST_PP_ENUM_PARAMS(n, t) ) ) \
{ \
if( ! it->invoke() ) \
{ \
error_type::sequence_failed( \
MOCK_CONTEXT(n), it->file(), it->line() ); \
return A; \
} \
if( ! it->functor() ) \
{ \
error_type::missing_action( \
MOCK_CONTEXT(n), it->file(), it->line() ); \
return A; \
} \
valid_ = true; \
error_type::expected_call( \
MOCK_CONTEXT(n), it->file(), it->line() ); \
return it->functor()( BOOST_PP_ENUM_PARAMS(n, t) ); \
} \
error_type::unexpected_call( MOCK_CONTEXT(n) ); \
return A; \
}
result_type operator()( result_type operator()(
BOOST_PP_ENUM_BINARY_PARAMS(MOCK_NUM_ARGS, T, t) ) const BOOST_PP_ENUM_BINARY_PARAMS(MOCK_NUM_ARGS, T, t) ) const
MOCK_INVOKE(MOCK_NUM_ARGS, error_type::abort()) {
valid_ = false;
void test() const for( expectations_cit it = expectations_.begin();
MOCK_INVOKE(0,) it != expectations_.end(); ++it )
if( it->is_valid( \
BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, t) ) )
{
if( ! it->invoke() )
{
error_type::sequence_failed(
MOCK_CONTEXT, it->file(), it->line() );
return error_type::abort();
}
if( ! it->functor() )
{
error_type::missing_action(
MOCK_CONTEXT, it->file(), it->line() );
return error_type::abort();
}
valid_ = true;
error_type::expected_call(
MOCK_CONTEXT, it->file(), it->line() );
return it->functor()( \
BOOST_PP_ENUM_PARAMS(MOCK_NUM_ARGS, t) );
}
error_type::unexpected_call( MOCK_CONTEXT );
return error_type::abort();
}
#undef MOCK_FORMAT #undef MOCK_FORMAT
#undef MOCK_OPERATOR #undef MOCK_OPERATOR
#undef MOCK_INVOKE
#undef MOCK_CONTEXT #undef MOCK_CONTEXT
friend std::ostream& operator<<( friend std::ostream& operator<<(

4
turtle/mock.hpp
View file

@ -141,8 +141,8 @@ namespace detail
MOCK_CONSTRUCTOR_AUX(T, n, A, t, BOOST_DEDUCED_TYPENAME) MOCK_CONSTRUCTOR_AUX(T, n, A, t, BOOST_DEDUCED_TYPENAME)
#define MOCK_DESTRUCTOR(T, t) \ #define MOCK_DESTRUCTOR(T, t) \
~T() { MOCK_ANONYMOUS_HELPER(t).test(); } \ MOCK_METHOD_HELPER(void(), t) \
MOCK_METHOD_HELPER(void(), t) ~T() { try { MOCK_ANONYMOUS_HELPER(t)(); } catch( ... ) {} }
#define MOCK_FUNCTION_AUX(F, n, S, t, s, tpn) \ #define MOCK_FUNCTION_AUX(F, n, S, t, s, tpn) \
MOCK_FUNCTION_HELPER(S, t, s) \ MOCK_FUNCTION_HELPER(S, t, s) \