diff options
| author | subtly <subtly@users.noreply.github.com> | 2015-04-11 00:14:57 +0800 |
|---|---|---|
| committer | subtly <subtly@users.noreply.github.com> | 2015-04-11 00:14:57 +0800 |
| commit | 9965121d631dba5209c45bfddc7a4420f919467c (patch) | |
| tree | f9a4acdff9b3850f8d31d8f28e486e832715b76f /TestHelper.h | |
| parent | f08eb06c7ac0a4f126777599c0826b6e78f60ab4 (diff) | |
| parent | c111dbff3f4d4d5e6d064b38bcd645f2d763ccab (diff) | |
| download | dexon-solidity-9965121d631dba5209c45bfddc7a4420f919467c.tar dexon-solidity-9965121d631dba5209c45bfddc7a4420f919467c.tar.gz dexon-solidity-9965121d631dba5209c45bfddc7a4420f919467c.tar.bz2 dexon-solidity-9965121d631dba5209c45bfddc7a4420f919467c.tar.lz dexon-solidity-9965121d631dba5209c45bfddc7a4420f919467c.tar.xz dexon-solidity-9965121d631dba5209c45bfddc7a4420f919467c.tar.zst dexon-solidity-9965121d631dba5209c45bfddc7a4420f919467c.zip | |
Merge branch 'p2p' into whisper
Diffstat (limited to 'TestHelper.h')
| -rw-r--r-- | TestHelper.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/TestHelper.h b/TestHelper.h index 7f6d7336..04ca95be 100644 --- a/TestHelper.h +++ b/TestHelper.h @@ -97,6 +97,16 @@ namespace test } \ while (0) +struct ImportStateOptions +{ + ImportStateOptions(bool _bSetAll = false):m_bHasBalance(_bSetAll), m_bHasNonce(_bSetAll), m_bHasCode(_bSetAll), m_bHasStorage(_bSetAll) {} + bool isAllSet() {return m_bHasBalance && m_bHasNonce && m_bHasCode && m_bHasStorage;} + bool m_bHasBalance; + bool m_bHasNonce; + bool m_bHasCode; + bool m_bHasStorage; +}; +typedef std::map<Address, ImportStateOptions> stateOptionsMap; class ImportTest { @@ -105,9 +115,12 @@ public: ImportTest(json_spirit::mObject& _o, bool isFiller); // imports void importEnv(json_spirit::mObject& _o); - void importState(json_spirit::mObject& _o, eth::State& _state); + 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); + 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); eth::State m_statePre; eth::State m_statePost; @@ -165,6 +178,7 @@ public: bool fillTests = false; ///< Create JSON test files from execution results bool stats = false; ///< Execution time stats std::string statsOutFile; ///< Stats output file. "out" for standard output + bool checkState = false;///< Throw error when checking test states /// Test selection /// @{ |