diff options
author | Alex Beregszaszi <alex@rtfs.hu> | 2016-11-16 01:20:24 +0800 |
---|---|---|
committer | Alex Beregszaszi <alex@rtfs.hu> | 2016-11-16 01:20:30 +0800 |
commit | 9205662de9416ab160db7327a6022ea8b1fba3e1 (patch) | |
tree | dff81203a4dbe1c76803c6fe47d9a7f7bd386f3c /test | |
parent | 9719cf38e662e428ace8f3ebce9774a5338f0ce5 (diff) | |
download | dexon-solidity-9205662de9416ab160db7327a6022ea8b1fba3e1.tar dexon-solidity-9205662de9416ab160db7327a6022ea8b1fba3e1.tar.gz dexon-solidity-9205662de9416ab160db7327a6022ea8b1fba3e1.tar.bz2 dexon-solidity-9205662de9416ab160db7327a6022ea8b1fba3e1.tar.lz dexon-solidity-9205662de9416ab160db7327a6022ea8b1fba3e1.tar.xz dexon-solidity-9205662de9416ab160db7327a6022ea8b1fba3e1.tar.zst dexon-solidity-9205662de9416ab160db7327a6022ea8b1fba3e1.zip |
Update tests to use JSON
Diffstat (limited to 'test')
-rw-r--r-- | test/libsolidity/SolidityABIJSON.cpp | 4 | ||||
-rw-r--r-- | test/libsolidity/SolidityNatspecJSON.cpp | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/test/libsolidity/SolidityABIJSON.cpp b/test/libsolidity/SolidityABIJSON.cpp index 073d7d97..0566f253 100644 --- a/test/libsolidity/SolidityABIJSON.cpp +++ b/test/libsolidity/SolidityABIJSON.cpp @@ -40,9 +40,7 @@ public: void checkInterface(std::string const& _code, std::string const& _expectedInterfaceString) { ETH_TEST_REQUIRE_NO_THROW(m_compilerStack.parse("pragma solidity >=0.0;\n" + _code), "Parsing contract failed"); - std::string generatedInterfaceString = m_compilerStack.metadata("", DocumentationType::ABIInterface); - Json::Value generatedInterface; - m_reader.parse(generatedInterfaceString, generatedInterface); + Json::Value generatedInterface = m_compilerStack.metadata("", DocumentationType::ABIInterface); Json::Value expectedInterface; m_reader.parse(_expectedInterfaceString, expectedInterface); BOOST_CHECK_MESSAGE( diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp index 1f74e928..facfcda7 100644 --- a/test/libsolidity/SolidityNatspecJSON.cpp +++ b/test/libsolidity/SolidityNatspecJSON.cpp @@ -45,21 +45,19 @@ public: bool _userDocumentation ) { - std::string generatedDocumentationString; + Json::Value generatedDocumentation; ETH_TEST_REQUIRE_NO_THROW(m_compilerStack.parse("pragma solidity >=0.0;\n" + _code), "Parsing failed"); if (_userDocumentation) - generatedDocumentationString = m_compilerStack.metadata("", DocumentationType::NatspecUser); + generatedDocumentation = m_compilerStack.metadata("", DocumentationType::NatspecUser); else - generatedDocumentationString = m_compilerStack.metadata("", DocumentationType::NatspecDev); - Json::Value generatedDocumentation; - m_reader.parse(generatedDocumentationString, generatedDocumentation); + generatedDocumentation = m_compilerStack.metadata("", DocumentationType::NatspecDev); Json::Value expectedDocumentation; m_reader.parse(_expectedDocumentationString, expectedDocumentation); BOOST_CHECK_MESSAGE( expectedDocumentation == generatedDocumentation, "Expected " << _expectedDocumentationString << - "\n but got:\n" << generatedDocumentationString + "\n but got:\n" << Json::StyledWriter().write(generatedDocumentation) ); } |