From 4f918457bcd8a051659e72a06d87c0ac26928d51 Mon Sep 17 00:00:00 2001 From: mat007 Date: Wed, 11 May 2011 16:09:59 +0000 Subject: [PATCH] Cleanup git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@322 860be788-9bd5-4423-9f1e-828f051e677b --- src/tests/turtle_test/max_args_test.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/tests/turtle_test/max_args_test.cpp b/src/tests/turtle_test/max_args_test.cpp index ac78f13..c65efa5 100644 --- a/src/tests/turtle_test/max_args_test.cpp +++ b/src/tests/turtle_test/max_args_test.cpp @@ -17,27 +17,27 @@ #define BOOST_LIB_NAME boost_unit_test_framework #include -#define TEXT(z, n, text) text +#define IDENTITY(z, n, d) d namespace { struct my_custom_mock { - MOCK_METHOD_EXT( method, MOCK_MAX_ARGS, void( BOOST_PP_ENUM(MOCK_MAX_ARGS, TEXT, int) ), method ) - MOCK_METHOD_EXT( method2, MOCK_MAX_ARGS, int( BOOST_PP_ENUM(MOCK_MAX_ARGS, TEXT, int) ), method2 ) + MOCK_METHOD_EXT( method, MOCK_MAX_ARGS, void( BOOST_PP_ENUM(MOCK_MAX_ARGS, IDENTITY, int) ), method ) + MOCK_METHOD_EXT( method2, MOCK_MAX_ARGS, int( BOOST_PP_ENUM(MOCK_MAX_ARGS, IDENTITY, int) ), method2 ) }; } BOOST_AUTO_TEST_CASE( call_mock_method_with_max_number_of_args ) { my_custom_mock m; - MOCK_EXPECT( m, method ).once().with( BOOST_PP_ENUM(MOCK_MAX_ARGS, TEXT, 0) ); - m.method( BOOST_PP_ENUM(MOCK_MAX_ARGS, TEXT, 0) ); + MOCK_EXPECT( m, method ).once().with( BOOST_PP_ENUM(MOCK_MAX_ARGS, IDENTITY, 0) ); + m.method( BOOST_PP_ENUM(MOCK_MAX_ARGS, IDENTITY, 0) ); } BOOST_AUTO_TEST_CASE( call_mock_method_with_max_number_of_args_and_returning_something ) { my_custom_mock m; - MOCK_EXPECT( m, method2 ).once().with( BOOST_PP_ENUM(MOCK_MAX_ARGS, TEXT, 0) ).returns( 42 ); - BOOST_CHECK_EQUAL( 42, m.method2( BOOST_PP_ENUM(MOCK_MAX_ARGS, TEXT, 0) ) ); + MOCK_EXPECT( m, method2 ).once().with( BOOST_PP_ENUM(MOCK_MAX_ARGS, IDENTITY, 0) ).returns( 42 ); + BOOST_CHECK_EQUAL( 42, m.method2( BOOST_PP_ENUM(MOCK_MAX_ARGS, IDENTITY, 0) ) ); }