cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prettify VM and State test outputs

Browse Source
This commit is contained in:
Paweł Bylica 2015-03-13 13:10:38 +01:00 committed by Paweł Bylica
parent 31db4fbde8
commit 3782a33e50
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TestHelper.cpp
View File

@ -473,7 +473,7 @@ void executeTests(const string& _name, const string& _testPathAppendix, std::fun
try try
{ {
cnote << "Testing ..." << _name; std::cout << "TEST " << _name << ":\n";
json_spirit::mValue v; json_spirit::mValue v;
string s = asString(dev::contents(testPath + "/" + _name + ".json")); string s = asString(dev::contents(testPath + "/" + _name + ".json"));
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + testPath + "/" + _name + ".json is empty. Have you cloned the 'tests' repo branch develop and set ETHEREUM_TEST_PATH to its path?"); BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + testPath + "/" + _name + ".json is empty. Have you cloned the 'tests' repo branch develop and set ETHEREUM_TEST_PATH to its path?");

6
state.cpp
View File

@ -47,7 +47,7 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
for (auto& i: v.get_obj()) for (auto& i: v.get_obj())
{ {
cerr << i.first << endl; std::cout << " " << i.first << "\n";
mObject& o = i.second.get_obj(); mObject& o = i.second.get_obj();
BOOST_REQUIRE(o.count("env") > 0); BOOST_REQUIRE(o.count("env") > 0);
@ -67,12 +67,12 @@ void doStateTests(json_spirit::mValue& v, bool _fillin)
} }
catch (Exception const& _e) catch (Exception const& _e)
{ {
cnote << "state execution did throw an exception: " << diagnostic_information(_e); cnote << "Exception:\n" << diagnostic_information(_e);
theState.commit(); theState.commit();
} }
catch (std::exception const& _e) catch (std::exception const& _e)
{ {
cnote << "state execution did throw an exception: " << _e.what(); cnote << "state execution exception: " << _e.what();
} }
if (_fillin) if (_fillin)

6
vm.cpp
View File

@ -316,7 +316,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
for (auto& i: v.get_obj()) for (auto& i: v.get_obj())
{ {
cnote << i.first; std::cout << " " << i.first << "\n";
mObject& o = i.second.get_obj(); mObject& o = i.second.get_obj();
BOOST_REQUIRE(o.count("env") > 0); BOOST_REQUIRE(o.count("env") > 0);
@ -354,7 +354,7 @@ void doVMTests(json_spirit::mValue& v, bool _fillin)
} }
catch (VMException const&) catch (VMException const&)
{ {
cnote << "Safe VM Exception"; std::cout << " Safe VM Exception\n";
vmExceptionOccured = true; vmExceptionOccured = true;
} }
catch (Exception const& _e) catch (Exception const& _e)
@ -544,7 +544,7 @@ BOOST_AUTO_TEST_CASE(vmRandom)
{ {
try try
{ {
cnote << "Testing ..." << path.filename(); std::cout << "TEST " << path.filename() << "\n";
json_spirit::mValue v; json_spirit::mValue v;
string s = asString(dev::contents(path.string())); string s = asString(dev::contents(path.string()));
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Content of " + path.string() + " is empty. Have you cloned the 'tests' repo branch develop and set ETHEREUM_TEST_PATH to its path?"); BOOST_REQUIRE_MESSAGE(s.length() > 0, "Content of " + path.string() + " is empty. Have you cloned the 'tests' repo branch develop and set ETHEREUM_TEST_PATH to its path?");