From 3ff8703ca68709c116762a5feda378903e2419d9 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Thu, 5 Nov 2020 22:03:02 +0100 Subject: tests: upgrade deprecated cmocka test runner --- tests/blogc/check_template_parser.c | 96 ++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'tests/blogc/check_template_parser.c') diff --git a/tests/blogc/check_template_parser.c b/tests/blogc/check_template_parser.c index ecb86e1..ace8ac4 100644 --- a/tests/blogc/check_template_parser.c +++ b/tests/blogc/check_template_parser.c @@ -1279,53 +1279,53 @@ test_template_parse_invalid_foreach_not_closed(void **state) int main(void) { - const UnitTest tests[] = { - unit_test(test_template_parse), - unit_test(test_template_parse_crlf), - unit_test(test_template_parse_html), - unit_test(test_template_parse_html_whitespace), - unit_test(test_template_parse_ifdef_and_var_outside_block), - unit_test(test_template_parse_nested_else), - unit_test(test_template_parse_invalid_block_start), - unit_test(test_template_parse_invalid_block_nested), - unit_test(test_template_parse_invalid_foreach_nested), - unit_test(test_template_parse_invalid_block_not_open), - unit_test(test_template_parse_invalid_endif_not_open), - unit_test(test_template_parse_invalid_endif_not_open_inside_block), - unit_test(test_template_parse_invalid_else_not_open_inside_block), - unit_test(test_template_parse_invalid_endforeach_not_open), - unit_test(test_template_parse_invalid_endforeach_not_open_inside_block), - unit_test(test_template_parse_invalid_endforeach_not_open_inside_block2), - unit_test(test_template_parse_invalid_endforeach_not_closed_inside_block), - unit_test(test_template_parse_invalid_endforeach_not_closed_inside_block2), - unit_test(test_template_parse_invalid_block_name), - unit_test(test_template_parse_invalid_block_type_start), - unit_test(test_template_parse_invalid_block_type), - unit_test(test_template_parse_invalid_ifdef_start), - unit_test(test_template_parse_invalid_foreach_start), - unit_test(test_template_parse_invalid_ifdef_variable), - unit_test(test_template_parse_invalid_ifdef_variable2), - unit_test(test_template_parse_invalid_foreach_variable), - unit_test(test_template_parse_invalid_foreach_variable2), - unit_test(test_template_parse_invalid_if_operator), - unit_test(test_template_parse_invalid_if_operand), - unit_test(test_template_parse_invalid_if_operand2), - unit_test(test_template_parse_invalid_if_operand3), - unit_test(test_template_parse_invalid_else1), - unit_test(test_template_parse_invalid_else2), - unit_test(test_template_parse_invalid_else3), - unit_test(test_template_parse_invalid_block_end), - unit_test(test_template_parse_invalid_variable_name), - unit_test(test_template_parse_invalid_variable_name2), - unit_test(test_template_parse_invalid_variable_name3), - unit_test(test_template_parse_invalid_variable_end), - unit_test(test_template_parse_invalid_close), - unit_test(test_template_parse_invalid_close2), - unit_test(test_template_parse_invalid_endif_not_closed), - unit_test(test_template_parse_invalid_endif_not_closed_inside_block), - unit_test(test_template_parse_invalid_else_not_closed_inside_block), - unit_test(test_template_parse_invalid_block_not_closed), - unit_test(test_template_parse_invalid_foreach_not_closed), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_template_parse), + cmocka_unit_test(test_template_parse_crlf), + cmocka_unit_test(test_template_parse_html), + cmocka_unit_test(test_template_parse_html_whitespace), + cmocka_unit_test(test_template_parse_ifdef_and_var_outside_block), + cmocka_unit_test(test_template_parse_nested_else), + cmocka_unit_test(test_template_parse_invalid_block_start), + cmocka_unit_test(test_template_parse_invalid_block_nested), + cmocka_unit_test(test_template_parse_invalid_foreach_nested), + cmocka_unit_test(test_template_parse_invalid_block_not_open), + cmocka_unit_test(test_template_parse_invalid_endif_not_open), + cmocka_unit_test(test_template_parse_invalid_endif_not_open_inside_block), + cmocka_unit_test(test_template_parse_invalid_else_not_open_inside_block), + cmocka_unit_test(test_template_parse_invalid_endforeach_not_open), + cmocka_unit_test(test_template_parse_invalid_endforeach_not_open_inside_block), + cmocka_unit_test(test_template_parse_invalid_endforeach_not_open_inside_block2), + cmocka_unit_test(test_template_parse_invalid_endforeach_not_closed_inside_block), + cmocka_unit_test(test_template_parse_invalid_endforeach_not_closed_inside_block2), + cmocka_unit_test(test_template_parse_invalid_block_name), + cmocka_unit_test(test_template_parse_invalid_block_type_start), + cmocka_unit_test(test_template_parse_invalid_block_type), + cmocka_unit_test(test_template_parse_invalid_ifdef_start), + cmocka_unit_test(test_template_parse_invalid_foreach_start), + cmocka_unit_test(test_template_parse_invalid_ifdef_variable), + cmocka_unit_test(test_template_parse_invalid_ifdef_variable2), + cmocka_unit_test(test_template_parse_invalid_foreach_variable), + cmocka_unit_test(test_template_parse_invalid_foreach_variable2), + cmocka_unit_test(test_template_parse_invalid_if_operator), + cmocka_unit_test(test_template_parse_invalid_if_operand), + cmocka_unit_test(test_template_parse_invalid_if_operand2), + cmocka_unit_test(test_template_parse_invalid_if_operand3), + cmocka_unit_test(test_template_parse_invalid_else1), + cmocka_unit_test(test_template_parse_invalid_else2), + cmocka_unit_test(test_template_parse_invalid_else3), + cmocka_unit_test(test_template_parse_invalid_block_end), + cmocka_unit_test(test_template_parse_invalid_variable_name), + cmocka_unit_test(test_template_parse_invalid_variable_name2), + cmocka_unit_test(test_template_parse_invalid_variable_name3), + cmocka_unit_test(test_template_parse_invalid_variable_end), + cmocka_unit_test(test_template_parse_invalid_close), + cmocka_unit_test(test_template_parse_invalid_close2), + cmocka_unit_test(test_template_parse_invalid_endif_not_closed), + cmocka_unit_test(test_template_parse_invalid_endif_not_closed_inside_block), + cmocka_unit_test(test_template_parse_invalid_else_not_closed_inside_block), + cmocka_unit_test(test_template_parse_invalid_block_not_closed), + cmocka_unit_test(test_template_parse_invalid_foreach_not_closed), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } -- cgit v1.2.3-18-g5258