Merged refactoring branch

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@379 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2011-07-09 15:16:03 +00:00
parent bec0c8aafa
commit a7c62e523a
19 changed files with 558 additions and 263 deletions

View file

@ -19,39 +19,43 @@ namespace
BOOST_AUTO_TEST_CASE( verifying_an_empty_object_succeeds )
{
mock::object o;
BOOST_CHECK( o.verify() );
BOOST_CHECK( mock::verify( o ) );
}
BOOST_AUTO_TEST_CASE( verifying_an_object_containing_a_failing_expectation_fails )
namespace
{
struct fixture
{
fixture()
{
mock::detail::configure( o, e, "instance", "type", "name" );
}
mock::object o;
mock::function< void() > e;
};
}
BOOST_FIXTURE_TEST_CASE( verifying_an_object_containing_a_failing_expectation_fails, fixture )
{
mock::object o;
mock::function< void() > e;
o.set_child( e );
e.expect().once();
BOOST_CHECK( ! o.verify() );
o.reset();
BOOST_CHECK( o.verify() );
BOOST_CHECK( ! mock::verify( o ) );
mock::reset( o );
BOOST_CHECK( mock::verify( o ) );
}
BOOST_AUTO_TEST_CASE( verifying_all_objects_with_one_of_them_containing_a_failing_expectation_fails )
BOOST_FIXTURE_TEST_CASE( verifying_all_objects_with_one_of_them_containing_a_failing_expectation_fails, fixture )
{
mock::object o;
mock::function< void() > e;
o.set_child( e );
e.expect().once();
BOOST_CHECK( ! mock::verify() );
mock::reset();
BOOST_CHECK( mock::verify() );
}
BOOST_AUTO_TEST_CASE( resetting_an_object_containing_a_failing_expectation_and_verifying_it_succeeds )
BOOST_FIXTURE_TEST_CASE( resetting_an_object_containing_a_failing_expectation_and_verifying_it_succeeds, fixture )
{
mock::object o;
mock::function< void() > e;
o.set_child( e );
e.expect().once();
o.reset();
BOOST_CHECK( o.verify() );
mock::reset( o );
BOOST_CHECK( mock::verify( o ) );
}
BOOST_AUTO_TEST_CASE( an_object_is_assignable_by_sharing_its_state )
@ -60,13 +64,13 @@ BOOST_AUTO_TEST_CASE( an_object_is_assignable_by_sharing_its_state )
mock::function< void() > e;
{
mock::object o2;
o2.set_child( e );
mock::detail::configure( o2, e, "instance", "type", "name" );
e.expect().once();
o1 = o2;
BOOST_CHECK( ! o2.verify() );
BOOST_CHECK( ! o1.verify() );
BOOST_CHECK( ! mock::verify( o2 ) );
BOOST_CHECK( ! mock::verify( o1 ) );
}
BOOST_CHECK( ! o1.verify() );
BOOST_CHECK( ! mock::verify( o1 ) );
}
BOOST_AUTO_TEST_CASE( an_object_is_copiable_by_sharing_its_state )
@ -74,20 +78,10 @@ BOOST_AUTO_TEST_CASE( an_object_is_copiable_by_sharing_its_state )
std::auto_ptr< mock::object > o2( new mock::object );
const mock::object o1( *o2 );
mock::function< void() > e;
o2->set_child( e );
mock::detail::configure( *o2, e, "instance", "type", "name" );
e.expect().once();
BOOST_CHECK( ! o2->verify() );
BOOST_CHECK( ! o1.verify() );
BOOST_CHECK( ! mock::verify( *o2 ) );
BOOST_CHECK( ! mock::verify( o1 ) );
o2.reset();
BOOST_CHECK( ! o1.verify() );
}
BOOST_AUTO_TEST_CASE( an_object_can_be_destroyed_before_its_children_functions )
{
mock::function< void() > f;
{
mock::object o;
o.set_child( f );
}
f.test();
BOOST_CHECK( ! mock::verify( o1 ) );
}