diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2015-06-17 04:38:56 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2015-06-17 04:38:56 +0800 |
| commit | a217c7a53d78fbe8840bdb6659c6e9b066c58392 (patch) | |
| tree | caeeade082bc2fb1ca7985c44ad1caae97d80b93 /libsolidity/SolidityEndToEndTest.cpp | |
| parent | 5694f2c7b280dbbafdc2740a42ea64f3cdaf9da1 (diff) | |
| parent | bc74cd0a3c0ca6a18ff8bae3f468e45115ae37e1 (diff) | |
| download | dexon-solidity-a217c7a53d78fbe8840bdb6659c6e9b066c58392.tar dexon-solidity-a217c7a53d78fbe8840bdb6659c6e9b066c58392.tar.gz dexon-solidity-a217c7a53d78fbe8840bdb6659c6e9b066c58392.tar.bz2 dexon-solidity-a217c7a53d78fbe8840bdb6659c6e9b066c58392.tar.lz dexon-solidity-a217c7a53d78fbe8840bdb6659c6e9b066c58392.tar.xz dexon-solidity-a217c7a53d78fbe8840bdb6659c6e9b066c58392.tar.zst dexon-solidity-a217c7a53d78fbe8840bdb6659c6e9b066c58392.zip | |
Merge remote-tracking branch 'upstream/develop' into PoWTests
Diffstat (limited to 'libsolidity/SolidityEndToEndTest.cpp')
| -rw-r--r-- | libsolidity/SolidityEndToEndTest.cpp | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/libsolidity/SolidityEndToEndTest.cpp b/libsolidity/SolidityEndToEndTest.cpp index f12abd48..f4d875e7 100644 --- a/libsolidity/SolidityEndToEndTest.cpp +++ b/libsolidity/SolidityEndToEndTest.cpp @@ -2420,7 +2420,7 @@ BOOST_AUTO_TEST_CASE(event_really_lots_of_data_from_storage) callContractFunction("deposit()"); BOOST_REQUIRE_EQUAL(m_logs.size(), 1); BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress); - BOOST_CHECK(m_logs[0].data == encodeArgs(10, 0x60, 15, 3) + asBytes("ABC")); + BOOST_CHECK(m_logs[0].data == encodeArgs(10, 0x60, 15, 3, string("ABC"))); BOOST_REQUIRE_EQUAL(m_logs[0].topics.size(), 1); BOOST_CHECK_EQUAL(m_logs[0].topics[0], dev::sha3(string("Deposit(uint256,bytes,uint256)"))); } @@ -4232,6 +4232,31 @@ BOOST_AUTO_TEST_CASE(reusing_memory) BOOST_REQUIRE(callContractFunction("f(uint256)", 0x34) == encodeArgs(dev::sha3(dev::toBigEndian(u256(0x34))))); } +BOOST_AUTO_TEST_CASE(return_string) +{ + char const* sourceCode = R"( + contract Main { + string public s; + function set(string _s) external { + s = _s; + } + function get1() returns (string r) { + return s; + } +// function get2() returns (string r) { +// r = s; +// } + } + )"; + compileAndRun(sourceCode, 0, "Main"); + string s("Julia"); + bytes args = encodeArgs(u256(0x20), u256(s.length()), s); + BOOST_REQUIRE(callContractFunction("set(string)", asString(args)) == encodeArgs()); + BOOST_CHECK(callContractFunction("get1()") == args); +// BOOST_CHECK(callContractFunction("get2()") == args); +// BOOST_CHECK(callContractFunction("s()") == args); +} + BOOST_AUTO_TEST_SUITE_END() } |