diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:33:54 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2016-10-06 10:36:09 +0900 |
| commit | d9ec475d945d3035377a0d89ed42e382d8988891 (patch) | |
| tree | 34aff2cee4b209906243ab5499d61f3edee2982f /boost/test/impl/test_tools.ipp | |
| parent | 71d216b90256936a9638f325af9bc69d720e75de (diff) | |
| download | boost-d9ec475d945d3035377a0d89ed42e382d8988891.tar.gz boost-d9ec475d945d3035377a0d89ed42e382d8988891.tar.bz2 boost-d9ec475d945d3035377a0d89ed42e382d8988891.zip | |
Imported Upstream version 1.60.0
Change-Id: Ie709530d6d5841088ceaba025cbe175a4ef43050
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/test/impl/test_tools.ipp')
| -rw-r--r-- | boost/test/impl/test_tools.ipp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/boost/test/impl/test_tools.ipp b/boost/test/impl/test_tools.ipp index 03fea91605..ed94da3a5b 100644 --- a/boost/test/impl/test_tools.ipp +++ b/boost/test/impl/test_tools.ipp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2014. +// (C) Copyright Gennadiy Rozental 2001. // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -294,9 +294,8 @@ report_assertion( assertion_result const& ar, { using namespace unit_test; - if( framework::current_test_case_id() == INV_TEST_UNIT_ID ) - BOOST_TEST_IMPL_THROW( - std::runtime_error( "can't use testing tools outside of test case implementation" ) ); + BOOST_TEST_I_ASSRT( framework::current_test_case_id() != INV_TEST_UNIT_ID, + std::runtime_error( "Can't use testing tools outside of test case implementation." ) ); if( !!ar ) tl = PASS; @@ -357,7 +356,7 @@ report_assertion( assertion_result const& ar, framework::test_unit_aborted( framework::current_test_case() ); - BOOST_TEST_IMPL_THROW( execution_aborted() ); + BOOST_TEST_I_THROW( execution_aborted() ); } return true; |