diff options
| author | chriseth <c@ethdev.com> | 2016-06-21 07:39:06 +0800 |
|---|---|---|
| committer | chriseth <c@ethdev.com> | 2016-06-29 05:18:55 +0800 |
| commit | c0bbd1cfe592144df5769f0313a2b0d418ef720f (patch) | |
| tree | 1ee5a03b0420c00e0e6a72f4b9809c5e3fce8cc9 | |
| parent | e5db096da9a2bfb3e6445b2d89cf730c7e22dc6d (diff) | |
| download | dexon-solidity-c0bbd1cfe592144df5769f0313a2b0d418ef720f.tar dexon-solidity-c0bbd1cfe592144df5769f0313a2b0d418ef720f.tar.gz dexon-solidity-c0bbd1cfe592144df5769f0313a2b0d418ef720f.tar.bz2 dexon-solidity-c0bbd1cfe592144df5769f0313a2b0d418ef720f.tar.lz dexon-solidity-c0bbd1cfe592144df5769f0313a2b0d418ef720f.tar.xz dexon-solidity-c0bbd1cfe592144df5769f0313a2b0d418ef720f.tar.zst dexon-solidity-c0bbd1cfe592144df5769f0313a2b0d418ef720f.zip | |
Some more test fixes.
| -rw-r--r-- | test/contracts/AuctionRegistrar.cpp | 2 | ||||
| -rw-r--r-- | test/contracts/FixedFeeRegistrar.cpp | 7 | ||||
| -rw-r--r-- | test/libsolidity/SolidityExecutionFramework.cpp | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp index 0eee42a4..f94cc935 100644 --- a/test/contracts/AuctionRegistrar.cpp +++ b/test/contracts/AuctionRegistrar.cpp @@ -421,7 +421,7 @@ BOOST_AUTO_TEST_CASE(auction_simple) registrar.reserve(name); BOOST_CHECK_EQUAL(registrar.owner(name), 0); // "wait" until auction end - m_envInfo.setTimestamp(m_envInfo.timestamp() + m_biddingTime + 10); + m_rpc.test_modifyTimestamp(currentTimestamp() + m_biddingTime + 10); // trigger auction again registrar.reserve(name); BOOST_CHECK_EQUAL(registrar.owner(name), m_sender); diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp index 8575d1fc..402d53ea 100644 --- a/test/contracts/FixedFeeRegistrar.cpp +++ b/test/contracts/FixedFeeRegistrar.cpp @@ -173,7 +173,7 @@ BOOST_AUTO_TEST_CASE(double_reserve) BOOST_REQUIRE(callContractFunctionWithValue("reserve(string)", m_fee, encodeDyn(name)) == encodeArgs()); BOOST_CHECK(callContractFunction("owner(string)", encodeDyn(name)) == encodeArgs(h256(account(0), h256::AlignRight))); - sendEther(account(1), 10 * eth::ether); + sendEther(account(1), 100 * eth::ether); m_sender = account(1); BOOST_REQUIRE(callContractFunctionWithValue("reserve(string)", m_fee, encodeDyn(name)) == encodeArgs()); BOOST_CHECK(callContractFunction("owner(string)", encodeDyn(name)) == encodeArgs(h256(account(0), h256::AlignRight))); @@ -190,7 +190,7 @@ BOOST_AUTO_TEST_CASE(properties) { addr++; m_sender = account(0); - sendEther(account(count), 10 * eth::ether); + sendEther(account(count), 100 * eth::ether); m_sender = account(count); Address owner = m_sender; // setting by sender works @@ -204,7 +204,8 @@ BOOST_AUTO_TEST_CASE(properties) BOOST_CHECK(callContractFunction("content(string)", encodeDyn(name)) == encodeArgs(addr + 90)); count++; // but not by someone else - sendEther(account(count), 10 * eth::ether); + m_sender = account(0); + sendEther(account(count), 100 * eth::ether); m_sender = account(count); BOOST_CHECK(callContractFunction("owner(string)", encodeDyn(name)) == encodeArgs(h256(owner, h256::AlignRight))); BOOST_CHECK(callContractFunction("setAddr(string,address)", u256(0x40), addr + 1, u256(name.length()), name) == encodeArgs()); diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp index efd3a8b8..da9cf5f1 100644 --- a/test/libsolidity/SolidityExecutionFramework.cpp +++ b/test/libsolidity/SolidityExecutionFramework.cpp @@ -48,7 +48,7 @@ string getIPCSocketPath() if (auto path = getenv("ETH_TEST_IPC")) ipcPath = path; if (ipcPath.empty()) - BOOST_FAIL("ERROR: ipcPath not set! (use --ipc <path>)"); + BOOST_FAIL("ERROR: ipcPath not set! (use --ipc <path> or the environment variable ETH_TEST_IPC)"); return ipcPath; } |