Skip to content

Commit 7c01b9a

Browse files
Give separate REQUIRE statements for each element in list
This will produce better error messages when tests fail.
1 parent 3edfcac commit 7c01b9a

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

jbmc/unit/java-testing-utils/require_type.cpp

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -392,18 +392,13 @@ require_type::require_java_implicitly_generic_class(
392392
&implicit_generic_type_vars =
393393
java_implicitly_generic_class_type.implicit_generic_types();
394394
REQUIRE(implicit_generic_type_vars.size() == implicit_type_variables.size());
395-
REQUIRE(
396-
std::equal(
397-
implicit_type_variables.begin(),
398-
implicit_type_variables.end(),
399-
implicit_generic_type_vars.begin(),
400-
[](
401-
const irep_idt &type_var_name,
402-
const java_generic_parametert &param) { //NOLINT
403-
REQUIRE(is_java_generic_parameter(param));
404-
return param.type_variable().get_identifier() == type_var_name;
405-
}));
406-
395+
auto param = implicit_generic_type_vars.begin();
396+
auto type_var_name = implicit_type_variables.begin();
397+
for(; param != implicit_generic_type_vars.end(); ++param, ++type_var_name)
398+
{
399+
REQUIRE(is_java_generic_parameter(*param));
400+
REQUIRE(param->type_variable().get_identifier() == *type_var_name);
401+
}
407402
return java_implicitly_generic_class_type;
408403
}
409404

0 commit comments

Comments
 (0)