aboutsummaryrefslogtreecommitdiffstats
path: root/test/libsolidity/SolidityEndToEndTest.cpp
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2016-10-21 21:29:58 +0800
committerGitHub <noreply@github.com>2016-10-21 21:29:58 +0800
commit3e13e59ff96d92f18b972f10f4ef1da1ef249b32 (patch)
treeaeecfbc9d8be123a1f9789b1254d1a3727a53320 /test/libsolidity/SolidityEndToEndTest.cpp
parent984b8ac1b58309757380101aad644d3b1b30a2cd (diff)
parent4b7fdaa0bd75775d7a17f809c6ac33def5a6b523 (diff)
downloaddexon-solidity-3e13e59ff96d92f18b972f10f4ef1da1ef249b32.tar
dexon-solidity-3e13e59ff96d92f18b972f10f4ef1da1ef249b32.tar.gz
dexon-solidity-3e13e59ff96d92f18b972f10f4ef1da1ef249b32.tar.bz2
dexon-solidity-3e13e59ff96d92f18b972f10f4ef1da1ef249b32.tar.lz
dexon-solidity-3e13e59ff96d92f18b972f10f4ef1da1ef249b32.tar.xz
dexon-solidity-3e13e59ff96d92f18b972f10f4ef1da1ef249b32.tar.zst
dexon-solidity-3e13e59ff96d92f18b972f10f4ef1da1ef249b32.zip
Merge pull request #1243 from ethereum/1131
Add enums as inheritable members
Diffstat (limited to 'test/libsolidity/SolidityEndToEndTest.cpp')
-rw-r--r--test/libsolidity/SolidityEndToEndTest.cpp51
1 files changed, 51 insertions, 0 deletions
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 0a028a45..16002f9a 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -3314,6 +3314,57 @@ BOOST_AUTO_TEST_CASE(using_enums)
BOOST_CHECK(callContractFunction("getChoice()") == encodeArgs(2));
}
+BOOST_AUTO_TEST_CASE(using_contract_enums_with_explicit_contract_name)
+{
+ char const* sourceCode = R"(
+ contract test {
+ enum Choice { A, B, C }
+ function answer () returns (test.Choice _ret)
+ {
+ _ret = test.Choice.B;
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callContractFunction("answer()") == encodeArgs(1));
+}
+
+BOOST_AUTO_TEST_CASE(using_inherited_enum)
+{
+ char const* sourceCode = R"(
+ contract base {
+ enum Choice { A, B, C }
+ }
+
+ contract test is base {
+ function answer () returns (Choice _ret)
+ {
+ _ret = Choice.B;
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callContractFunction("answer()") == encodeArgs(1));
+}
+
+BOOST_AUTO_TEST_CASE(using_inherited_enum_excplicitly)
+{
+ char const* sourceCode = R"(
+ contract base {
+ enum Choice { A, B, C }
+ }
+
+ contract test is base {
+ function answer () returns (base.Choice _ret)
+ {
+ _ret = base.Choice.B;
+ }
+ }
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callContractFunction("answer()") == encodeArgs(1));
+}
+
BOOST_AUTO_TEST_CASE(constructing_enums_from_ints)
{
char const* sourceCode = R"(