Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions test/libsolidity/SolidityNameAndTypeResolution.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,7 @@ BOOST_AUTO_TEST_CASE(modifier_overrides_function)
)";
// Error: Identifier already declared.
// Error: Override changes modifier to function.
CHECK_ERROR_ALLOW_MULTI(text, DeclarationError, "Identifier already declared.");
CHECK_ERROR_ALLOW_MULTI(text, DeclarationError, "Override changes modifier to functions.");
}

BOOST_AUTO_TEST_CASE(function_overrides_modifier)
Expand All @@ -1089,7 +1089,7 @@ BOOST_AUTO_TEST_CASE(function_overrides_modifier)
)";
// Error: Identifier already declared.
// Error: Override changes function to modifier.
CHECK_ERROR_ALLOW_MULTI(text, DeclarationError, "Identifier already declared.");
CHECK_ERROR_ALLOW_MULTI(text, DeclarationError, "Override changes function to modifier.");
}

BOOST_AUTO_TEST_CASE(modifier_returns_value)
Expand Down Expand Up @@ -1326,7 +1326,7 @@ BOOST_AUTO_TEST_CASE(fallback_function_twice)
function() public { x = 3; }
}
)";
CHECK_ERROR_ALLOW_MULTI(text, DeclarationError, "Function with same name and arguments defined twice.");
CHECK_ERROR_ALLOW_MULTI(text, DeclarationError, "Only one fallback function is allowed.");
}

BOOST_AUTO_TEST_CASE(fallback_function_inheritance)
Expand Down Expand Up @@ -6810,11 +6810,11 @@ BOOST_AUTO_TEST_CASE(experimental_pragma)
pragma experimental __test;
)";
CHECK_WARNING(text, "Experimental features are turned on. Do not use experimental features on live deployments.");
// text = R"(
// pragma experimental __test;
// pragma experimental __test;
// )";
// CHECK_ERROR_ALLOW_MULTI(text, SyntaxError, "Duplicate experimental feature name.");
text = R"(
pragma experimental __test;
pragma experimental __test;
)";
CHECK_ERROR_ALLOW_MULTI(text, SyntaxError, "Duplicate experimental feature name.");
}

BOOST_AUTO_TEST_CASE(reject_interface_creation)
Expand Down Expand Up @@ -6877,7 +6877,7 @@ BOOST_AUTO_TEST_CASE(tight_packing_literals)
}
}
)";
// CHECK_WARNING(text, "The type of \"int_const 1\" was inferred as uint8.");
CHECK_WARNING_ALLOW_MULTI(text, "The type of \"int_const 1\" was inferred as uint8.");
text = R"(
contract C {
function f() pure public returns (bytes32) {
Expand Down