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

Reverted previous commit

Browse source 
This doesn't work and probably never will.

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@695 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2013-11-13 09:42:35 +00:00
parent 2de2bf1072
commit f03c3d96c5
2 changed files with 2 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

33
test/test_mock.cpp
View file

@ -391,36 +391,3 @@ namespace
}
#endif //MOCK_VARIADIC_MACROS
namespace
{
struct base_1
{
virtual ~base_1()
{}
virtual void f_1() = 0;
};
struct base_2
{
virtual ~base_2()
{}
virtual void f_2() = 0;
};
MOCK_BASE_CLASS( mock_1, base_1 )
{
MOCK_METHOD( f_1, 0 )
};
MOCK_BASE_CLASS( mock_2, base_2 ), mock_1
{
MOCK_METHOD( f_2, 0 )
};
}
BOOST_AUTO_TEST_CASE( mock_object_can_inherit_from_another_mock_object )
{
mock_2 m;
MOCK_EXPECT( m.f_1 ).once();
//MOCK_EXPECT( m.f_2 ).once();
//m.f_1();
//m.f_2();
}

4
turtle/mock.hpp
View file

@ -33,7 +33,7 @@
#ifdef MOCK_VARIADIC_MACROS
#define MOCK_BASE_CLASS(T, ...) \
struct T : __VA_ARGS__, virtual mock::object, mock::detail::base< __VA_ARGS__ >
struct T : __VA_ARGS__, mock::object, mock::detail::base< __VA_ARGS__ >
#define MOCK_FUNCTOR(f, ...) \
mock::detail::functor< MOCK_FUNCTION_TYPE((__VA_ARGS__),) > f, f##_mock
@ -44,7 +44,7 @@
#else // MOCK_VARIADIC_MACROS
#define MOCK_BASE_CLASS(T, I) \
struct T : I, virtual mock::object, mock::detail::base< I >
struct T : I, mock::object, mock::detail::base< I >
#define MOCK_FUNCTOR(f, S) \
mock::detail::functor< MOCK_FUNCTION_TYPE(S,) > f, f##_mock