diff --git a/src/tests/turtle_test/sequence_test.cpp b/src/tests/turtle_test/sequence_test.cpp index f2c7270..b3b49ab 100644 --- a/src/tests/turtle_test/sequence_test.cpp +++ b/src/tests/turtle_test/sequence_test.cpp @@ -44,6 +44,20 @@ BOOST_AUTO_TEST_CASE( registering_to_a_sequence_and_calling_in_order_is_valid ) e.expect().once().with( 2 ).in( s ); BOOST_CHECK_NO_THROW( e( 1 ) ); BOOST_CHECK_NO_THROW( e( 2 ) ); + BOOST_CHECK( e.verify() ); +} + +BOOST_AUTO_TEST_CASE( registering_to_a_sequence_and_multiply_calling_in_order_is_valid ) +{ + mock::sequence s; + mock::function< void( int ) > e; + e.expect().exactly( 2 ).with( 1 ).in( s ); + e.expect().exactly( 2 ).with( 2 ).in( s ); + BOOST_CHECK_NO_THROW( e( 1 ) ); + BOOST_CHECK_NO_THROW( e( 1 ) ); + BOOST_CHECK_NO_THROW( e( 2 ) ); + BOOST_CHECK_NO_THROW( e( 2 ) ); + BOOST_CHECK( e.verify() ); } BOOST_AUTO_TEST_CASE( registering_to_a_sequence_enforces_call_order_verification_between_two_different_expectations ) @@ -66,6 +80,8 @@ BOOST_AUTO_TEST_CASE( destroying_a_sequence_removes_order_call_enforcement ) } BOOST_CHECK_NO_THROW( e2() ); BOOST_CHECK_NO_THROW( e1() ); + BOOST_CHECK( e1.verify() ); + BOOST_CHECK( e2.verify() ); } BOOST_AUTO_TEST_CASE( resetting_an_expectation_removes_it_from_order_call_enforcement ) @@ -76,6 +92,8 @@ BOOST_AUTO_TEST_CASE( resetting_an_expectation_removes_it_from_order_call_enforc e2.expect().once().in( s ); e1.reset(); BOOST_CHECK_NO_THROW( e2() ); + BOOST_CHECK( e1.verify() ); + BOOST_CHECK( e2.verify() ); } BOOST_AUTO_TEST_CASE( an_expectation_can_be_used_in_several_sequences ) @@ -84,6 +102,7 @@ BOOST_AUTO_TEST_CASE( an_expectation_can_be_used_in_several_sequences ) mock::function< void() > e; e.expect().once().in( s1 ).in( s2 ); BOOST_CHECK_NO_THROW( e() ); + BOOST_CHECK( e.verify() ); } BOOST_AUTO_TEST_CASE( a_result_specification_is_set_after_a_sequence ) @@ -92,4 +111,5 @@ BOOST_AUTO_TEST_CASE( a_result_specification_is_set_after_a_sequence ) mock::function< int() > e; e.expect().once().in( s ).returns( 3 ); BOOST_CHECK_EQUAL( 3, e() ); + BOOST_CHECK( e.verify() ); } diff --git a/src/tests/turtle_test/silent_error.hpp b/src/tests/turtle_test/silent_error.hpp index 497d711..14642a4 100644 --- a/src/tests/turtle_test/silent_error.hpp +++ b/src/tests/turtle_test/silent_error.hpp @@ -18,13 +18,6 @@ namespace mock template< typename Result > struct silent_error { - static std::string to_string( int i ) - { - std::stringstream s; - s << i; - return s.str(); - } - static Result abort() { throw std::runtime_error( "abort" );