aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLianaHus <liana@ethdev.com>2015-09-15 17:44:04 +0800
committerLianaHus <liana@ethdev.com>2015-09-15 17:44:04 +0800
commitdbb36a7a7bc81d5397b5da316c9a7d89c76cc52b (patch)
treeeac66d8ac1b5dac83e594e8bd82a009886966b5e /test
parent9d44e659321cad4fe9955895d8487bf4a089ae92 (diff)
downloaddexon-solidity-dbb36a7a7bc81d5397b5da316c9a7d89c76cc52b.tar.gz
dexon-solidity-dbb36a7a7bc81d5397b5da316c9a7d89c76cc52b.tar.zst
dexon-solidity-dbb36a7a7bc81d5397b5da316c9a7d89c76cc52b.zip
fixed rebase
Diffstat (limited to 'test')
-rw-r--r--test/libsolidity/SolidityEndToEndTest.cpp17
1 files changed, 0 insertions, 17 deletions
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 05508e2b..cac2d296 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -5233,7 +5233,6 @@ BOOST_AUTO_TEST_CASE(storage_string_as_mapping_key_without_variable)
BOOST_CHECK(callContractFunction("f()") == encodeArgs(u256(2)));
}
-<<<<<<< HEAD
BOOST_AUTO_TEST_CASE(library_call)
{
char const* sourceCode = R"(
@@ -5266,22 +5265,6 @@ BOOST_AUTO_TEST_CASE(library_stray_values)
BOOST_CHECK(callContractFunction("f(uint256)", u256(33)) == encodeArgs(u256(42)));
}
-BOOST_AUTO_TEST_CASE(array_out_of_bound_access)
-{
- char const* sourceCode = R"(
- contract c {
- uint[2] dataArray;
- function set5th() returns (bool) {
- dataArray[5] = 2;
- return true;
- }
- }
- )";
- compileRequireThrow<TypeError>(sourceCode);
-}
-
-=======
->>>>>>> 6920415... moved the test
BOOST_AUTO_TEST_SUITE_END()
}