diff options
| author | yann300 <yann.levreau@gmail.com> | 2015-04-28 19:46:12 +0800 |
|---|---|---|
| committer | yann300 <yann.levreau@gmail.com> | 2015-04-28 19:46:12 +0800 |
| commit | 2172fbaab2e809099a778371fd9fdf5910b0bd03 (patch) | |
| tree | c98bcd0b8dee936419825d80e582e0e2c291ae9e /libsolidity/SolidityInterface.cpp | |
| parent | 145e0031b82c662f2ce4ab03a77ae2ff5f80574c (diff) | |
| parent | 717f2559696380c51d39cbf0105785c85ce3f3cf (diff) | |
| download | dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.tar dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.tar.gz dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.tar.bz2 dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.tar.lz dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.tar.xz dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.tar.zst dexon-solidity-2172fbaab2e809099a778371fd9fdf5910b0bd03.zip | |
Merge remote-tracking branch 'up/develop' into bugFix2
Conflicts:
test/webthreestubclient.h
Diffstat (limited to 'libsolidity/SolidityInterface.cpp')
| -rw-r--r-- | libsolidity/SolidityInterface.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libsolidity/SolidityInterface.cpp b/libsolidity/SolidityInterface.cpp index c8f74e3a..9c9373f0 100644 --- a/libsolidity/SolidityInterface.cpp +++ b/libsolidity/SolidityInterface.cpp @@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE(single_function) "}\n"); BOOST_REQUIRE_EQUAL(1, contract.getDefinedFunctions().size()); BOOST_CHECK_EQUAL(getSourcePart(*contract.getDefinedFunctions().front()), - "function f(uint256 a)returns(uint256 d){}"); + "function f(uint256 a)returns(uint256 d);"); } BOOST_AUTO_TEST_CASE(single_constant_function) @@ -87,7 +87,7 @@ BOOST_AUTO_TEST_CASE(single_constant_function) "contract test { function f(uint a) constant returns(bytes1 x) { 1==2; } }"); BOOST_REQUIRE_EQUAL(1, contract.getDefinedFunctions().size()); BOOST_CHECK_EQUAL(getSourcePart(*contract.getDefinedFunctions().front()), - "function f(uint256 a)constant returns(bytes1 x){}"); + "function f(uint256 a)constant returns(bytes1 x);"); } BOOST_AUTO_TEST_CASE(multiple_functions) @@ -97,8 +97,8 @@ BOOST_AUTO_TEST_CASE(multiple_functions) " function g(uint b) returns(uint e) { return b * 8; }\n" "}\n"; ContractDefinition const& contract = checkInterface(sourceCode); - set<string> expectation({"function f(uint256 a)returns(uint256 d){}", - "function g(uint256 b)returns(uint256 e){}"}); + set<string> expectation({"function f(uint256 a)returns(uint256 d);", + "function g(uint256 b)returns(uint256 e);"}); BOOST_REQUIRE_EQUAL(2, contract.getDefinedFunctions().size()); BOOST_CHECK(expectation == set<string>({getSourcePart(*contract.getDefinedFunctions().at(0)), getSourcePart(*contract.getDefinedFunctions().at(1))})); @@ -135,8 +135,8 @@ BOOST_AUTO_TEST_CASE(inheritance) " event derivedEvent(uint indexed evtArgDerived); \n" " }"; ContractDefinition const& contract = checkInterface(sourceCode); - set<string> expectedFunctions({"function baseFunction(uint256 p)returns(uint256 i){}", - "function derivedFunction(bytes32 p)returns(bytes32 i){}"}); + set<string> expectedFunctions({"function baseFunction(uint256 p)returns(uint256 i);", + "function derivedFunction(bytes32 p)returns(bytes32 i);"}); BOOST_REQUIRE_EQUAL(2, contract.getDefinedFunctions().size()); BOOST_CHECK(expectedFunctions == set<string>({getSourcePart(*contract.getDefinedFunctions().at(0)), getSourcePart(*contract.getDefinedFunctions().at(1))})); |