>From 160bd97d9b50903b163645be6366bbcb1296853d Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Tue, 24 Feb 2015 16:09:54 +0100 Subject: [PATCH 2/2] WIP: Convert tests to compatible cmocka API --- src/tests/cmocka/test_io.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/src/tests/cmocka/test_io.c b/src/tests/cmocka/test_io.c index 2f95388570f4189fc2ca70e6a55be688f7921467..c83ce567e9fa5d87ba1b57547523e6231a999f5a 100644 --- a/src/tests/cmocka/test_io.c +++ b/src/tests/cmocka/test_io.c @@ -39,6 +39,7 @@ #include "util/io.h" #include "util/util.h" #include "tests/common.h" +#include "tests/cmocka/common_mock.h" #define TESTS_PATH "tests_io" #define FILE_TEMPLATE TESTS_PATH"/test_io.XXXXXX" @@ -67,7 +68,7 @@ static char *get_random_filepath(const char *template) return path; } -void test_file_setup(void **state) +SSS_CM_FIXTURE_TYPE test_file_setup(void **state) { int ret; char *file_path; @@ -83,9 +84,11 @@ void test_file_setup(void **state) assert_int_equal(ret, ENOENT); *state = file_path; + + SSS_CM_FIXTURE_RET; } -void test_file_teardown(void **state) +SSS_CM_FIXTURE_TYPE test_file_teardown(void **state) { int ret; char *file_path = (char *)*state; @@ -96,6 +99,8 @@ void test_file_teardown(void **state) ret = rmdir(TESTS_PATH); assert_int_equal(ret, EOK); + + SSS_CM_FIXTURE_RET; } struct dir_state { @@ -107,7 +112,7 @@ struct dir_state { char *filename; }; -void test_dir_setup(void **state) +SSS_CM_FIXTURE_TYPE test_dir_setup(void **state) { struct dir_state *data; int ret; @@ -139,9 +144,11 @@ void test_dir_setup(void **state) assert_int_equal(ret, ENOENT); *state = data; + + SSS_CM_FIXTURE_RET; } -void test_dir_teardown(void **state) +SSS_CM_FIXTURE_TYPE test_dir_teardown(void **state) { int ret; struct dir_state *data = (struct dir_state *) *state; @@ -157,6 +164,8 @@ void test_dir_teardown(void **state) assert_int_equal(ret, EOK); free(data); + + SSS_CM_FIXTURE_RET; } void test_sss_open_cloexec_success(void **state) @@ -223,17 +232,17 @@ void test_sss_openat_cloexec_fail(void **state) int main(void) { - const UnitTest tests[] = { - unit_test_setup_teardown(test_sss_open_cloexec_success, - test_file_setup, test_file_teardown), - unit_test_setup_teardown(test_sss_open_cloexec_fail, - test_file_setup, test_file_teardown), - unit_test_setup_teardown(test_sss_openat_cloexec_success, - test_dir_setup, test_dir_teardown), - unit_test_setup_teardown(test_sss_openat_cloexec_fail, - test_dir_setup, test_dir_teardown) + const SSS_CM_TEST tests[] = { + SSS_CM_TEST_SETUP_TEARDOWN(test_sss_open_cloexec_success, + test_file_setup, test_file_teardown), + SSS_CM_TEST_SETUP_TEARDOWN(test_sss_open_cloexec_fail, + test_file_setup, test_file_teardown), + SSS_CM_TEST_SETUP_TEARDOWN(test_sss_openat_cloexec_success, + test_dir_setup, test_dir_teardown), + SSS_CM_TEST_SETUP_TEARDOWN(test_sss_openat_cloexec_fail, + test_dir_setup, test_dir_teardown) }; tests_set_cwd(); - return run_tests(tests); + return SSS_CM_TEST_RUN(tests); } -- 2.1.0