diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-04-21 14:16:12 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-04-21 14:16:12 +0800 |
| commit | 6bf24491b8022379cbb2c661d2e1dfa1333a9112 (patch) | |
| tree | 1ce162a7485347eb3e097157fcb4c58ac1891987 /TestHelper.h | |
| parent | 6c146899e04041c90bf61aed325780b474f2224d (diff) | |
| parent | e375612a7ecbab9ad33a6a40df1c722a82e07630 (diff) | |
| download | dexon-solidity-6bf24491b8022379cbb2c661d2e1dfa1333a9112.tar dexon-solidity-6bf24491b8022379cbb2c661d2e1dfa1333a9112.tar.gz dexon-solidity-6bf24491b8022379cbb2c661d2e1dfa1333a9112.tar.bz2 dexon-solidity-6bf24491b8022379cbb2c661d2e1dfa1333a9112.tar.lz dexon-solidity-6bf24491b8022379cbb2c661d2e1dfa1333a9112.tar.xz dexon-solidity-6bf24491b8022379cbb2c661d2e1dfa1333a9112.tar.zst dexon-solidity-6bf24491b8022379cbb2c661d2e1dfa1333a9112.zip | |
Merge branch 'develop' into cmake3.2.1
Conflicts:
test/CMakeLists.txt
Diffstat (limited to 'TestHelper.h')
| -rw-r--r-- | TestHelper.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/TestHelper.h b/TestHelper.h index 92745bc3..bf4cdc16 100644 --- a/TestHelper.h +++ b/TestHelper.h @@ -24,6 +24,7 @@ #include <functional> #include <boost/test/unit_test.hpp> +#include <boost/filesystem.hpp> #include "JsonSpiritHeaders.h" #include <libethereum/State.h> @@ -121,6 +122,7 @@ public: static void importState(json_spirit::mObject& _o, eth::State& _state); static void importState(json_spirit::mObject& _o, eth::State& _state, stateOptionsMap& _stateOptionsMap); void importTransaction(json_spirit::mObject& _o); + static json_spirit::mObject& makeAllFieldsHex(json_spirit::mObject& _o); void exportTest(bytes const& _output, eth::State const& _statePost); static void checkExpectedState(eth::State const& _stateExpect, eth::State const& _statePost, stateOptionsMap const _expectedStateOptions = stateOptionsMap(), WhenError _throw = WhenError::Throw); @@ -154,7 +156,7 @@ void checkStorage(std::map<u256, u256> _expectedStore, std::map<u256, u256> _res void checkLog(eth::LogEntries _resultLogs, eth::LogEntries _expectedLogs); void checkCallCreates(eth::Transactions _resultCallCreates, eth::Transactions _expectedCallCreates); -void executeTests(const std::string& _name, const std::string& _testPathAppendix, std::function<void(json_spirit::mValue&, bool)> doTests); +void executeTests(const std::string& _name, const std::string& _testPathAppendix, const boost::filesystem::path _pathToFiller, std::function<void(json_spirit::mValue&, bool)> doTests); void userDefinedTest(std::string testTypeFlag, std::function<void(json_spirit::mValue&, bool)> doTests); RLPStream createRLPStreamFromTransactionFields(json_spirit::mObject& _tObj); eth::LastHashes lastHashes(u256 _currentBlockNumber); |