moved the test

Conflicts:
	test/libsolidity/SolidityEndToEndTest.cpp
	test/libsolidity/SolidityNameAndTypeResolution.cpp
This commit is contained in:
LianaHus 2015-09-15 11:41:40 +02:00
parent 466f5a4b88
commit 9d44e65932
2 changed files with 17 additions and 1 deletions

View File

@ -5233,6 +5233,7 @@ BOOST_AUTO_TEST_CASE(storage_string_as_mapping_key_without_variable)
BOOST_CHECK(callContractFunction("f()") == encodeArgs(u256(2))); BOOST_CHECK(callContractFunction("f()") == encodeArgs(u256(2)));
} }
<<<<<<< HEAD
BOOST_AUTO_TEST_CASE(library_call) BOOST_AUTO_TEST_CASE(library_call)
{ {
char const* sourceCode = R"( char const* sourceCode = R"(
@ -5279,6 +5280,8 @@ BOOST_AUTO_TEST_CASE(array_out_of_bound_access)
compileRequireThrow<TypeError>(sourceCode); compileRequireThrow<TypeError>(sourceCode);
} }
=======
>>>>>>> 6920415... moved the test
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
} }

View File

@ -2250,10 +2250,23 @@ BOOST_AUTO_TEST_CASE(creating_contract_within_the_contract)
function f() { var x = new Test(); } function f() { var x = new Test(); }
} }
)"; )";
BOOST_CHECK_THROW(parseTextAndResolveNames(sourceCode), TypeError); BOOST_CHECK_THROW(parseTextAndResolveNames(sourceCode), TypeError);
} }
BOOST_AUTO_TEST_CASE(array_out_of_bound_access)
{
char const* text = R"(
contract c {
uint[2] dataArray;
function set5th() returns (bool) {
dataArray[5] = 2;
return true;
}
}
)";
BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError);
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
} }