change time format tests with teardown

diff --git a/tests/time_format_tests.c b/tests/time_format_tests.c
index ab4d72f06ff3c6b3335dc5644c765fa5ba4bf06f..ccbe3ba8034ee0dbad04809c05b95ba9cbde33c8 100644 (file)
--- a/tests/time_format_tests.c
+++ b/tests/time_format_tests.c
@@ -7,238 +7,180 @@
 #include <stdlib.h>
 #include "../src/time_format.h"
 
-void get_zero_hour_and_fifteen_minutes_test()
+int teardown(void** state)
 {
-       const time_t time = 900;
+       free(*state);
+       *state = NULL;
+
+       return 0;
+}
 
-       char* timestr = get_time_str(time);
+void get_zero_hour_and_fifteen_minutes_test(void** timestr)
+{
+       const time_t time = 900;
 
-       assert_string_equal(timestr, "00:15");
+       *timestr = get_time_str(time);
 
-       free(timestr);
-       timestr = NULL;
+       assert_string_equal(*timestr, "00:15");
 }
 
-void get_five_hour_fourty_five_test()
+void get_five_hour_fourty_five_test(void** timestr)
 {
        const time_t time = 20700;
 
-       char* timestr = get_time_str(time);
-
-       assert_string_equal(timestr, "05:45");
+       *timestr = get_time_str(time);
 
-       free(timestr);
-       timestr = NULL;
+       assert_string_equal(*timestr, "05:45");
 }
 
-void get_minus_five_minutes_test()
+void get_minus_five_minutes_test(void** timestr)
 {
        const time_t time = -300;
 
-       char* timestr = get_time_str(time);
+       *timestr = get_time_str(time);
 
-       assert_string_equal(timestr, "-00:05");
-
-       free(timestr);
-       timestr = NULL;
+       assert_string_equal(*timestr, "-00:05");
 }
 
-void get_zero_hour_and_fifteen_minutes_overtime_test()
+void get_zero_hour_and_fifteen_minutes_overtime_test(void** timestr)
 {
        const time_t time = 900;
 
-       char* timestr = get_time_overtime_str(time);
-
-       assert_string_equal(timestr, "-00:15");
+       *timestr = get_time_overtime_str(time);
 
-       free(timestr);
-       timestr = NULL;
+       assert_string_equal(*timestr, "-00:15");
 }
 
-void get_five_hour_fourty_five_overtime_test()
+void get_five_hour_fourty_five_overtime_test(void** timestr)
 {
        const time_t time = 20700;
 
-       char* timestr = get_time_overtime_str(time);
+       *timestr = get_time_overtime_str(time);
 
-       assert_string_equal(timestr, "-05:45");
-
-       free(timestr);
-       timestr = NULL;
+       assert_string_equal(*timestr, "-05:45");
 }
 
-void get_minus_five_minutes_overtime_test()
+void get_minus_five_minutes_overtime_test(void** timestr)
 {
        const time_t time = -300;
 
-       char* timestr = get_time_overtime_str(time);
-
-       assert_string_equal(timestr, "00:05");
+       *timestr = get_time_overtime_str(time);
 
-       free(timestr);
-       timestr = NULL;
+       assert_string_equal(*timestr, "00:05");
 }
 
-void get_zero_overtime_test()
+void get_zero_overtime_test(void** timestr)
 {
        const time_t time = 0;
 
-       char* timestr = get_time_overtime_str(time);
+       *timestr = get_time_overtime_str(time);
 
-       assert_string_equal(timestr, "00:00");
-
-       free(timestr);
-       timestr = NULL;
+       assert_string_equal(*timestr, "00:00");
 }
 
-void get_thursday_test()
+void get_thursday_test(void** weekday)
 {
-       char* weekday = get_weekday_str(4);
-
-       assert_string_equal(weekday, "Donnerstag");
+       *weekday = get_weekday_str(4);
 
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Donnerstag");
 }
 
-void get_friday_test()
+void get_friday_test(void** weekday)
 {
-       char* weekday = get_weekday_str(5);
+       *weekday = get_weekday_str(5);
 
-       assert_string_equal(weekday, "Freitag");
-
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Freitag");
 }
 
-void get_saturday_test()
+void get_saturday_test(void** weekday)
 {
-       char* weekday = get_weekday_str(6);
-
-       assert_string_equal(weekday, "Samstag");
+       *weekday = get_weekday_str(6);
 
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Samstag");
 }
 
-void get_sunday_test()
+void get_sunday_test(void** weekday)
 {
-       char* weekday = get_weekday_str(0);
-
-       assert_string_equal(weekday, "Sonntag");
+       *weekday = get_weekday_str(0);
 
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Sonntag");
 }
 
-void get_monday_test()
+void get_monday_test(void** weekday)
 {
-       char* weekday = get_weekday_str(1);
+       *weekday = get_weekday_str(1);
 
-       assert_string_equal(weekday, "Montag");
-
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Montag");
 }
 
-void get_thuesday_test()
+void get_thuesday_test(void** weekday)
 {
-       char* weekday = get_weekday_str(2);
-
-       assert_string_equal(weekday, "Dienstag");
+       *weekday = get_weekday_str(2);
 
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Dienstag");
 }
 
-void get_wednesday_test()
+void get_wednesday_test(void** weekday)
 {
-       char* weekday = get_weekday_str(3);
+       *weekday = get_weekday_str(3);
 
-       assert_string_equal(weekday, "Mittwoch");
-
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Mittwoch");
 }
 
-void get_short_sunday_test()
+void get_short_sunday_test(void** weekday)
 {
-       char* weekday = get_weekday_short_str(0);
-
-       assert_string_equal(weekday, "So");
+       *weekday = get_weekday_short_str(0);
 
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "So");
 }
 
-void get_short_monday_test()
+void get_short_monday_test(void** weekday)
 {
-       char* weekday = get_weekday_short_str(1);
+       *weekday = get_weekday_short_str(1);
 
-       assert_string_equal(weekday, "Mo");
-
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Mo");
 }
 
-void get_short_thuesday_test()
+void get_short_thuesday_test(void** weekday)
 {
-       char* weekday = get_weekday_short_str(2);
-
-       assert_string_equal(weekday, "Di");
+       *weekday = get_weekday_short_str(2);
 
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Di");
 }
 
-void get_short_wednesday_test()
+void get_short_wednesday_test(void** weekday)
 {
-       char* weekday = get_weekday_short_str(3);
-
-       assert_string_equal(weekday, "Mi");
+       *weekday = get_weekday_short_str(3);
 
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Mi");
 }
 
-void get_short_thursday_test()
+void get_short_thursday_test(void** weekday)
 {
-       char* weekday = get_weekday_short_str(4);
+       *weekday = get_weekday_short_str(4);
 
-       assert_string_equal(weekday, "Do");
-
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Do");
 }
 
-void get_short_friday_test()
+void get_short_friday_test(void** weekday)
 {
-       char* weekday = get_weekday_short_str(5);
-
-       assert_string_equal(weekday, "Fr");
+       *weekday = get_weekday_short_str(5);
 
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Fr");
 }
 
-void get_short_saturday_test()
+void get_short_saturday_test(void** weekday)
 {
-       char* weekday = get_weekday_short_str(6);
+       *weekday = get_weekday_short_str(6);
 
-       assert_string_equal(weekday, "Sa");
-
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "Sa");
 }
 
-void get_short_unknown_test()
+void get_short_unknown_test(void** weekday)
 {
-       char* weekday = get_weekday_short_str(7);
-
-       assert_string_equal(weekday, "--");
+       *weekday = get_weekday_short_str(7);
 
-       free(weekday);
-       weekday = NULL;
+       assert_string_equal(*weekday, "--");
 }
 
 void get_seconds_from_str_test()
@@ -280,7 +222,7 @@ void get_dat_from_date_test()
        assert_int_equal(result, 24);
 }
 
-void get_date_str_from_tm_test()
+void get_date_str_from_tm_test(void** datestr)
 {
        const struct tm date = {
                .tm_year = 126,
@@ -288,67 +230,58 @@ void get_date_str_from_tm_test()
                .tm_mday = 14
        };
 
-       char* datestr = get_date_str(date);
+       *datestr = get_date_str(date);
 
-       assert_string_equal(datestr, "2026-02-14");
-
-       free(datestr),
-       datestr = NULL;
+       assert_string_equal(*datestr, "2026-02-14");
 }
 
-void get_time_str_from_four_nine_test()
+void get_time_str_from_four_nine_test(void** timestr)
 {
-       char* timestr = get_time_str_from_int(4, 9);
-
-       assert_string_equal(timestr, "04:09");
+       *timestr = get_time_str_from_int(4, 9);
 
-       free(timestr),
-       timestr = NULL;
+       assert_string_equal(*timestr, "04:09");
 }
 
-void get_time_str_from_twenty_three_fity_nine_test()
+void get_time_str_from_twenty_three_fity_nine_test(void** timestr)
 {
-       char* timestr = get_time_str_from_int(23, 59);
-
-       assert_string_equal(timestr, "23:59");
+       *timestr = get_time_str_from_int(23, 59);
 
-       free(timestr),
-       timestr = NULL;
+       assert_string_equal(*timestr, "23:59");
 }
 
 int main()
 {
        const struct CMUnitTest tests[] = {
-               cmocka_unit_test(get_zero_hour_and_fifteen_minutes_test),
-               cmocka_unit_test(get_five_hour_fourty_five_test),
-               cmocka_unit_test(get_minus_five_minutes_test),
-               cmocka_unit_test(get_zero_hour_and_fifteen_minutes_overtime_test),
-               cmocka_unit_test(get_five_hour_fourty_five_overtime_test),
-               cmocka_unit_test(get_minus_five_minutes_overtime_test),
-               cmocka_unit_test(get_zero_overtime_test),
-               cmocka_unit_test(get_thursday_test),
-               cmocka_unit_test(get_friday_test),
-               cmocka_unit_test(get_saturday_test),
-               cmocka_unit_test(get_sunday_test),
-               cmocka_unit_test(get_monday_test),
-               cmocka_unit_test(get_thuesday_test),
-               cmocka_unit_test(get_wednesday_test),
-               cmocka_unit_test(get_short_sunday_test),
-               cmocka_unit_test(get_short_monday_test),
-               cmocka_unit_test(get_short_thuesday_test),
-               cmocka_unit_test(get_short_wednesday_test),
-               cmocka_unit_test(get_short_thursday_test),
-               cmocka_unit_test(get_short_friday_test),
-               cmocka_unit_test(get_short_saturday_test),
-               cmocka_unit_test(get_short_unknown_test),
+               cmocka_unit_test_teardown(get_zero_hour_and_fifteen_minutes_test, teardown),
+               cmocka_unit_test_teardown(get_five_hour_fourty_five_test, teardown),
+               cmocka_unit_test_teardown(get_minus_five_minutes_test, teardown),
+               cmocka_unit_test_teardown(get_zero_hour_and_fifteen_minutes_overtime_test, teardown),
+               cmocka_unit_test_teardown(get_five_hour_fourty_five_overtime_test, teardown),
+               cmocka_unit_test_teardown(get_minus_five_minutes_overtime_test, teardown),
+               cmocka_unit_test_teardown(get_zero_overtime_test, teardown),
+               cmocka_unit_test_teardown(get_thursday_test, teardown),
+               cmocka_unit_test_teardown(get_friday_test, teardown),
+               cmocka_unit_test_teardown(get_saturday_test, teardown),
+               cmocka_unit_test_teardown(get_sunday_test, teardown),
+               cmocka_unit_test_teardown(get_monday_test, teardown),
+               cmocka_unit_test_teardown(get_thuesday_test, teardown),
+               cmocka_unit_test_teardown(get_wednesday_test, teardown),
+               cmocka_unit_test_teardown(get_short_sunday_test, teardown),
+               cmocka_unit_test_teardown(get_short_monday_test, teardown),
+               cmocka_unit_test_teardown(get_short_thuesday_test, teardown),
+               cmocka_unit_test_teardown(get_short_wednesday_test, teardown),
+               cmocka_unit_test_teardown(get_short_thursday_test, teardown),
+               cmocka_unit_test_teardown(get_short_friday_test, teardown),
+               cmocka_unit_test_teardown(get_short_saturday_test, teardown),
+               cmocka_unit_test_teardown(get_short_unknown_test, teardown),
                cmocka_unit_test(get_seconds_from_str_test),
                cmocka_unit_test(get_seconds_from_str_minus_test),
                cmocka_unit_test(get_year_from_date_test),
                cmocka_unit_test(get_month_from_date_test),
                cmocka_unit_test(get_dat_from_date_test),
-               cmocka_unit_test(get_date_str_from_tm_test),
-               cmocka_unit_test(get_time_str_from_four_nine_test),
-               cmocka_unit_test(get_time_str_from_twenty_three_fity_nine_test)
+               cmocka_unit_test_teardown(get_date_str_from_tm_test, teardown),
+               cmocka_unit_test_teardown(get_time_str_from_four_nine_test, teardown),
+               cmocka_unit_test_teardown(get_time_str_from_twenty_three_fity_nine_test, teardown)
        };
 
        return cmocka_run_group_tests(tests, NULL, NULL);