Skip to content

Added before_each and after_each #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ledmington wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added before_each and after_each #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34ee34e
Added before_each and after_each
Mar 31, 2022
34991a4
Fixed test
Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions minunit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ static char minunit_last_message[MINUNIT_MESSAGE_LEN];
static void (*minunit_setup)(void) = NULL;
static void (*minunit_teardown)(void) = NULL;

/* Test before_each and after_each function pointers */
static void (*minunit_before_each)(void) = NULL;
static void (*minunit_after_each)(void) = NULL;

/* Definitions */
#define MU_TEST(method_name) static void method_name(void)
#define MU_TEST_SUITE(suite_name) static void suite_name(void)
Expand All @@ -98,14 +102,20 @@ static void (*minunit_teardown)(void) = NULL;
/* Run test suite and unset setup and teardown functions */
#define MU_RUN_SUITE(suite_name) MU__SAFE_BLOCK(\
suite_name();\
if (minunit_teardown) (*minunit_teardown)();\
minunit_setup = NULL;\
minunit_teardown = NULL;\
minunit_before_each = NULL;\
minunit_after_each = NULL;\
)

/* Configure setup and teardown functions */
#define MU_SUITE_CONFIGURE(setup_fun, teardown_fun) MU__SAFE_BLOCK(\
#define MU_SUITE_CONFIGURE(setup_fun, teardown_fun, before_each_fun, after_each_fun) MU__SAFE_BLOCK(\
minunit_setup = setup_fun;\
minunit_teardown = teardown_fun;\
minunit_before_each = before_each_fun;\
minunit_after_each = after_each_fun;\
if (minunit_setup) (*minunit_setup)();\
)

/* Test runner */
Expand All @@ -114,7 +124,7 @@ static void (*minunit_teardown)(void) = NULL;
minunit_real_timer = mu_timer_real();\
minunit_proc_timer = mu_timer_cpu();\
}\
if (minunit_setup) (*minunit_setup)();\
if (minunit_before_each) (*minunit_before_each)();\
minunit_status = 0;\
test();\
minunit_run++;\
Expand All @@ -124,7 +134,7 @@ static void (*minunit_teardown)(void) = NULL;
printf("\n%s\n", minunit_last_message);\
}\
fflush(stdout);\
if (minunit_teardown) (*minunit_teardown)();\
if (minunit_after_each) (*minunit_after_each)();\
)

/* Report */
Expand Down Expand Up @@ -211,7 +221,7 @@ static void (*minunit_teardown)(void) = NULL;
if (!minunit_tmp_r) {\
minunit_tmp_r = "<null pointer>";\
}\
if(strcmp(minunit_tmp_e, minunit_tmp_r)) {\
if (strcmp(minunit_tmp_e, minunit_tmp_r)) {\
snprintf(minunit_last_message, MINUNIT_MESSAGE_LEN, "%s failed:\n\t%s:%d: '%s' expected but was '%s'", __func__, __FILE__, __LINE__, minunit_tmp_e, minunit_tmp_r);\
minunit_status = 1;\
return;\
Expand Down
11 changes: 10 additions & 1 deletion minunit_example.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,19 @@ static double dbar = 0.1;
static const char* foostring = "Thisstring";

void test_setup(void) {
/* Maybe allocate some memory */
}

void test_before_each(void) {
foo = 7;
bar = 4;
}

void test_after_each(void) {
foo = -1;
bar = -1;
}

void test_teardown(void) {
/* Nothing */
}
Expand Down Expand Up @@ -60,7 +69,7 @@ MU_TEST(test_string_eq_fail){


MU_TEST_SUITE(test_suite) {
MU_SUITE_CONFIGURE(&test_setup, &test_teardown);
MU_SUITE_CONFIGURE(&test_setup, &test_teardown, &test_before_each, &test_after_each);

MU_RUN_TEST(test_check);
MU_RUN_TEST(test_assert);
Expand Down