diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2015-03-09 21:48:11 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-03-11 14:39:35 +0100 |
| commit | 4e5e846de22407f825fe3b4040d79606818a2419 (patch) | |
| tree | 99bf02588f00f39d29f0d2f9e3a439b65fd5d6c3 /src/tests/cmocka/test_dp_opts.c | |
| parent | 0aad066baeed6833cf061b71d72c6bbbb2d2b9e8 (diff) | |
| download | sssd-4e5e846de22407f825fe3b4040d79606818a2419.tar.gz sssd-4e5e846de22407f825fe3b4040d79606818a2419.tar.xz sssd-4e5e846de22407f825fe3b4040d79606818a2419.zip | |
tests: convert all unit tests to cmocka 1.0 or later
All tests now use the cmocka-1.0-compatible API.
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
Diffstat (limited to 'src/tests/cmocka/test_dp_opts.c')
| -rw-r--r-- | src/tests/cmocka/test_dp_opts.c | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/src/tests/cmocka/test_dp_opts.c b/src/tests/cmocka/test_dp_opts.c index 8794906e7..9192eaaca 100644 --- a/src/tests/cmocka/test_dp_opts.c +++ b/src/tests/cmocka/test_dp_opts.c @@ -264,7 +264,7 @@ void opt_test_get(void **state) assert_true(bo == false); } -void opt_test_getset_setup(void **state) +static int opt_test_getset_setup(void **state) { int ret; struct dp_option *opts; @@ -275,12 +275,14 @@ void opt_test_getset_setup(void **state) assert_defaults(opts); *state = opts; + return 0; } -void opt_test_getset_teardown(void **state) +static int opt_test_getset_teardown(void **state) { struct dp_option *opts = talloc_get_type(*state, struct dp_option); talloc_free(opts); + return 0; } void opt_test_getset_string(void **state) @@ -366,22 +368,22 @@ int main(int argc, const char *argv[]) _("Do not delete the test database after a test run"), NULL }, POPT_TABLEEND }; - const UnitTest tests[] = { - unit_test_setup_teardown(opt_test_getset_string, - opt_test_getset_setup, - opt_test_getset_teardown), - unit_test_setup_teardown(opt_test_getset_int, - opt_test_getset_setup, - opt_test_getset_teardown), - unit_test_setup_teardown(opt_test_getset_bool, - opt_test_getset_setup, - opt_test_getset_teardown), - unit_test_setup_teardown(opt_test_getset_blob, - opt_test_getset_setup, - opt_test_getset_teardown), - unit_test(opt_test_copy_default), - unit_test(opt_test_copy_options), - unit_test(opt_test_get) + const struct CMUnitTest tests[] = { + cmocka_unit_test_setup_teardown(opt_test_getset_string, + opt_test_getset_setup, + opt_test_getset_teardown), + cmocka_unit_test_setup_teardown(opt_test_getset_int, + opt_test_getset_setup, + opt_test_getset_teardown), + cmocka_unit_test_setup_teardown(opt_test_getset_bool, + opt_test_getset_setup, + opt_test_getset_teardown), + cmocka_unit_test_setup_teardown(opt_test_getset_blob, + opt_test_getset_setup, + opt_test_getset_teardown), + cmocka_unit_test(opt_test_copy_default), + cmocka_unit_test(opt_test_copy_options), + cmocka_unit_test(opt_test_get) }; /* Set debug level to invalid value so we can deside if -d 0 was used. */ @@ -407,7 +409,7 @@ int main(int argc, const char *argv[]) test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_DB, TEST_DOM_NAME); test_dom_suite_setup(TESTS_PATH); - ret = run_tests(tests); + ret = cmocka_run_group_tests(tests, NULL, NULL); if (ret == 0 && !no_cleanup) { test_dom_suite_cleanup(TESTS_PATH, TEST_CONF_DB, TEST_DOM_NAME); } |