diff options
| author | chriseth <chris@ethereum.org> | 2017-09-20 17:52:41 +0800 |
|---|---|---|
| committer | chriseth <chris@ethereum.org> | 2017-09-22 22:17:28 +0800 |
| commit | a844bbda48564d65033522a64cef30bff5dea973 (patch) | |
| tree | 008494a0618051e4d71a2e28b94e436dc34ece6a /test/TestHelper.h | |
| parent | ab8ce58a3e522cfe8d0a36132e5e0b305d4ca052 (diff) | |
| download | dexon-solidity-a844bbda48564d65033522a64cef30bff5dea973.tar.gz dexon-solidity-a844bbda48564d65033522a64cef30bff5dea973.tar.zst dexon-solidity-a844bbda48564d65033522a64cef30bff5dea973.zip | |
Cleanup test helper macros.
Diffstat (limited to 'test/TestHelper.h')
| -rw-r--r-- | test/TestHelper.h | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/test/TestHelper.h b/test/TestHelper.h index 3e74b54c..d50568ad 100644 --- a/test/TestHelper.h +++ b/test/TestHelper.h @@ -15,8 +15,6 @@ along with solidity. If not, see <http://www.gnu.org/licenses/>. */ /** @file TestHelper.h - * @author Marko Simovic <markobarko@gmail.com> - * @date 2014 */ #pragma once @@ -31,78 +29,6 @@ namespace dev namespace test { -#if (BOOST_VERSION >= 105900) -#define ETH_BOOST_CHECK_IMPL(_message, _requireOrCheck) BOOST_TEST_TOOL_DIRECT_IMPL( \ - false, \ - _requireOrCheck, \ - _message \ - ) -#else -#define ETH_BOOST_CHECK_IMPL(_message, _requireOrCheck) BOOST_CHECK_IMPL( \ - false, \ - _message, \ - _requireOrCheck, \ - CHECK_MSG \ - ) -#endif - -/// 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 _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_REQUIRE_NO_THROW(_statement, _message) \ - do \ - { \ - try \ - { \ - BOOST_TEST_PASSPOINT(); \ - _statement; \ - } \ - catch (boost::exception const& _e) \ - { \ - auto msg = std::string(_message " due to an exception thrown by " \ - BOOST_STRINGIZE(_statement) "\n") + boost::diagnostic_information(_e); \ - ETH_BOOST_CHECK_IMPL(msg, REQUIRE); \ - } \ - catch (...) \ - { \ - ETH_BOOST_CHECK_IMPL( \ - "Unknown exception thrown by " BOOST_STRINGIZE(_statement), \ - REQUIRE \ - ); \ - } \ - } \ - 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 _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(_statement, _message) \ - do \ - { \ - try \ - { \ - BOOST_TEST_PASSPOINT(); \ - _statement; \ - } \ - catch (boost::exception const& _e) \ - { \ - auto msg = std::string(_message " due to an exception thrown by " \ - BOOST_STRINGIZE(_statement) "\n") + boost::diagnostic_information(_e); \ - ETH_BOOST_CHECK_IMPL(msg, CHECK); \ - } \ - catch (...) \ - { \ - ETH_BOOST_CHECK_IMPL( \ - "Unknown exception thrown by " BOOST_STRINGIZE(_statement), \ - CHECK \ - ); \ - } \ - } \ - while (0) - - struct Options: boost::noncopyable { std::string ipcPath; |