diff options
| author | CJentzsch <jentzsch.software@gmail.com> | 2015-04-20 15:33:02 +0800 |
|---|---|---|
| committer | CJentzsch <jentzsch.software@gmail.com> | 2015-04-20 15:33:02 +0800 |
| commit | 4d103ccef11168c24c7aca9fea34cbed21340df3 (patch) | |
| tree | 9affcf66636a1892a6d165810128352f28bd42f5 /SolidityNameAndTypeResolution.cpp | |
| parent | 4a6a667a587b571c9e563c59dabbc855d1b3ea20 (diff) | |
| parent | 71012a83e86dac3a899780219a78f18acd1708c5 (diff) | |
| download | dexon-solidity-4d103ccef11168c24c7aca9fea34cbed21340df3.tar dexon-solidity-4d103ccef11168c24c7aca9fea34cbed21340df3.tar.gz dexon-solidity-4d103ccef11168c24c7aca9fea34cbed21340df3.tar.bz2 dexon-solidity-4d103ccef11168c24c7aca9fea34cbed21340df3.tar.lz dexon-solidity-4d103ccef11168c24c7aca9fea34cbed21340df3.tar.xz dexon-solidity-4d103ccef11168c24c7aca9fea34cbed21340df3.tar.zst dexon-solidity-4d103ccef11168c24c7aca9fea34cbed21340df3.zip | |
xMerge remote-tracking branch 'upstream/develop' into JSON_testContract
Diffstat (limited to 'SolidityNameAndTypeResolution.cpp')
| -rw-r--r-- | SolidityNameAndTypeResolution.cpp | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/SolidityNameAndTypeResolution.cpp b/SolidityNameAndTypeResolution.cpp index ffa78ed9..c1a274b0 100644 --- a/SolidityNameAndTypeResolution.cpp +++ b/SolidityNameAndTypeResolution.cpp @@ -407,6 +407,39 @@ BOOST_AUTO_TEST_CASE(create_abstract_contract) BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError); } +BOOST_AUTO_TEST_CASE(abstract_contract_constructor_args_optional) +{ + ASTPointer<SourceUnit> sourceUnit; + char const* text = R"( + contract BaseBase { function BaseBase(uint j); } + contract base is BaseBase { function foo(); } + contract derived is base { + function derived(uint i) BaseBase(i){} + function foo() {} + } + )"; + ETH_TEST_REQUIRE_NO_THROW(parseTextAndResolveNames(text), "Parsing and name resolving failed"); +} + +BOOST_AUTO_TEST_CASE(abstract_contract_constructor_args_not_provided) +{ + ASTPointer<SourceUnit> sourceUnit; + char const* text = R"( + contract BaseBase { function BaseBase(uint j); } + contract base is BaseBase { function foo(); } + contract derived is base { + function derived(uint i) {} + function foo() {} + } + )"; + ETH_TEST_REQUIRE_NO_THROW(sourceUnit = parseTextAndResolveNames(text), "Parsing and name resolving failed"); + std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->getNodes(); + BOOST_CHECK_EQUAL(nodes.size(), 3); + ContractDefinition* derived = dynamic_cast<ContractDefinition*>(nodes[2].get()); + BOOST_CHECK(derived); + BOOST_CHECK(!derived->isFullyImplemented()); +} + BOOST_AUTO_TEST_CASE(redeclare_implemented_abstract_function_as_abstract) { ASTPointer<SourceUnit> sourceUnit; @@ -665,7 +698,7 @@ BOOST_AUTO_TEST_CASE(missing_base_constructor_arguments) contract A { function A(uint a) { } } contract B is A { } )"; - BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError); + ETH_TEST_CHECK_NO_THROW(parseTextAndResolveNames(text), "Parsing and Name Resolving Failed"); } BOOST_AUTO_TEST_CASE(base_constructor_arguments_override) @@ -674,7 +707,7 @@ BOOST_AUTO_TEST_CASE(base_constructor_arguments_override) contract A { function A(uint a) { } } contract B is A { } )"; - BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError); + ETH_TEST_CHECK_NO_THROW(parseTextAndResolveNames(text), "Parsing and Name Resolving Failed"); } BOOST_AUTO_TEST_CASE(implicit_derived_to_base_conversion) |