MOCK_INTERFACE renamed to MOCK_BASE_CLASS

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@19 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2009-09-01 14:49:20 +00:00
parent 60d5c263a6
commit 91ea509797
2 changed files with 5 additions and 5 deletions

View file

@ -78,7 +78,7 @@ namespace detail
}; \ }; \
struct T##_super_class; \ struct T##_super_class; \
typedef T##_mock_mixin< T##_super_class > T; typedef T##_mock_mixin< T##_super_class > T;
#define MOCK_INTERFACE(T, I) \ #define MOCK_BASE_CLASS(T, I) \
MOCK_MIXIN(T) \ MOCK_MIXIN(T) \
struct T##_typedef { typedef I interface_type; }; \ struct T##_typedef { typedef I interface_type; }; \
struct T##_super_class : I, mock::object, private T##_typedef struct T##_super_class : I, mock::object, private T##_typedef

View file

@ -94,12 +94,12 @@ namespace
int value_; int value_;
}; };
MOCK_INTERFACE( my_mock_observer, my_observer ) MOCK_BASE_CLASS( my_mock_observer, my_observer )
{ {
MOCK_METHOD( notify, 1 ) MOCK_METHOD( notify, 1 )
}; };
MOCK_INTERFACE( my_mock_manager, my_manager ) MOCK_BASE_CLASS( my_mock_manager, my_manager )
{ {
MOCK_METHOD( get_observer, 0 ) MOCK_METHOD( get_observer, 0 )
}; };
@ -138,7 +138,7 @@ namespace
virtual void my_method( int ) = 0; virtual void my_method( int ) = 0;
}; };
MOCK_INTERFACE( my_ambiguited_mock, my_ambiguited_interface ) MOCK_BASE_CLASS( my_ambiguited_mock, my_ambiguited_interface )
{ {
MOCK_METHOD_EXT( my_method, 0, void(), tag1 ) MOCK_METHOD_EXT( my_method, 0, void(), tag1 )
MOCK_METHOD_EXT( my_method, 1, void( int ), tag2 ) MOCK_METHOD_EXT( my_method, 1, void( int ), tag2 )
@ -164,7 +164,7 @@ namespace
virtual void my_method() const = 0; virtual void my_method() const = 0;
}; };
MOCK_INTERFACE( my_const_ambiguited_mock, my_const_ambiguited_interface ) MOCK_BASE_CLASS( my_const_ambiguited_mock, my_const_ambiguited_interface )
{ {
MOCK_NON_CONST_METHOD_EXT( my_method, 0, void(), tag1 ) MOCK_NON_CONST_METHOD_EXT( my_method, 0, void(), tag1 )
MOCK_CONST_METHOD_EXT( my_method, 0, void(), tag2 ) MOCK_CONST_METHOD_EXT( my_method, 0, void(), tag2 )