diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2015-03-09 21:48:11 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-03-26 11:45:00 +0100 |
| commit | 1237453da38f2be6710f3a49edfd27e947ad233c (patch) | |
| tree | 2d5440bd08389319d229a20e6266fa66f181ae15 /src/tests/cmocka/test_responder_common.c | |
| parent | cd8b2b20d4667e6229a9242bbf82da7b21746b7e (diff) | |
| download | sssd-1237453da38f2be6710f3a49edfd27e947ad233c.tar.gz sssd-1237453da38f2be6710f3a49edfd27e947ad233c.tar.xz sssd-1237453da38f2be6710f3a49edfd27e947ad233c.zip | |
tests: convert all unit tests to cmocka 1.0 or later
All tests now use the cmocka-1.0-compatible API.
Signed-off-by: Lukas Slebodnik <lslebodn@redhat.com>
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
Diffstat (limited to 'src/tests/cmocka/test_responder_common.c')
| -rw-r--r-- | src/tests/cmocka/test_responder_common.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/tests/cmocka/test_responder_common.c b/src/tests/cmocka/test_responder_common.c index a6f642ab2..8d727b208 100644 --- a/src/tests/cmocka/test_responder_common.c +++ b/src/tests/cmocka/test_responder_common.c @@ -84,7 +84,7 @@ struct parse_inp_test_ctx { struct resp_ctx *rctx; }; -void parse_inp_test_setup(void **state) +static int parse_inp_test_setup(void **state) { struct parse_inp_test_ctx *parse_inp_ctx; int ret; @@ -115,9 +115,10 @@ void parse_inp_test_setup(void **state) check_leaks_push(parse_inp_ctx); *state = parse_inp_ctx; + return 0; } -void parse_inp_test_teardown(void **state) +static int parse_inp_test_teardown(void **state) { struct parse_inp_test_ctx *parse_inp_ctx = talloc_get_type(*state, struct parse_inp_test_ctx); @@ -126,6 +127,7 @@ void parse_inp_test_teardown(void **state) talloc_free(parse_inp_ctx); assert_true(leak_check_teardown()); + return 0; } int __real_sss_parse_name_for_domains(TALLOC_CTX *memctx, @@ -279,19 +281,19 @@ int main(int argc, const char *argv[]) POPT_TABLEEND }; - const UnitTest tests[] = { - unit_test_setup_teardown(parse_inp_simple, - parse_inp_test_setup, - parse_inp_test_teardown), - unit_test_setup_teardown(parse_inp_call_dp, - parse_inp_test_setup, - parse_inp_test_teardown), - unit_test_setup_teardown(parse_inp_call_attach, - parse_inp_test_setup, - parse_inp_test_teardown), - unit_test_setup_teardown(parse_inp_call_neg, - parse_inp_test_setup, - parse_inp_test_teardown), + const struct CMUnitTest tests[] = { + cmocka_unit_test_setup_teardown(parse_inp_simple, + parse_inp_test_setup, + parse_inp_test_teardown), + cmocka_unit_test_setup_teardown(parse_inp_call_dp, + parse_inp_test_setup, + parse_inp_test_teardown), + cmocka_unit_test_setup_teardown(parse_inp_call_attach, + parse_inp_test_setup, + parse_inp_test_teardown), + cmocka_unit_test_setup_teardown(parse_inp_call_neg, + parse_inp_test_setup, + parse_inp_test_teardown), }; /* Set debug level to invalid value so we can deside if -d 0 was used. */ @@ -317,7 +319,7 @@ int main(int argc, const char *argv[]) test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_DB, TEST_SYSDB_FILE); test_dom_suite_setup(TESTS_PATH); - rv = run_tests(tests); + rv = cmocka_run_group_tests(tests, NULL, NULL); if (rv == 0 && !no_cleanup) { test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_DB, TEST_SYSDB_FILE); } |