Skip to content

Commit 15b85e2

Browse files
committed
Fix tests.
1 parent 6df6728 commit 15b85e2

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

test/libsolidity/SolidityEndToEndTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2410,7 +2410,7 @@ BOOST_AUTO_TEST_CASE(function_modifier_overriding)
24102410
modifier mod { _ }
24112411
}
24122412
contract C is A {
2413-
modifier mod { }
2413+
modifier mod { if (false) _ }
24142414
}
24152415
)";
24162416
compileAndRun(sourceCode);
@@ -2427,7 +2427,7 @@ BOOST_AUTO_TEST_CASE(function_modifier_calling_functions_in_creation_context)
24272427
function f2() { data |= 0x20; }
24282428
function f3() { }
24292429
modifier mod1 { f2(); _ }
2430-
modifier mod2 { f3(); }
2430+
modifier mod2 { f3(); if (false) _ }
24312431
function getData() returns (uint r) { return data; }
24322432
}
24332433
contract C is A {

test/libsolidity/SolidityNameAndTypeResolution.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -901,35 +901,35 @@ BOOST_AUTO_TEST_CASE(function_modifier_invocation_local_variables)
901901
BOOST_AUTO_TEST_CASE(legal_modifier_override)
902902
{
903903
char const* text = R"(
904-
contract A { modifier mod(uint a) {} }
905-
contract B is A { modifier mod(uint a) {} }
904+
contract A { modifier mod(uint a) { _ } }
905+
contract B is A { modifier mod(uint a) { _ } }
906906
)";
907907
BOOST_CHECK(success(text));
908908
}
909909

910910
BOOST_AUTO_TEST_CASE(illegal_modifier_override)
911911
{
912912
char const* text = R"(
913-
contract A { modifier mod(uint a) {} }
914-
contract B is A { modifier mod(uint8 a) {} }
913+
contract A { modifier mod(uint a) { _ } }
914+
contract B is A { modifier mod(uint8 a) { _ } }
915915
)";
916916
BOOST_CHECK(expectError(text) == Error::Type::TypeError);
917917
}
918918

919919
BOOST_AUTO_TEST_CASE(modifier_overrides_function)
920920
{
921921
char const* text = R"(
922-
contract A { modifier mod(uint a) {} }
923-
contract B is A { function mod(uint a) {} }
922+
contract A { modifier mod(uint a) { _ } }
923+
contract B is A { function mod(uint a) { } }
924924
)";
925925
BOOST_CHECK(expectError(text) == Error::Type::TypeError);
926926
}
927927

928928
BOOST_AUTO_TEST_CASE(function_overrides_modifier)
929929
{
930930
char const* text = R"(
931-
contract A { function mod(uint a) {} }
932-
contract B is A { modifier mod(uint a) {} }
931+
contract A { function mod(uint a) { } }
932+
contract B is A { modifier mod(uint a) { _ } }
933933
)";
934934
BOOST_CHECK(expectError(text) == Error::Type::TypeError);
935935
}
@@ -938,8 +938,8 @@ BOOST_AUTO_TEST_CASE(modifier_returns_value)
938938
{
939939
char const* text = R"(
940940
contract A {
941-
function f(uint a) mod(2) returns (uint r) {}
942-
modifier mod(uint a) { return 7; }
941+
function f(uint a) mod(2) returns (uint r) { }
942+
modifier mod(uint a) { _ return 7; }
943943
}
944944
)";
945945
BOOST_CHECK(expectError(text) == Error::Type::TypeError);

0 commit comments

Comments
 (0)