cerc-io/solidity
10
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

Rename IPCSocket and removed unused code in TestHelper.

Browse Source
This commit is contained in:
chriseth 2016-06-28 23:47:35 +02:00
parent 05e5bdf780
commit 67d1e4783a
5 changed files with 4 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/IPCSocket.cpp → test/RPCSession.cpp
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>. along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** @file IPCSocket.cpp /** @file RPCSession.cpp
* @author Dimtiry Khokhlov <dimitry@ethdev.com> * @author Dimtiry Khokhlov <dimitry@ethdev.com>
* @date 2016 * @date 2016
*/ */
@ -25,7 +25,7 @@
#include <libdevcore/CommonData.h> #include <libdevcore/CommonData.h>
#include <jsoncpp/json/reader.h> #include <jsoncpp/json/reader.h>
#include <jsoncpp/json/writer.h> #include <jsoncpp/json/writer.h>
#include "IPCSocket.h" #include "RPCSession.h"
using namespace std; using namespace std;
using namespace dev; using namespace dev;

2
test/IPCSocket.h → test/RPCSession.h
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>. along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
*/ */
/** @file IPCSocket.h /** @file RPCSession.h
* @author Dimtiry Khokhlov <dimitry@ethdev.com> * @author Dimtiry Khokhlov <dimitry@ethdev.com>
* @date 2016 * @date 2016
*/ */

59
test/TestHelper.cpp
View File

@ -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

27
test/TestHelper.h
View File

@ -102,32 +102,5 @@ namespace test
} \ } \
while (0) 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;
};
};
} }
} }

2
test/libsolidity/SolidityExecutionFramework.h
View File

@ -26,7 +26,7 @@
#include <tuple> #include <tuple>
#include <fstream> #include <fstream>
#include "../TestHelper.h" #include "../TestHelper.h"
#include "../IPCSocket.h" #include "../RPCSession.h"
#include <libethcore/ABI.h> #include <libethcore/ABI.h>
#include <libethcore/SealEngine.h> #include <libethcore/SealEngine.h>
#include <libethereum/State.h> #include <libethereum/State.h>