From 49cfacced291ea73d99ec1353a0c77bfe476729a Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 1 Mar 2017 19:49:02 +0100 Subject: End to end tests for constants. --- test/libsolidity/SolidityEndToEndTest.cpp | 50 +++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'test/libsolidity/SolidityEndToEndTest.cpp') diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index baed3f1e..f14108ca 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -4553,6 +4553,56 @@ BOOST_AUTO_TEST_CASE(constant_variables) compileAndRun(sourceCode); } +BOOST_AUTO_TEST_CASE(assignment_to_const_var_involving_expression) +{ + char const* sourceCode = R"( + contract C { + uint constant x = 0x123 + 0x456; + function f() returns (uint) { return x + 1; } + } + )"; + compileAndRun(sourceCode); + BOOST_CHECK(callContractFunction("f()") == encodeArgs(0x123 + 0x456 + 1)); +} + +BOOST_AUTO_TEST_CASE(assignment_to_const_var_involving_keccak) +{ + char const* sourceCode = R"( + contract C { + bytes32 constant x = keccak256("abc"); + function f() returns (bytes32) { return x; } + } + )"; + compileAndRun(sourceCode); + BOOST_CHECK(callContractFunction("f()") == encodeArgs(dev::keccak256("abc"))); +} + +BOOST_AUTO_TEST_CASE(assignment_to_const_array_vars) +{ + char const* sourceCode = R"( + contract C { + uint[3] constant x = [uint(1), 2, 3]; + uint constant y = x[0] + x[1] + x[2]; + function f() returns (uint) { return y; } + } + )"; + compileAndRun(sourceCode); + BOOST_CHECK(callContractFunction("f()") == encodeArgs(1 + 2 + 3)); +} + +BOOST_AUTO_TEST_CASE(constant_struct) +{ + char const* sourceCode = R"( + contract C { + struct S { uint x; uint[] y; } + S constant x = S(5, new uint[](4)); + function f() returns (uint) { return x.x; } + } + )"; + compileAndRun(sourceCode); + BOOST_CHECK(callContractFunction("f()") == encodeArgs(5)); +} + BOOST_AUTO_TEST_CASE(packed_storage_structs_uint) { char const* sourceCode = R"( -- cgit From 14948e514d7b15eb92d2c08f018bb23ead71fa5a Mon Sep 17 00:00:00 2001 From: chriseth Date: Wed, 1 Mar 2017 19:49:15 +0100 Subject: Allow enum values for constants. --- test/libsolidity/SolidityEndToEndTest.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'test/libsolidity/SolidityEndToEndTest.cpp') diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index f14108ca..552352e4 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -4542,7 +4542,6 @@ BOOST_AUTO_TEST_CASE(simple_constant_variables_test) BOOST_AUTO_TEST_CASE(constant_variables) { - //for now constant specifier is valid only for uint, bytesXX, string and enums char const* sourceCode = R"( contract Foo { uint constant x = 56; -- cgit From 592cec7e9074313e7ce5539769c065ecf5cbba12 Mon Sep 17 00:00:00 2001 From: chriseth Date: Fri, 3 Mar 2017 19:26:54 +0100 Subject: Disallow constants that are neither value types nor strings. --- test/libsolidity/SolidityEndToEndTest.cpp | 50 ++++++++++++++++--------------- 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'test/libsolidity/SolidityEndToEndTest.cpp') diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 552352e4..831840e2 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -4576,31 +4576,33 @@ BOOST_AUTO_TEST_CASE(assignment_to_const_var_involving_keccak) BOOST_CHECK(callContractFunction("f()") == encodeArgs(dev::keccak256("abc"))); } -BOOST_AUTO_TEST_CASE(assignment_to_const_array_vars) -{ - char const* sourceCode = R"( - contract C { - uint[3] constant x = [uint(1), 2, 3]; - uint constant y = x[0] + x[1] + x[2]; - function f() returns (uint) { return y; } - } - )"; - compileAndRun(sourceCode); - BOOST_CHECK(callContractFunction("f()") == encodeArgs(1 + 2 + 3)); -} +// Disabled until https://github.com/ethereum/solidity/issues/715 is implemented +//BOOST_AUTO_TEST_CASE(assignment_to_const_array_vars) +//{ +// char const* sourceCode = R"( +// contract C { +// uint[3] constant x = [uint(1), 2, 3]; +// uint constant y = x[0] + x[1] + x[2]; +// function f() returns (uint) { return y; } +// } +// )"; +// compileAndRun(sourceCode); +// BOOST_CHECK(callContractFunction("f()") == encodeArgs(1 + 2 + 3)); +//} -BOOST_AUTO_TEST_CASE(constant_struct) -{ - char const* sourceCode = R"( - contract C { - struct S { uint x; uint[] y; } - S constant x = S(5, new uint[](4)); - function f() returns (uint) { return x.x; } - } - )"; - compileAndRun(sourceCode); - BOOST_CHECK(callContractFunction("f()") == encodeArgs(5)); -} +// Disabled until https://github.com/ethereum/solidity/issues/715 is implemented +//BOOST_AUTO_TEST_CASE(constant_struct) +//{ +// char const* sourceCode = R"( +// contract C { +// struct S { uint x; uint[] y; } +// S constant x = S(5, new uint[](4)); +// function f() returns (uint) { return x.x; } +// } +// )"; +// compileAndRun(sourceCode); +// BOOST_CHECK(callContractFunction("f()") == encodeArgs(5)); +//} BOOST_AUTO_TEST_CASE(packed_storage_structs_uint) { -- cgit