Browse Source

Style fixes and better exception message format

cl-refactor
Lefteris Karapetsas 10 years ago
parent
commit
5ec74209fa
  1. 14
      test/TestHelper.h

14
test/TestHelper.h

@ -49,34 +49,36 @@ namespace test
/// @param _expression The expression for which to make sure no exceptions are thrown /// @param _expression The expression for which to make sure no exceptions are thrown
/// @param _message A message to act as a prefix to the expression's error information /// @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(_expression, _message) \
do { \ do \
{ \
try \ try \
{ \ { \
_expression; \ _expression; \
} \ } \
catch (boost::exception const& _e) \ catch (boost::exception const& _e) \
{ \ { \
auto msg = std::string(_message) + boost::diagnostic_information(_e); \ auto msg = std::string(_message"\n") + boost::diagnostic_information(_e); \
BOOST_FAIL(msg); \ BOOST_FAIL(msg); \
} \ } \
}while (0) } while (0)
/// Check if an Exception is thrown during testing. If one is thrown show its info and continue the test /// 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() /// Our version of BOOST_CHECK_NO_THROW()
/// @param _expression The expression for which to make sure no exceptions are thrown /// @param _expression The expression for which to make sure no exceptions are thrown
/// @param _message A message to act as a prefix to the expression's error information /// @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(_expression, _message) \
do { \ do \
{ \
try \ try \
{ \ { \
_expression; \ _expression; \
} \ } \
catch (boost::exception const& _e) \ catch (boost::exception const& _e) \
{ \ { \
auto msg = std::string(_message) + boost::diagnostic_information(_e); \ auto msg = std::string(_message"\n") + boost::diagnostic_information(_e); \
BOOST_MESSAGE(msg); \ BOOST_MESSAGE(msg); \
} \ } \
}while (0) } while (0)
class ImportTest class ImportTest

Loading…
Cancel
Save