diff options
-rw-r--r-- | example/allocate_module_test.c | 10 | ||||
-rw-r--r-- | example/assert_macro_test.c | 8 | ||||
-rw-r--r-- | example/assert_module_test.c | 10 | ||||
-rw-r--r-- | example/calculator_test.c | 48 | ||||
-rw-r--r-- | example/chef_wrap/waiter_test_wrap.c | 8 | ||||
-rw-r--r-- | example/customer_database_test.c | 8 | ||||
-rw-r--r-- | example/key_value_test.c | 20 | ||||
-rw-r--r-- | example/product_database_test.c | 10 | ||||
-rw-r--r-- | example/simple_test.c | 6 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/test_assert_macros.c | 7 | ||||
-rw-r--r-- | tests/test_assert_macros_fail.c | 7 | ||||
-rw-r--r-- | tests/test_basics.c | 16 | ||||
-rw-r--r-- | tests/test_exception_handler.c | 6 | ||||
-rw-r--r-- | tests/test_fixtures.c | 24 | ||||
-rw-r--r-- | tests/test_group_fixtures.c | 16 | ||||
-rw-r--r-- | tests/test_setup_fail.c | 27 |
17 files changed, 128 insertions, 107 deletions
diff --git a/example/allocate_module_test.c b/example/allocate_module_test.c index 1d1e164..cd5d371 100644 --- a/example/allocate_module_test.c +++ b/example/allocate_module_test.c @@ -44,10 +44,10 @@ static void buffer_underflow_test(void **state) { } int main(void) { - const UnitTest tests[] = { - unit_test(leak_memory_test), - unit_test(buffer_overflow_test), - unit_test(buffer_underflow_test), + const struct CMUnitTest tests[] = { + cmocka_unit_test(leak_memory_test), + cmocka_unit_test(buffer_overflow_test), + cmocka_unit_test(buffer_underflow_test), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/example/assert_macro_test.c b/example/assert_macro_test.c index efe1c64..2cd355c 100644 --- a/example/assert_macro_test.c +++ b/example/assert_macro_test.c @@ -38,9 +38,9 @@ static void string_to_status_code_test(void **state) { } int main(void) { - const UnitTest tests[] = { - unit_test(get_status_code_string_test), - unit_test(string_to_status_code_test), + const struct CMUnitTest tests[] = { + cmocka_unit_test(get_status_code_string_test), + cmocka_unit_test(string_to_status_code_test), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/example/assert_module_test.c b/example/assert_module_test.c index 6f4f0a9..f387754 100644 --- a/example/assert_module_test.c +++ b/example/assert_module_test.c @@ -47,10 +47,10 @@ static void decrement_value_fail(void **state) { } int main(void) { - const UnitTest tests[] = { - unit_test(increment_value_fail), - unit_test(increment_value_assert), - unit_test(decrement_value_fail), + const struct CMUnitTest tests[] = { + cmocka_unit_test(increment_value_fail), + cmocka_unit_test(increment_value_assert), + cmocka_unit_test(decrement_value_fail), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/example/calculator_test.c b/example/calculator_test.c index 836e726..a1c9334 100644 --- a/example/calculator_test.c +++ b/example/calculator_test.c @@ -452,29 +452,29 @@ static void test_example_main(void **state) { int main(void) { - UnitTest tests[] = { - unit_test(test_add), - unit_test(test_subtract), - unit_test(test_multiply), - unit_test(test_divide), - unit_test(test_divide_by_zero), - unit_test(test_find_operator_function_by_string_null_functions), - unit_test(test_find_operator_function_by_string_null_string), - unit_test(test_find_operator_function_by_string_valid_null_functions), - unit_test(test_find_operator_function_by_string_not_found), - unit_test(test_find_operator_function_by_string_found), - unit_test(test_perform_operation_null_args), - unit_test(test_perform_operation_null_operator_functions), - unit_test(test_perform_operation_null_number_of_intermediate_values), - unit_test(test_perform_operation_null_intermediate_values), - unit_test(test_perform_operation_no_arguments), - unit_test(test_perform_operation_first_arg_not_integer), - unit_test(test_perform_operation_unknown_operator), - unit_test(test_perform_operation_missing_argument), - unit_test(test_perform_operation_no_integer_after_operator), - unit_test(test_perform_operation), - unit_test(test_example_main_no_args), - unit_test(test_example_main), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_add), + cmocka_unit_test(test_subtract), + cmocka_unit_test(test_multiply), + cmocka_unit_test(test_divide), + cmocka_unit_test(test_divide_by_zero), + cmocka_unit_test(test_find_operator_function_by_string_null_functions), + cmocka_unit_test(test_find_operator_function_by_string_null_string), + cmocka_unit_test(test_find_operator_function_by_string_valid_null_functions), + cmocka_unit_test(test_find_operator_function_by_string_not_found), + cmocka_unit_test(test_find_operator_function_by_string_found), + cmocka_unit_test(test_perform_operation_null_args), + cmocka_unit_test(test_perform_operation_null_operator_functions), + cmocka_unit_test(test_perform_operation_null_number_of_intermediate_values), + cmocka_unit_test(test_perform_operation_null_intermediate_values), + cmocka_unit_test(test_perform_operation_no_arguments), + cmocka_unit_test(test_perform_operation_first_arg_not_integer), + cmocka_unit_test(test_perform_operation_unknown_operator), + cmocka_unit_test(test_perform_operation_missing_argument), + cmocka_unit_test(test_perform_operation_no_integer_after_operator), + cmocka_unit_test(test_perform_operation), + cmocka_unit_test(test_example_main_no_args), + cmocka_unit_test(test_example_main), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/example/chef_wrap/waiter_test_wrap.c b/example/chef_wrap/waiter_test_wrap.c index 1b8ed94..b618795 100644 --- a/example/chef_wrap/waiter_test_wrap.c +++ b/example/chef_wrap/waiter_test_wrap.c @@ -167,10 +167,10 @@ static void test_bad_dish(void **state) int main(void) { - const UnitTest tests[] = { - unit_test(test_order_hotdog), - unit_test(test_bad_dish), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_order_hotdog), + cmocka_unit_test(test_bad_dish), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/example/customer_database_test.c b/example/customer_database_test.c index 33364d9..9cd1140 100644 --- a/example/customer_database_test.c +++ b/example/customer_database_test.c @@ -80,9 +80,9 @@ static void test_get_customer_id_by_name(void **state) { } int main(void) { - const UnitTest tests[] = { - unit_test(test_connect_to_customer_database), - unit_test(test_get_customer_id_by_name), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_connect_to_customer_database), + cmocka_unit_test(test_get_customer_id_by_name), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/example/key_value_test.c b/example/key_value_test.c index da72ea2..102a2be 100644 --- a/example/key_value_test.c +++ b/example/key_value_test.c @@ -28,16 +28,20 @@ static KeyValue key_values[] = { { 13, "is" }, }; -static void create_key_values(void **state) { +static int create_key_values(void **state) { KeyValue * const items = (KeyValue*)test_malloc(sizeof(key_values)); memcpy(items, key_values, sizeof(key_values)); *state = (void*)items; set_key_values(items, sizeof(key_values) / sizeof(key_values[0])); + + return 0; } -static void destroy_key_values(void **state) { +static int destroy_key_values(void **state) { test_free(*state); set_key_values(NULL, 0); + + return 0; } static void test_find_item_by_value(void **state) { @@ -63,11 +67,11 @@ static void test_sort_items_by_key(void **state) { } int main(void) { - const UnitTest tests[] = { - unit_test_setup_teardown(test_find_item_by_value, create_key_values, - destroy_key_values), - unit_test_setup_teardown(test_sort_items_by_key, create_key_values, - destroy_key_values), + const struct CMUnitTest tests[] = { + cmocka_unit_test_setup_teardown(test_find_item_by_value, + create_key_values, destroy_key_values), + cmocka_unit_test_setup_teardown(test_sort_items_by_key, + create_key_values, destroy_key_values), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/example/product_database_test.c b/example/product_database_test.c index c8d7587..e0ade53 100644 --- a/example/product_database_test.c +++ b/example/product_database_test.c @@ -63,10 +63,10 @@ static void test_connect_to_product_database_missing_parameter(void **state) { } int main(void) { - const UnitTest tests[] = { - unit_test(test_connect_to_product_database), - unit_test(test_connect_to_product_database_bad_url), - unit_test(test_connect_to_product_database_missing_parameter), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_connect_to_product_database), + cmocka_unit_test(test_connect_to_product_database_bad_url), + cmocka_unit_test(test_connect_to_product_database_missing_parameter), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/example/simple_test.c b/example/simple_test.c index dce78d2..c6eee9c 100644 --- a/example/simple_test.c +++ b/example/simple_test.c @@ -9,9 +9,9 @@ static void null_test_success(void **state) { } int main(void) { - const UnitTest tests[] = { - unit_test(null_test_success), + const struct CMUnitTest tests[] = { + cmocka_unit_test(null_test_success), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a058b5f..b95c96a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -50,7 +50,7 @@ set_tests_properties( test_setup_fail_1_failed PROPERTIES PASS_REGULAR_EXPRESSION - "\\[ FAILED \\] 1 test\\(s\\), listed below:" + "\\[ ERROR \\] int_test_ignored" ) add_test (test_setup_fail_1_passed test_setup_fail) @@ -66,7 +66,7 @@ set_tests_properties( test_setup_fail_match_failed PROPERTIES PASS_REGULAR_EXPRESSION - "\\[ FAILED \\] int_test_ignored_setup_fail" + "\\[ ERROR \\] int_test_ignored" ) add_test (test_setup_fail_match_passed test_setup_fail) diff --git a/tests/test_assert_macros.c b/tests/test_assert_macros.c index 7f643b7..2906517 100644 --- a/tests/test_assert_macros.c +++ b/tests/test_assert_macros.c @@ -26,8 +26,9 @@ static void test_assert_return_code(void **state) } int main(void) { - const UnitTest tests[] = { - unit_test(test_assert_return_code), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_assert_return_code), }; - return run_tests(tests); + + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/tests/test_assert_macros_fail.c b/tests/test_assert_macros_fail.c index cd49023..2227dfc 100644 --- a/tests/test_assert_macros_fail.c +++ b/tests/test_assert_macros_fail.c @@ -27,8 +27,9 @@ static void test_assert_return_code_fail(void **state) } int main(void) { - const UnitTest tests[] = { - unit_test(test_assert_return_code_fail), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_assert_return_code_fail), }; - return run_tests(tests); + + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/tests/test_basics.c b/tests/test_basics.c index 63fc27b..1bb493f 100644 --- a/tests/test_basics.c +++ b/tests/test_basics.c @@ -22,17 +22,21 @@ #include <setjmp.h> #include <cmocka.h> -static void setup(void **state) { +static int setup(void **state) { int *answer = malloc(sizeof(int)); assert_non_null(answer); *answer = 42; *state = answer; + + return 0; } -static void teardown(void **state) { +static int teardown(void **state) { free(*state); + + return 0; } /* A test case that does nothing and succeeds. */ @@ -49,10 +53,10 @@ static void int_test_success(void **state) { int main(void) { - const UnitTest tests[] = { - unit_test(null_test_success), - unit_test_setup_teardown(int_test_success, setup, teardown), + const struct CMUnitTest tests[] = { + cmocka_unit_test(null_test_success), + cmocka_unit_test_setup_teardown(int_test_success, setup, teardown), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/tests/test_exception_handler.c b/tests/test_exception_handler.c index 5727d1e..94c6842 100644 --- a/tests/test_exception_handler.c +++ b/tests/test_exception_handler.c @@ -20,9 +20,9 @@ static void test_segfault_recovery(void **state) } int main(void) { - const UnitTest tests[] = { - unit_test(test_segfault_recovery), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_segfault_recovery), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/tests/test_fixtures.c b/tests/test_fixtures.c index d7c166a..4597626 100644 --- a/tests/test_fixtures.c +++ b/tests/test_fixtures.c @@ -5,14 +5,18 @@ #include <stdlib.h> -static void setup_only(void **state) +static int setup_only(void **state) { *state = malloc(1); + + return 0; } -static void teardown_only(void **state) +static int teardown_only(void **state) { free(*state); + + return 0; } static void malloc_setup_test(void **state) @@ -28,14 +32,14 @@ static void malloc_teardown_test(void **state) } int main(void) { - const UnitTest tests[] = { - unit_test_setup(malloc_setup_test, setup_only), - unit_test_setup(malloc_setup_test, setup_only), - unit_test_teardown(malloc_teardown_test, teardown_only), - unit_test_teardown(malloc_teardown_test, teardown_only), - unit_test_teardown(malloc_teardown_test, teardown_only), - unit_test_teardown(malloc_teardown_test, teardown_only), + const struct CMUnitTest tests[] = { + cmocka_unit_test_setup(malloc_setup_test, setup_only), + cmocka_unit_test_setup(malloc_setup_test, setup_only), + cmocka_unit_test_teardown(malloc_teardown_test, teardown_only), + cmocka_unit_test_teardown(malloc_teardown_test, teardown_only), + cmocka_unit_test_teardown(malloc_teardown_test, teardown_only), + cmocka_unit_test_teardown(malloc_teardown_test, teardown_only), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/tests/test_group_fixtures.c b/tests/test_group_fixtures.c index 6f49e24..09f39b1 100644 --- a/tests/test_group_fixtures.c +++ b/tests/test_group_fixtures.c @@ -6,20 +6,22 @@ #include <setjmp.h> #include <cmocka.h> -static void group_setup(void **state) +static int group_setup(void **state) { int *answer = malloc(sizeof(int)); assert_non_null(answer); *answer = 42; *state = answer; + return 0; } -static void group_teardown(void **state) +static int group_teardown(void **state) { int *answer = (int *)*state; free(answer); + return 0; } static void test_value_equal(void **state) @@ -37,12 +39,10 @@ static void test_value_range(void **state) } int main(void) { - const UnitTest tests[] = { - group_test_setup(group_setup), - unit_test(test_value_equal), - unit_test(test_value_range), - group_test_teardown(group_teardown), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_value_equal), + cmocka_unit_test(test_value_range), }; - return run_group_tests(tests); + return cmocka_run_group_tests(tests, group_setup, group_teardown); } diff --git a/tests/test_setup_fail.c b/tests/test_setup_fail.c index 923886c..e3f8df8 100644 --- a/tests/test_setup_fail.c +++ b/tests/test_setup_fail.c @@ -5,11 +5,11 @@ #include <setjmp.h> #include <cmocka.h> -static void setup_fail(void **state) { +static int setup_fail(void **state) { *state = NULL; /* We need to fail in setup */ - assert_non_null(NULL); + return -1; } static void int_test_ignored(void **state) { @@ -17,13 +17,18 @@ static void int_test_ignored(void **state) { assert_non_null(*state); } -static void setup_ok(void **state) { - int *answer = malloc(sizeof(int)); +static int setup_ok(void **state) { + int *answer; - assert_non_null(answer); + answer = malloc(sizeof(int)); + if (answer == NULL) { + return -1; + } *answer = 42; *state = answer; + + return 0; } /* A test case that does check if an int is equal. */ @@ -33,15 +38,17 @@ static void int_test_success(void **state) { assert_int_equal(*answer, 42); } -static void teardown(void **state) { +static int teardown(void **state) { free(*state); + + return 0; } int main(void) { - const UnitTest tests[] = { - unit_test_setup_teardown(int_test_ignored, setup_fail, teardown), - unit_test_setup_teardown(int_test_success, setup_ok, teardown), + const struct CMUnitTest tests[] = { + cmocka_unit_test_setup_teardown(int_test_ignored, setup_fail, teardown), + cmocka_unit_test_setup_teardown(int_test_success, setup_ok, teardown), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } |