From 6e006b35bd01f3558b7c7a137d850b1e0020fd20 Mon Sep 17 00:00:00 2001 From: Yann Weber Date: Wed, 31 May 2017 16:09:41 +0200 Subject: [PATCH] Add comment for set_date_relative + ttail_check.h refactoring --- src/include/ttail_init.h | 5 ++- tests/ttail_check.h | 97 +++++++++++++++++++++------------------- 2 files changed, 55 insertions(+), 47 deletions(-) diff --git a/src/include/ttail_init.h b/src/include/ttail_init.h index 1c0875e..0825d4d 100644 --- a/src/include/ttail_init.h +++ b/src/include/ttail_init.h @@ -270,7 +270,10 @@ int ttail_set_dates(ttail_t*, char*[2]); */ int _ttail_set_date_fmt(ttail_t*, char*, int); -/**@brief Set a date relative from now +/**@brief Set a ttail_t date in relative format + * + * The function will set values for date_min or date_max given a relative + * format (described bellow) from now (returned by localtime() ) * *Relative date formats are "-#", an integer followed by a unit. Regcognized *units are : diff --git a/tests/ttail_check.h b/tests/ttail_check.h index dc3d3f4..0c90dda 100644 --- a/tests/ttail_check.h +++ b/tests/ttail_check.h @@ -15,6 +15,57 @@ ttail_t *ttail; #define FNAME_NO_EXIST 0 #define FNAME_EXIST 1 +/**@brief Start a ttail test + *@param const char* suite_str test suite string + *@param const char* tc_str test case string + */ +#define TTAIL_CHECK_START(suite_str, tc_str) \ +Suite * ttail_test_suite(void) \ +{\ + Suite *s;\ + TCase *tc;\ + s = suite_create(suite_str);\ + tc = tcase_create(tc_str); + + +/**@brief Set the setup & teardown fixture + *@param void (*setup)() + *@param void (*teardown)() + */ +#define TTAIL_SET_FIXTURE(setup, teardown) \ + tcase_add_checked_fixture(tc, setup, teardown) +/**@brief Add a test function defined using START_TEST(name) { ... } END_TEST + */ +#define TTAIL_ADD_TEST(test) tcase_add_test(tc, test) + +/**@brief End a ttail test */ +#define TTAIL_CHECK_END \ + suite_add_tcase(s, tc);\ + return s;\ +}\ +\ +int main(int argc, char **argv) {\ + int n_fail;\ + SRunner *sr;\ + n_fail = chdir(dirname(argv[0])); /* move in ./tests dir */ \ + if(n_fail < 0)\ + {\ + perror("Unable to chdir in tests folder");\ + }\ + sr = srunner_create(ttail_test_suite());\ + srunner_set_fork_status(sr, CK_FORK);\ + srunner_run_all(sr, CK_VERBOSE);\ + n_fail = srunner_ntests_failed(sr);\ + srunner_free(sr);\ + return (n_fail == 0) ? EXIT_SUCCESS : EXIT_FAILURE;\ +} + +#define ck_assert_printf(test, format, ...) {\ + char _err_msg[512];\ + snprintf(_err_msg, sizeof(char) * 512,format, __VA_ARGS__);\ + ck_assert_msg(test, _err_msg);\ +} + char *fname[__Fname_sz]; /*date formats*/ char *fmt[] = TTAIL_DEFAULT_FORMATS; @@ -107,51 +158,5 @@ void teardown_closest_fileinit(void) _ttail_search_file_free(ttail); teardown_closest(); } - -/**@brief Start a ttail test - *@param const char* suite_str test suite string - *@param const char* tc_str test case string - */ -#define TTAIL_CHECK_START(suite_str, tc_str) \ -Suite * ttail_test_suite(void) \ -{\ - Suite *s;\ - TCase *tc;\ - s = suite_create(suite_str);\ - tc = tcase_create(tc_str); - - -/**@brief Set the setup & teardown fixture - *@param void (*setup)() - *@param void (*teardown)() - */ -#define TTAIL_SET_FIXTURE(setup, teardown) \ - tcase_add_checked_fixture(tc, setup, teardown) -/**@brief Add a test function defined using START_TEST(name) { ... } END_TEST - */ -#define TTAIL_ADD_TEST(test) tcase_add_test(tc, test) - -/**@brief End a ttail test */ -#define TTAIL_CHECK_END \ - suite_add_tcase(s, tc);\ - return s;\ -}\ -\ -int main(int argc, char **argv) {\ - int n_fail;\ - SRunner *sr;\ - n_fail = chdir(dirname(argv[0])); /* move in ./tests dir */ \ - if(n_fail < 0)\ - {\ - perror("Unable to chdir in tests folder");\ - }\ - sr = srunner_create(ttail_test_suite());\ - srunner_set_fork_status(sr, CK_FORK);\ - srunner_run_all(sr, CK_VERBOSE);\ - n_fail = srunner_ntests_failed(sr);\ - srunner_free(sr);\ - return (n_fail == 0) ? EXIT_SUCCESS : EXIT_FAILURE;\ -} - #endif