From ed5ae2b859379d4109d5872f49782cab609225f0 Mon Sep 17 00:00:00 2001 From: mat007 Date: Sun, 27 Sep 2009 09:26:10 +0000 Subject: [PATCH] Simplification git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@54 860be788-9bd5-4423-9f1e-828f051e677b --- src/libraries/turtle/expectation.hpp | 2 +- src/libraries/turtle/mock.hpp | 4 ++-- src/tests/turtle_test/integration_test.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libraries/turtle/expectation.hpp b/src/libraries/turtle/expectation.hpp index 837cdae..aa5f9c1 100644 --- a/src/libraries/turtle/expectation.hpp +++ b/src/libraries/turtle/expectation.hpp @@ -48,7 +48,7 @@ namespace mock public: struct expectation_tag {}; - expectation_tag operator_exp; + expectation_tag exp_; expectation( const std::string& name = "?" ) : impl_( new expectation_impl( root, name ) ) diff --git a/src/libraries/turtle/mock.hpp b/src/libraries/turtle/mock.hpp index 1fc9091..d28c33a 100644 --- a/src/libraries/turtle/mock.hpp +++ b/src/libraries/turtle/mock.hpp @@ -140,7 +140,7 @@ namespace detail mock::expectation< S > #define MOCK_MOCKER(o, t) \ - mock::detail::configure( mock::detail::ref( o ).t##_exp, \ + mock::detail::configure( mock::detail::ref( o ).exp##t, \ BOOST_PP_STRINGIZE(t), mock::detail::ref( o ) ) #define MOCK_METHOD_ARG(z, n, arg) BOOST_PP_COMMA_IF(n) \ @@ -153,7 +153,7 @@ namespace detail #define MOCK_MOCKER_ARGS(n) \ BOOST_PP_REPEAT_FROM_TO(0, n, MOCK_MOCKER_ARG, BOOST_PP_EMPTY) #define MOCK_METHOD_EXPECTATION(S, t) \ - mutable mock::expectation< S > t##_exp; + mutable mock::expectation< S > exp##t; #define MOCK_METHOD_STUB(M, n, S, t, c, tpn) \ tpn boost::function< S >::result_type M( \ diff --git a/src/tests/turtle_test/integration_test.cpp b/src/tests/turtle_test/integration_test.cpp index ec69e5d..1f31fa7 100644 --- a/src/tests/turtle_test/integration_test.cpp +++ b/src/tests/turtle_test/integration_test.cpp @@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE( mock_functor_in_function_is_supported ) boost::function< int( float, const std::string& ) > func; { MOCK_FUNCTOR( int( float, const std::string& ) ) f; - MOCK_EXPECT(f, operator).once().with( 3, "op" ).returns( 42 ); + MOCK_EXPECT( f, _ ).once().with( 3, "op" ).returns( 42 ); func = f; } BOOST_CHECK_EQUAL( 42, func( 3, "op" ) ); @@ -154,7 +154,7 @@ namespace BOOST_FIXTURE_TEST_CASE( mock_functor_in_fixture_is_supported, functor_fixture ) { - MOCK_EXPECT(f, operator).once().with( 3, "op" ).returns( 42 ); + MOCK_EXPECT( f, _ ).once().with( 3, "op" ).returns( 42 ); BOOST_CHECK_EQUAL( 42, f( 3.f, "op" ) ); }