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

Added protected destructor to mock::object

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@406 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2012-01-14 17:41:27 +00:00
parent a82a5b275c
commit 6d3968db1e
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libraries/turtle/object.hpp
View file

@ -36,6 +36,10 @@ namespace mock
impl_->reset(); impl_->reset();
} }
protected:
~object()
{}
private: private:
class object_impl : public detail::context, private verifiable class object_impl : public detail::context, private verifiable
{ {

17
src/tests/turtle_test/object_test.cpp
View file

@ -13,12 +13,15 @@
namespace namespace
{ {
mock::object static_o; struct object : mock::object
{};
object static_o;
} }
BOOST_AUTO_TEST_CASE( verifying_an_empty_object_succeeds ) BOOST_AUTO_TEST_CASE( verifying_an_empty_object_succeeds )
{ {
mock::object o; object o;
BOOST_CHECK( mock::verify( o ) ); BOOST_CHECK( mock::verify( o ) );
} }
@ -30,7 +33,7 @@ namespace
{ {
mock::detail::configure( o, e, "instance", mock::detail::type_name( typeid( "type" ) ), "name" ); mock::detail::configure( o, e, "instance", mock::detail::type_name( typeid( "type" ) ), "name" );
} }
mock::object o; object o;
mock::function< void() > e; mock::function< void() > e;
}; };
} }
@ -60,10 +63,10 @@ BOOST_FIXTURE_TEST_CASE( resetting_an_object_containing_a_failing_expectation_an
BOOST_AUTO_TEST_CASE( an_object_is_assignable_by_sharing_its_state ) BOOST_AUTO_TEST_CASE( an_object_is_assignable_by_sharing_its_state )
{ {
mock::object o1; object o1;
mock::function< void() > e; mock::function< void() > e;
{ {
mock::object o2; object o2;
mock::detail::configure( o2, e, "instance", mock::detail::type_name( typeid( "type" ) ), "name" ); mock::detail::configure( o2, e, "instance", mock::detail::type_name( typeid( "type" ) ), "name" );
e.expect().once(); e.expect().once();
o1 = o2; o1 = o2;
@ -75,8 +78,8 @@ BOOST_AUTO_TEST_CASE( an_object_is_assignable_by_sharing_its_state )
BOOST_AUTO_TEST_CASE( an_object_is_copiable_by_sharing_its_state ) BOOST_AUTO_TEST_CASE( an_object_is_copiable_by_sharing_its_state )
{ {
std::auto_ptr< mock::object > o2( new mock::object ); std::auto_ptr< object > o2( new object );
const mock::object o1( *o2 ); const object o1( *o2 );
mock::function< void() > e; mock::function< void() > e;
mock::detail::configure( *o2, e, "instance", mock::detail::type_name( typeid( "type" ) ), "name" ); mock::detail::configure( *o2, e, "instance", mock::detail::type_name( typeid( "type" ) ), "name" );
e.expect().once(); e.expect().once();