9p/9unit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made check_value() use test_context_with() 

eliminates some redundant code
This commit is contained in:
jlamothe 2023-11-17 23:07:05 +00:00
parent 5d67b7aeb8
commit 37ce34b160
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
9unit.c
View File

@ -37,7 +37,7 @@ typedef struct SingleTestContext SingleTestContext;
typedef struct TestContextWith TestContextWith; typedef struct TestContextWith TestContextWith;
// data used by check_value() // data used by check_value()
typedef struct CheckValueData CheckValueData; typedef struct CheckValue CheckValue;
struct ContextData struct ContextData
{ {
@ -60,9 +60,8 @@ struct TestContextWith
void (*test)(TestState *, void *); // the test function void (*test)(TestState *, void *); // the test function
}; };
struct CheckValueData struct CheckValue
{ {
void *ptr; // state's original ptr value
void *chk_val; // the value being checked void *chk_val; // the value being checked
void *ref_val; // the reference value void *ref_val; // the reference value
void (*test)(TestState *, void *, void *); // the test void (*test)(TestState *, void *, void *); // the test
@ -80,7 +79,7 @@ static void display_context(TestState *);
static void restore_context(TestState *, ContextData *); static void restore_context(TestState *, ContextData *);
static void run_single_test_context(TestState *); static void run_single_test_context(TestState *);
static void test_context_with_test(TestState *); static void test_context_with_test(TestState *);
static void check_value_test(TestState *); static void check_value_test(TestState *, void *);
// Public Functions // Public Functions
@ -222,13 +221,11 @@ check_value(
) )
{ {
if (!(s && test)) return; if (!(s && test)) return;
CheckValueData d; CheckValue d;
d.ptr = s->ptr;
d.chk_val = chk_val; d.chk_val = chk_val;
d.ref_val = ref_val; d.ref_val = ref_val;
d.test = test; d.test = test;
s->ptr = &d; test_context_with(s, context, check_value_test, &d);
test_context(s, context, check_value_test);
} }
// Internal Functions // Internal Functions
@ -344,10 +341,9 @@ test_context_with_test(TestState *s)
} }
static void static void
check_value_test(TestState *s) check_value_test(TestState *s, void *ptr)
{ {
CheckValueData *d = s->ptr; CheckValue *d = ptr;
s->ptr = d->ptr;
(*d->test)(s, d->chk_val, d->ref_val); (*d->test)(s, d->chk_val, d->ref_val);
} }