diff --git a/src/libraries/turtle/mock.hpp b/src/libraries/turtle/mock.hpp index 2392ba3..e2b474c 100644 --- a/src/libraries/turtle/mock.hpp +++ b/src/libraries/turtle/mock.hpp @@ -78,7 +78,7 @@ namespace detail }; \ struct T##_super_class; \ typedef T##_mock_mixin< T##_super_class > T; -#define MOCK_INTERFACE(T, I) \ +#define MOCK_BASE_CLASS(T, I) \ MOCK_MIXIN(T) \ struct T##_typedef { typedef I interface_type; }; \ struct T##_super_class : I, mock::object, private T##_typedef diff --git a/src/tests/turtle_test/samples_test.cpp b/src/tests/turtle_test/samples_test.cpp index 35a74d1..fb2eb72 100644 --- a/src/tests/turtle_test/samples_test.cpp +++ b/src/tests/turtle_test/samples_test.cpp @@ -94,12 +94,12 @@ namespace int value_; }; - MOCK_INTERFACE( my_mock_observer, my_observer ) + MOCK_BASE_CLASS( my_mock_observer, my_observer ) { MOCK_METHOD( notify, 1 ) }; - MOCK_INTERFACE( my_mock_manager, my_manager ) + MOCK_BASE_CLASS( my_mock_manager, my_manager ) { MOCK_METHOD( get_observer, 0 ) }; @@ -138,7 +138,7 @@ namespace 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, 1, void( int ), tag2 ) @@ -164,7 +164,7 @@ namespace 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_CONST_METHOD_EXT( my_method, 0, void(), tag2 )