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

fixes for test/TestUtils.h

Browse Source
This commit is contained in:
Marek Kotewicz 2015-03-25 19:51:08 +01:00
parent ac558b0377
commit 9a032ef39f
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
TestUtils.cpp
View File

@ -19,8 +19,6 @@
* @date 2015 * @date 2015
*/ */
#include <ctime>
#include <random>
#include <thread> #include <thread>
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
@ -28,10 +26,6 @@
#include <libtestutils/FixedClient.h> #include <libtestutils/FixedClient.h>
#include "TestUtils.h" #include "TestUtils.h"
// used methods from TestHelper:
// getTestPath
#include "TestHelper.h"
using namespace std; using namespace std;
using namespace dev; using namespace dev;
using namespace dev::eth; using namespace dev::eth;
@ -73,19 +67,12 @@ std::string dev::test::getCommandLineArgument(string const& _name, bool _require
return ""; return "";
} }
bool LoadTestFileFixture::m_loaded = false;
Json::Value LoadTestFileFixture::m_json;
LoadTestFileFixture::LoadTestFileFixture() LoadTestFileFixture::LoadTestFileFixture()
{ {
if (!m_loaded)
{
m_json = loadJsonFromFile(toTestFilePath(getCommandLineArgument("--eth_testfile"))); m_json = loadJsonFromFile(toTestFilePath(getCommandLineArgument("--eth_testfile")));
m_loaded = true;
}
} }
void ParallelFixture::enumerateThreads(std::function<void()> callback) void ParallelFixture::enumerateThreads(std::function<void()> callback) const
{ {
size_t threadsCount = std::stoul(getCommandLineArgument("--eth_threads"), nullptr, 10); size_t threadsCount = std::stoul(getCommandLineArgument("--eth_threads"), nullptr, 10);
@ -99,7 +86,7 @@ void ParallelFixture::enumerateThreads(std::function<void()> callback)
}); });
} }
void BlockChainFixture::enumerateBlockchains(std::function<void(Json::Value const&, dev::eth::BlockChain&, State state)> callback) void BlockChainFixture::enumerateBlockchains(std::function<void(Json::Value const&, dev::eth::BlockChain const&, State state)> callback) const
{ {
for (string const& name: m_json.getMemberNames()) for (string const& name: m_json.getMemberNames())
{ {
@ -108,16 +95,16 @@ void BlockChainFixture::enumerateBlockchains(std::function<void(Json::Value cons
} }
} }
void ClientBaseFixture::enumerateClients(std::function<void(Json::Value const&, dev::eth::ClientBase&)> callback) void ClientBaseFixture::enumerateClients(std::function<void(Json::Value const&, dev::eth::ClientBase&)> callback) const
{ {
enumerateBlockchains([&callback](Json::Value const& _json, BlockChain& _bc, State _state) -> void enumerateBlockchains([&callback](Json::Value const& _json, BlockChain const& _bc, State _state) -> void
{ {
FixedClient client(_bc, _state); FixedClient client(_bc, _state);
callback(_json, client); callback(_json, client);
}); });
} }
void ParallelClientBaseFixture::enumerateClients(std::function<void(Json::Value const&, dev::eth::ClientBase&)> callback) void ParallelClientBaseFixture::enumerateClients(std::function<void(Json::Value const&, dev::eth::ClientBase&)> callback) const
{ {
ClientBaseFixture::enumerateClients([this, &callback](Json::Value const& _json, dev::eth::ClientBase& _client) -> void ClientBaseFixture::enumerateClients([this, &callback](Json::Value const& _json, dev::eth::ClientBase& _client) -> void
{ {

12
TestUtils.h
View File

@ -42,23 +42,23 @@ struct LoadTestFileFixture
{ {
LoadTestFileFixture(); LoadTestFileFixture();
static bool m_loaded; protected:
static Json::Value m_json; Json::Value m_json;
}; };
struct ParallelFixture struct ParallelFixture
{ {
void enumerateThreads(std::function<void()> callback); void enumerateThreads(std::function<void()> callback) const;
}; };
struct BlockChainFixture: public LoadTestFileFixture struct BlockChainFixture: public LoadTestFileFixture
{ {
void enumerateBlockchains(std::function<void(Json::Value const&, dev::eth::BlockChain&, dev::eth::State state)> callback); void enumerateBlockchains(std::function<void(Json::Value const&, dev::eth::BlockChain const&, dev::eth::State state)> callback) const;
}; };
struct ClientBaseFixture: public BlockChainFixture struct ClientBaseFixture: public BlockChainFixture
{ {
void enumerateClients(std::function<void(Json::Value const&, dev::eth::ClientBase&)> callback); void enumerateClients(std::function<void(Json::Value const&, dev::eth::ClientBase&)> callback) const;
}; };
// important BOOST TEST do have problems with thread safety!!! // important BOOST TEST do have problems with thread safety!!!
@ -70,7 +70,7 @@ struct ClientBaseFixture: public BlockChainFixture
// https://codecrafter.wordpress.com/2012/11/01/c-unit-test-framework-adapter-part-3/ // https://codecrafter.wordpress.com/2012/11/01/c-unit-test-framework-adapter-part-3/
struct ParallelClientBaseFixture: public ClientBaseFixture, public ParallelFixture struct ParallelClientBaseFixture: public ClientBaseFixture, public ParallelFixture
{ {
void enumerateClients(std::function<void(Json::Value const&, dev::eth::ClientBase&)> callback); void enumerateClients(std::function<void(Json::Value const&, dev::eth::ClientBase&)> callback) const;
}; };
struct JsonRpcFixture: public ClientBaseFixture struct JsonRpcFixture: public ClientBaseFixture