fixes LegacyTests suite

Author: Dimitry Kh

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [1.7.0] - Unreleased
 
+- Added: [#5735](https://github.com/ethereum/aleth/pull/5735) LegacyTests suite to the testeth
 - Added: [#5537](https://github.com/ethereum/aleth/pull/5537) Creating Ethereum Node Record (ENR) at program start.
 - Added: [#5571](https://github.com/ethereum/aleth/pull/5571) Support Discovery v4 ENR Extension messages.
 - Added: [#5557](https://github.com/ethereum/aleth/pull/5557) Improved debug logging of full sync.

test/tools/jsontests/BlockChainTests.h

@@ -21,7 +21,7 @@ along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 #include <libethashseal/Ethash.h>
 #include <libethashseal/GenesisInfo.h>
-#include <test/tools/jsontests/Common.h>
+#include <test/tools/jsontests/StateTestFixtureBase.h>
 #include <test/tools/libtesteth/BlockChainHelper.h>
 #include <test/tools/libtesteth/TestSuite.h>
 #include <boost/filesystem/path.hpp>
@@ -57,7 +57,7 @@ class BCGeneralStateTestsSuite : public BlockchainValidTestSuite
 class bcGeneralTestsFixture : public StateTestFixtureBase<BCGeneralStateTestsSuite>
 {
 public:
-    bcGeneralTestsFixture() : StateTestFixtureBase(TestExecution::REQUIRE_OPTION_ALL) {}
+    bcGeneralTestsFixture() : StateTestFixtureBase(TestExecution::RequireOptionAll) {}
 };
 
 class TransitionTestsSuite: public TestSuite

test/tools/jsontests/Common.h

@@ -1,5 +1,27 @@
+/*
+    This file is part of cpp-ethereum.
+
+    cpp-ethereum is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    cpp-ethereum is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file LegacyTestsBoost.h
+ * @authors:
+ *   Dimitry Khokhlov <dimitry@ethereum.org>
+ * @date 2019
+ */
+
 #include <test/tools/jsontests/BlockChainTests.h>
-#include <test/tools/jsontests/Common.h>
+#include <test/tools/jsontests/StateTestFixtureBase.h>
 #include <test/tools/jsontests/StateTests.h>
 
 namespace fs = boost::filesystem;
@@ -39,7 +61,7 @@ class LegacyConstantinopleGeneralStateTestFixture
 {
 public:
     LegacyConstantinopleGeneralStateTestFixture()
-      : StateTestFixtureBase(TestExecution::NOT_REFILLABLE)
+      : StateTestFixtureBase(TestExecution::NotRefillable)
     {}
 };
 
@@ -48,7 +70,7 @@ class LegacyConstantinopleBCGeneralStateTestFixture
 {
 public:
     LegacyConstantinopleBCGeneralStateTestFixture()
-      : StateTestFixtureBase(TestExecution::REQUIRE_OPTION_ALL_NOT_REFILLABLE)
+      : StateTestFixtureBase(TestExecution::RequireOptionAllNotRefillable)
     {}
 };
 

test/tools/jsontests/LegacyTestsBoost.h

@@ -0,0 +1,76 @@
+/*
+    This file is part of cpp-ethereum.
+
+    cpp-ethereum is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    cpp-ethereum is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file StateTestFixtureBase.h
+ * @authors:
+ *   Dimitry Khokhlov <dimitry@ethereum.org>
+ * @date 2019
+ */
+
+#pragma once
+#include <test/tools/libtesteth/TestHelper.h>
+
+namespace dev
+{
+namespace test
+{
+enum class TestExecution
+{
+    RequireOptionAll,
+    RequireOptionAllNotRefillable,
+    NotRefillable,
+    Standard
+};
+
+static std::vector<std::string> const c_timeConsumingTestSuites{
+    std::string{"stTimeConsuming"}, std::string{"stQuadraticComplexityTest"}};
+
+template <class T>
+class StateTestFixtureBase
+{
+public:
+    StateTestFixtureBase(TestExecution const& _execFlag)
+    {
+        T suite;
+        if ((_execFlag == TestExecution::RequireOptionAllNotRefillable ||
+                _execFlag == TestExecution::NotRefillable) &&
+            (Options::get().fillchain || Options::get().filltests))
+            BOOST_FAIL("Tests are sealed and not refillable!");
+
+        std::string const casename = boost::unit_test::framework::current_test_case().p_name;
+        boost::filesystem::path suiteFillerPath = suite.getFullPathFiller(casename).parent_path();
+
+        bool skipTheTest = false;
+        if (test::inArray(c_timeConsumingTestSuites, casename) && !test::Options::get().all)
+            skipTheTest = true;
+        else if ((_execFlag == TestExecution::RequireOptionAll ||
+                     _execFlag == TestExecution::RequireOptionAllNotRefillable) &&
+                 !Options::get().all)
+            skipTheTest = true;
+
+        if (skipTheTest)
+        {
+            std::cout << "Skipping " << casename << " because --all option is not specified.\n";
+            test::TestOutputHelper::get().markTestFolderAsFinished(suiteFillerPath, casename);
+            return;
+        }
+        suite.runAllTestsInFolder(casename);
+        test::TestOutputHelper::get().markTestFolderAsFinished(suiteFillerPath, casename);
+    }
+};
+
+}  // namespace test
+}  // namespace dev

test/tools/jsontests/StateTestFixtureBase.h

@@ -19,7 +19,7 @@ along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
-#include <test/tools/jsontests/Common.h>
+#include <test/tools/jsontests/StateTestFixtureBase.h>
 #include <test/tools/libtesteth/TestSuite.h>
 #include <boost/filesystem/path.hpp>
 
@@ -40,7 +40,7 @@ class StateTestSuite: public TestSuite
 class GeneralTestFixture : public StateTestFixtureBase<StateTestSuite>
 {
 public:
-    GeneralTestFixture() : StateTestFixtureBase(TestExecution::STANDARD) {}
+    GeneralTestFixture() : StateTestFixtureBase(TestExecution::Standard) {}
 };
 }
 }