StateTests:

run BCFiller.json as blockchain fill BCFiller.json only as blockchain
ethereum · Jun 1, 2017 · f69de9a · f69de9a
1 parent 6cd51fd
commit f69de9a
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 16 deletions.
diff --git a/test/jsontests b/test/jsontests
diff --git a/test/tools/jsontests/BlockChainTests.cpp b/test/tools/jsontests/BlockChainTests.cpp
@@ -102,16 +102,28 @@ void checkBlocks(TestBlock const& _blockFromFields, TestBlock const& _blockFromR
 
 void doBlockchainTests(json_spirit::mValue& _v, bool _fillin)
 {
-	if (!Options::get().fillchain) //fill blockchain through state tests
+	//fill blockchain through state tests
+	bool isRunFromStateTests = true;
+	if (Options::get().rCurrentTestSuite.find("StateTests") == string::npos)
+	{
+		isRunFromStateTests = false;
 		TestOutputHelper::initTest(_v);
+	}
+
 	for (auto& i: _v.get_obj())
 	{
 		string testname = i.first;
 		json_spirit::mObject& o = i.second.get_obj();
 
-		if (!Options::get().fillchain)
-		if (!TestOutputHelper::passTest(o, testname))
-			continue;
+		//Disable name selection when run from StateTests
+		//(cause 1 state test = many blockchain tests with dynamic names)
+		if (!isRunFromStateTests)
+		{
+			if (!TestOutputHelper::passTest(o, testname))
+				continue;
+		}
+		else
+			TestOutputHelper::setCurrentTestName(testname);
 
 		BOOST_REQUIRE(o.count("genesisBlockHeader"));
 		BOOST_REQUIRE(o.count("pre"));

diff --git a/test/tools/jsontests/StateTests.cpp b/test/tools/jsontests/StateTests.cpp
@@ -36,6 +36,7 @@ using namespace std;
 using namespace json_spirit;
 using namespace dev;
 using namespace dev::eth;
+using namespace dev::test;
 
 namespace dev {  namespace test {
 
@@ -115,25 +116,49 @@ class generaltestfixture
 
 	void fillAllFilesInFolder(string _folder)
 	{
-		std::string fillersPath = dev::test::getTestPath() + "/src/GeneralStateTestsFiller/" + _folder;
+		std::string fillersPath = getTestPath() + "/src/GeneralStateTestsFiller/" + _folder;
+		using dirIt = boost::filesystem::directory_iterator;
 
-		boost::filesystem::directory_iterator iterator_tmp(fillersPath);
+		dirIt iterator_tmp(fillersPath);
 		int fileCount = 0;
-		for(; iterator_tmp != boost::filesystem::directory_iterator(); ++iterator_tmp)
+		for(; iterator_tmp != dirIt(); ++iterator_tmp)
 			if (boost::filesystem::is_regular_file(iterator_tmp->path()) && iterator_tmp->path().extension() == ".json")
 				fileCount++;
-		if (dev::test::Options::get().filltests)
+		if (Options::get().filltests)
 			fileCount *= 2; //tests are checked when filled and after they been filled
-		dev::test::TestOutputHelper::initTest(fileCount);
+		TestOutputHelper::initTest(fileCount);
 
-		boost::filesystem::directory_iterator iterator(fillersPath);
-		for(; iterator != boost::filesystem::directory_iterator(); ++iterator)
+		dirIt iterator(fillersPath);
+		for(; iterator != dirIt(); ++iterator)
 			if (boost::filesystem::is_regular_file(iterator->path()) && iterator->path().extension() == ".json")
 			{
 				string fileboost = iterator->path().filename().string();
-				dev::test::executeTests(fileboost, "/GeneralStateTests/"+_folder, "/GeneralStateTestsFiller/"+_folder, dev::test::doStateTests);
+				if (fileboost.rfind("BCFiller.json") != std::string::npos)
+				{
+					//Skip filling this tests as state tests
+					if (Options::get().filltests && !Options::get().fillchain)
+					{
+						TestOutputHelper::incTestCount(2);
+						continue;
+					}
+
+					//Fill this tests only as blockchain
+					if (Options::get().filltests && Options::get().fillchain)
+						executeTests(fileboost, "/GeneralStateTests/"+_folder, "/GeneralStateTestsFiller/"+_folder, doStateTests);
+					else
+					{
+						TestOutputHelper::incTestCount();
+						TestOutputHelper::setCurrentTestFileName(fileboost);
+						//run this tests as Blockchain when runnning state tests
+						executeTests(fileboost,
+							"/BlockchainTests/GeneralStateTests/" + TestOutputHelper::caseName(),
+							"/GenStateTestAsBcTemp/" + TestOutputHelper::caseName(), doBlockchainTests);
+					}
+				}
+				else
+					executeTests(fileboost, "/GeneralStateTests/"+_folder, "/GeneralStateTestsFiller/"+_folder, doStateTests);
 			}
-		dev::test::TestOutputHelper::finishTest();
+		TestOutputHelper::finishTest();
 	}
 };
 

diff --git a/test/tools/libtesteth/ImportTest.cpp b/test/tools/libtesteth/ImportTest.cpp
@@ -146,7 +146,7 @@ bytes ImportTest::executeTest()
 							json_spirit::mObject obj = fillJsonWithState(search2->second.first, search2->second.second);
 							for (auto& adr: obj)
 							{
-								if (adr.first == toString(m_envInfo.author()))
+								if (adr.first == toString(m_envInfo.author()) || adr.first == "0x" + toString(m_envInfo.author()))
 								{
 									if (adr.second.get_obj().count("balance"))
 									{

diff --git a/test/tools/libtesteth/TestOutputHelper.h b/test/tools/libtesteth/TestOutputHelper.h
@@ -35,11 +35,13 @@ class TestOutputHelper
 	static void initTest(json_spirit::mValue& _v);
 	static bool passTest(json_spirit::mObject& _o, std::string& _testName);
 	static void setMaxTests(int _count) { m_maxTests = _count; }
-	static void setCurrentTestFileName(std::string _name) { m_currentTestFileName = _name; }
+	static void setCurrentTestFileName(std::string const& _name) { m_currentTestFileName = _name; }
+	static void setCurrentTestName(std::string const& _name) { m_currentTestName = _name; }
 	static std::string const& testName() { return m_currentTestName; }
 	static std::string const& caseName() { return m_currentTestCaseName; }
 	static std::string const& testFileName() { return m_currentTestFileName; }
 	static void finishTest();
+	static void incTestCount(int _times = 1) { m_currTest += _times; }
 	static void printTestExecStats();
 	~TestOutputHelper() { TestOutputHelper::finishTest(); }
 private: