diff options
| author | subtly <subtly@users.noreply.github.com> | 2015-03-10 02:03:58 +0800 |
|---|---|---|
| committer | subtly <subtly@users.noreply.github.com> | 2015-03-10 02:03:58 +0800 |
| commit | f4ac58583b0a90b17069a7a5c34282750e047058 (patch) | |
| tree | aeac29716c6670b133adf0d2cdf451073464cbab | |
| parent | 1c53a9107c65ee650368c003a36008f5f448349e (diff) | |
| parent | d586a88f3cab21db88f31dd574daac4bb9a28b7d (diff) | |
| download | dexon-solidity-f4ac58583b0a90b17069a7a5c34282750e047058.tar dexon-solidity-f4ac58583b0a90b17069a7a5c34282750e047058.tar.gz dexon-solidity-f4ac58583b0a90b17069a7a5c34282750e047058.tar.bz2 dexon-solidity-f4ac58583b0a90b17069a7a5c34282750e047058.tar.lz dexon-solidity-f4ac58583b0a90b17069a7a5c34282750e047058.tar.xz dexon-solidity-f4ac58583b0a90b17069a7a5c34282750e047058.tar.zst dexon-solidity-f4ac58583b0a90b17069a7a5c34282750e047058.zip | |
Merge branch 'develop' into p2p
| -rw-r--r-- | TestHelper.h | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/TestHelper.h b/TestHelper.h index 91ec977d..0f23f945 100644 --- a/TestHelper.h +++ b/TestHelper.h @@ -46,39 +46,55 @@ namespace test /// Make sure that no Exception is thrown during testing. If one is thrown show its info and fail the test. /// Our version of BOOST_REQUIRE_NO_THROW() -/// @param _expression The expression for which to make sure no exceptions are thrown +/// @param _statenent The statement for which to make sure no exceptions are thrown /// @param _message A message to act as a prefix to the expression's error information -#define ETH_TEST_REQUIRE_NO_THROW(_expression, _message) \ +#define ETH_TEST_REQUIRE_NO_THROW(_statement, _message) \ do \ { \ try \ { \ - _expression; \ + BOOST_TEST_PASSPOINT(); \ + _statement; \ } \ catch (boost::exception const& _e) \ { \ - auto msg = std::string(_message"\n") + boost::diagnostic_information(_e); \ - BOOST_FAIL(msg); \ + auto msg = std::string(_message " due to an exception thrown by " \ + BOOST_STRINGIZE(_statement) "\n") + boost::diagnostic_information(_e); \ + BOOST_CHECK_IMPL(false, msg, REQUIRE, CHECK_MSG); \ } \ - } while (0) + catch (...) \ + { \ + BOOST_CHECK_IMPL(false, "Unknown exception thrown by " \ + BOOST_STRINGIZE(_statement), REQUIRE, CHECK_MSG); \ + } \ + } \ + while (0) /// Check if an Exception is thrown during testing. If one is thrown show its info and continue the test /// Our version of BOOST_CHECK_NO_THROW() -/// @param _expression The expression for which to make sure no exceptions are thrown +/// @param _statement The statement for which to make sure no exceptions are thrown /// @param _message A message to act as a prefix to the expression's error information -#define ETH_TEST_CHECK_NO_THROW(_expression, _message) \ +#define ETH_TEST_CHECK_NO_THROW(_statement, _message) \ do \ { \ try \ { \ - _expression; \ + BOOST_TEST_PASSPOINT(); \ + _statement; \ } \ catch (boost::exception const& _e) \ { \ - auto msg = std::string(_message"\n") + boost::diagnostic_information(_e); \ - BOOST_MESSAGE(msg); \ + auto msg = std::string(_message " due to an exception thrown by " \ + BOOST_STRINGIZE(_statement) "\n") + boost::diagnostic_information(_e); \ + BOOST_CHECK_IMPL(false, msg, CHECK, CHECK_MSG); \ + } \ + catch (...) \ + { \ + BOOST_CHECK_IMPL(false, "Unknown exception thrown by " \ + BOOST_STRINGIZE(_statement), CHECK, CHECK_MSG ); \ } \ - } while (0) + } \ + while (0) class ImportTest |