diff options
| author | Lefteris Karapetsas <lefteris@refu.co> | 2015-03-06 19:58:08 +0800 |
|---|---|---|
| committer | Lefteris Karapetsas <lefteris@refu.co> | 2015-03-06 21:37:20 +0800 |
| commit | 4534ff8792ad9849845457ff063ed0d3f2a2181a (patch) | |
| tree | c1e094e3e4af27d253e6b4e09e3d848dbc9ec3d6 | |
| parent | 4cd659c51d36eb03b4734ea8d2a2f246af9fac41 (diff) | |
| download | dexon-solidity-4534ff8792ad9849845457ff063ed0d3f2a2181a.tar dexon-solidity-4534ff8792ad9849845457ff063ed0d3f2a2181a.tar.gz dexon-solidity-4534ff8792ad9849845457ff063ed0d3f2a2181a.tar.bz2 dexon-solidity-4534ff8792ad9849845457ff063ed0d3f2a2181a.tar.lz dexon-solidity-4534ff8792ad9849845457ff063ed0d3f2a2181a.tar.xz dexon-solidity-4534ff8792ad9849845457ff063ed0d3f2a2181a.tar.zst dexon-solidity-4534ff8792ad9849845457ff063ed0d3f2a2181a.zip | |
Adding ETH_TEST macros to ABI and EndToEndTests
| -rw-r--r-- | SolidityABIJSON.cpp | 12 | ||||
| -rw-r--r-- | solidityExecutionFramework.h | 14 |
2 files changed, 5 insertions, 21 deletions
diff --git a/SolidityABIJSON.cpp b/SolidityABIJSON.cpp index 10873b5a..5f67a566 100644 --- a/SolidityABIJSON.cpp +++ b/SolidityABIJSON.cpp @@ -20,7 +20,7 @@ * Unit tests for the solidity compiler JSON Interface output. */ -#include <boost/test/unit_test.hpp> +#include "TestHelper.h" #include <libsolidity/CompilerStack.h> #include <json/json.h> #include <libdevcore/Exceptions.h> @@ -39,15 +39,7 @@ public: void checkInterface(std::string const& _code, std::string const& _expectedInterfaceString) { - try - { - m_compilerStack.parse(_code); - } - catch(boost::exception const& _e) - { - auto msg = std::string("Parsing contract failed with: ") + boost::diagnostic_information(_e); - BOOST_FAIL(msg); - } + ETH_TEST_REQUIRE_NO_THROW(m_compilerStack.parse(_code), "Parsing contract failed"); std::string generatedInterfaceString = m_compilerStack.getMetadata("", DocumentationType::ABIInterface); Json::Value generatedInterface; m_reader.parse(generatedInterfaceString, generatedInterface); diff --git a/solidityExecutionFramework.h b/solidityExecutionFramework.h index 4ef9bfdc..e8776063 100644 --- a/solidityExecutionFramework.h +++ b/solidityExecutionFramework.h @@ -25,7 +25,7 @@ #include <string> #include <tuple> -#include <boost/test/unit_test.hpp> +#include "TestHelper.h" #include <libethereum/State.h> #include <libethereum/Executive.h> #include <libsolidity/CompilerStack.h> @@ -46,16 +46,8 @@ public: bytes const& compileAndRun(std::string const& _sourceCode, u256 const& _value = 0, std::string const& _contractName = "") { dev::solidity::CompilerStack compiler(m_addStandardSources); - try - { - compiler.addSource("", _sourceCode); - compiler.compile(m_optimize); - } - catch(boost::exception const& _e) - { - auto msg = std::string("Compiling contract failed with: ") + boost::diagnostic_information(_e); - BOOST_FAIL(msg); - } + compiler.addSource("", _sourceCode); + ETH_TEST_REQUIRE_NO_THROW(compiler.compile(m_optimize), "Compiling contract failed"); bytes code = compiler.getBytecode(_contractName); sendMessage(code, true, _value); |