diff options
| -rw-r--r-- | test/RPCSession.cpp (renamed from test/IPCSocket.cpp) | 4 | ||||
| -rw-r--r-- | test/RPCSession.h (renamed from test/IPCSocket.h) | 2 | ||||
| -rw-r--r-- | test/TestHelper.cpp | 59 | ||||
| -rw-r--r-- | test/TestHelper.h | 27 | ||||
| -rw-r--r-- | test/libsolidity/SolidityExecutionFramework.h | 2 |
5 files changed, 4 insertions, 90 deletions
diff --git a/test/IPCSocket.cpp b/test/RPCSession.cpp index 832875c0..01118cca 100644 --- a/test/IPCSocket.cpp +++ b/test/RPCSession.cpp @@ -14,7 +14,7 @@ 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 IPCSocket.cpp +/** @file RPCSession.cpp * @author Dimtiry Khokhlov <dimitry@ethdev.com> * @date 2016 */ @@ -25,7 +25,7 @@ #include <libdevcore/CommonData.h> #include <jsoncpp/json/reader.h> #include <jsoncpp/json/writer.h> -#include "IPCSocket.h" +#include "RPCSession.h" using namespace std; using namespace dev; diff --git a/test/IPCSocket.h b/test/RPCSession.h index 040eb2c8..4ec21def 100644 --- a/test/IPCSocket.h +++ b/test/RPCSession.h @@ -14,7 +14,7 @@ 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 IPCSocket.h +/** @file RPCSession.h * @author Dimtiry Khokhlov <dimitry@ethdev.com> * @date 2016 */ diff --git a/test/TestHelper.cpp b/test/TestHelper.cpp deleted file mode 100644 index 79242f83..00000000 --- a/test/TestHelper.cpp +++ /dev/null @@ -1,59 +0,0 @@ -/* - 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 TestHelper.cpp - * @author Marko Simovic <markobarko@gmail.com> - * @date 2014 - */ - -#include "TestHelper.h" - -using namespace std; - -namespace dev -{ -namespace test -{ - -namespace -{ - Listener* g_listener; -} - -void Listener::registerListener(Listener& _listener) -{ - g_listener = &_listener; -} - -void Listener::notifySuiteStarted(std::string const& _name) -{ - if (g_listener) - g_listener->suiteStarted(_name); -} - -void Listener::notifyTestStarted(std::string const& _name) -{ - if (g_listener) - g_listener->testStarted(_name); -} - -void Listener::notifyTestFinished() -{ - if (g_listener) - g_listener->testFinished(); -} - -} } // namespaces diff --git a/test/TestHelper.h b/test/TestHelper.h index 96678007..2d08d62c 100644 --- a/test/TestHelper.h +++ b/test/TestHelper.h @@ -102,32 +102,5 @@ namespace test } \ while (0) -/// Allows observing test execution process. -/// This class also provides methods for registering and notifying the listener -class Listener -{ -public: - virtual ~Listener() = default; - - virtual void suiteStarted(std::string const&) {} - virtual void testStarted(std::string const& _name) = 0; - virtual void testFinished() = 0; - - static void registerListener(Listener& _listener); - static void notifySuiteStarted(std::string const& _name); - static void notifyTestStarted(std::string const& _name); - static void notifyTestFinished(); - - /// Test started/finished notification RAII helper - class ExecTimeGuard - { - public: - ExecTimeGuard(std::string const& _testName) { notifyTestStarted(_testName); } - ~ExecTimeGuard() { notifyTestFinished(); } - ExecTimeGuard(ExecTimeGuard const&) = delete; - ExecTimeGuard& operator=(ExecTimeGuard) = delete; - }; -}; - } } diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h index f06aeff7..2b589498 100644 --- a/test/libsolidity/SolidityExecutionFramework.h +++ b/test/libsolidity/SolidityExecutionFramework.h @@ -26,7 +26,7 @@ #include <tuple> #include <fstream> #include "../TestHelper.h" -#include "../IPCSocket.h" +#include "../RPCSession.h" #include <libethcore/ABI.h> #include <libethcore/SealEngine.h> #include <libethereum/State.h> |