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

Renamed MOCK_STATIC_FUNCTION to MOCK_STATIC_METHOD

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@423 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2012-03-15 07:40:29 +00:00
parent 01e31a39c3
commit 45d2d58000
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libraries/turtle/mock.hpp
View file

@ -25,7 +25,6 @@
#include <boost/mpl/pop_front.hpp> #include <boost/mpl/pop_front.hpp>
#define BOOST_TYPEOF_SILENT #define BOOST_TYPEOF_SILENT
#include <boost/typeof/typeof.hpp> #include <boost/typeof/typeof.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/type_traits.hpp> #include <boost/type_traits.hpp>
namespace mock namespace mock
@ -165,9 +164,9 @@ namespace detail
} }
#define MOCK_FUNCTION(F, n, S, t) \ #define MOCK_FUNCTION(F, n, S, t) \
MOCK_FUNCTION_STUB(F, n, S, t,,) MOCK_FUNCTION_STUB(F, n, S, t,,)
#define MOCK_STATIC_FUNCTION(F, n, S, t) \ #define MOCK_STATIC_METHOD(F, n, S, t) \
MOCK_FUNCTION_STUB(F, n, S, t, static,) MOCK_FUNCTION_STUB(F, n, S, t, static,)
#define MOCK_STATIC_FUNCTION_TPL(F, n, S, t) \ #define MOCK_STATIC_METHOD_TPL(F, n, S, t) \
MOCK_FUNCTION_STUB(F, n, S, t, static, BOOST_DEDUCED_TYPENAME) MOCK_FUNCTION_STUB(F, n, S, t, static, BOOST_DEDUCED_TYPENAME)
#define MOCK_EXPECT(t) MOCK_MOCKER(t).expect( __FILE__, __LINE__ ) #define MOCK_EXPECT(t) MOCK_MOCKER(t).expect( __FILE__, __LINE__ )

4
src/tests/turtle_test/integration_test.cpp
View file

@ -467,7 +467,7 @@ namespace
{ {
struct some_class struct some_class
{ {
MOCK_STATIC_FUNCTION( some_static_method, 1, float( int ), some_static_method ) MOCK_STATIC_METHOD( some_static_method, 1, float( int ), some_static_method )
}; };
} }
@ -484,7 +484,7 @@ namespace
template< typename T > template< typename T >
struct some_template_class struct some_template_class
{ {
MOCK_STATIC_FUNCTION_TPL( some_static_method, 1, float( T ), some_static_method ) MOCK_STATIC_METHOD_TPL( some_static_method, 1, float( T ), some_static_method )
}; };
} }

2
src/tests/turtle_test/mock_test.cpp
View file

@ -311,7 +311,7 @@ namespace
{ {
MOCK_CLASS( static_function_class ) MOCK_CLASS( static_function_class )
{ {
MOCK_STATIC_FUNCTION( f, 1, float( int ), f ) MOCK_STATIC_METHOD( f, 1, float( int ), f )
}; };
} }