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

specified user defined test

Browse Source
This commit is contained in:
Christoph Jentzsch 2014-11-10 07:12:29 +01:00
parent a77d78d994
commit b4d8ff5fdc
2 changed files with 71 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
state.cpp
View File

@ -128,4 +128,43 @@ BOOST_AUTO_TEST_CASE(stPreCompiledContracts)
dev::test::executeTests("stPreCompiledContracts", "/StateTests", dev::test::doStateTests); dev::test::executeTests("stPreCompiledContracts", "/StateTests", dev::test::doStateTests);
} }
BOOST_AUTO_TEST_CASE(userDefinedFileState)
{
for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
{
string arg = boost::unit_test::framework::master_test_suite().argv[i];
if (arg == "--statetest")
{
if (i + 1 >= boost::unit_test::framework::master_test_suite().argc)
{
cnote << "Missing filename\nUsage: testeth --statetest <filename>\n";
return;
}
string filename = boost::unit_test::framework::master_test_suite().argv[i+1];
int currentVerbosity = g_logVerbosity;
g_logVerbosity = 12;
try
{
cnote << "Testing VM..." << "user defined test";
json_spirit::mValue v;
string s = asString(contents(filename));
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + filename + " is empty. ");
json_spirit::read_string(s, v);
dev::test::doStateTests(v, false);
}
catch (Exception const& _e)
{
BOOST_ERROR("Failed state test with Exception: " << diagnostic_information(_e));
}
catch (std::exception const& _e)
{
BOOST_ERROR("Failed state test with Exception: " << _e.what());
}
g_logVerbosity = currentVerbosity;
}
else
continue;
}
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()

53
vm.cpp
View File

@ -459,31 +459,42 @@ BOOST_AUTO_TEST_CASE(vmRandom)
} }
} }
BOOST_AUTO_TEST_CASE(userDefinedFile) BOOST_AUTO_TEST_CASE(userDefinedFileVM)
{ {
if (boost::unit_test::framework::master_test_suite().argc == 2) for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)
{ {
string filename = boost::unit_test::framework::master_test_suite().argv[1]; string arg = boost::unit_test::framework::master_test_suite().argv[i];
int currentVerbosity = g_logVerbosity; if (arg == "--vmtest")
g_logVerbosity = 12;
try
{ {
cnote << "Testing VM..." << "user defined test"; if (i + 1 >= boost::unit_test::framework::master_test_suite().argc)
json_spirit::mValue v; {
string s = asString(contents(filename)); cnote << "Missing filename\nUsage: testeth --vmtest <filename>\n";
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + filename + " is empty. "); return;
json_spirit::read_string(s, v); }
dev::test::doVMTests(v, false); string filename = boost::unit_test::framework::master_test_suite().argv[i+1];
int currentVerbosity = g_logVerbosity;
g_logVerbosity = 12;
try
{
cnote << "Testing VM..." << "user defined test";
json_spirit::mValue v;
string s = asString(contents(filename));
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + filename + " is empty. ");
json_spirit::read_string(s, v);
dev::test::doVMTests(v, false);
}
catch (Exception const& _e)
{
BOOST_ERROR("Failed VM Test with Exception: " << diagnostic_information(_e));
}
catch (std::exception const& _e)
{
BOOST_ERROR("Failed VM Test with Exception: " << _e.what());
}
g_logVerbosity = currentVerbosity;
} }
catch (Exception const& _e) else
{ continue;
BOOST_ERROR("Failed VM Test with Exception: " << diagnostic_information(_e));
}
catch (std::exception const& _e)
{
BOOST_ERROR("Failed VM Test with Exception: " << _e.what());
}
g_logVerbosity = currentVerbosity;
} }
} }