@@ -15,36 +15,29 @@ static void t_add(struct test_vars *vars)
15
15
{
16
16
void * ret = add_decoration (& vars -> n , vars -> one , & vars -> decoration_a );
17
17
18
- if (!check (ret == NULL ))
19
- test_msg ("when adding a brand-new object, NULL should be returned" );
18
+ check (ret == NULL );
20
19
ret = add_decoration (& vars -> n , vars -> two , NULL );
21
- if (!check (ret == NULL ))
22
- test_msg ("when adding a brand-new object, NULL should be returned" );
20
+ check (ret == NULL );
23
21
}
24
22
25
23
static void t_readd (struct test_vars * vars )
26
24
{
27
25
void * ret = add_decoration (& vars -> n , vars -> one , NULL );
28
26
29
- if (!check (ret == & vars -> decoration_a ))
30
- test_msg ("when readding an already existing object, existing decoration should be returned" );
27
+ check (ret == & vars -> decoration_a );
31
28
ret = add_decoration (& vars -> n , vars -> two , & vars -> decoration_b );
32
- if (!check (ret == NULL ))
33
- test_msg ("when readding an already existing object, existing decoration should be returned" );
29
+ check (ret == NULL );
34
30
}
35
31
36
32
static void t_lookup (struct test_vars * vars )
37
33
{
38
34
void * ret = lookup_decoration (& vars -> n , vars -> one );
39
35
40
- if (!check (ret == NULL ))
41
- test_msg ("lookup should return added declaration" );
36
+ check (ret == NULL );
42
37
ret = lookup_decoration (& vars -> n , vars -> two );
43
- if (!check (ret == & vars -> decoration_b ))
44
- test_msg ("lookup should return added declaration" );
38
+ check (ret == & vars -> decoration_b );
45
39
ret = lookup_decoration (& vars -> n , vars -> three );
46
- if (!check (ret == NULL ))
47
- test_msg ("lookup for unknown object should return NULL" );
40
+ check (ret == NULL );
48
41
}
49
42
50
43
static void t_loop (struct test_vars * vars )
@@ -55,8 +48,7 @@ static void t_loop(struct test_vars *vars)
55
48
if (vars -> n .entries [i ].base )
56
49
objects_noticed ++ ;
57
50
}
58
- if (!check_int (objects_noticed , = = , 2 ))
59
- test_msg ("should have 2 objects" );
51
+ check_int (objects_noticed , = = , 2 );
60
52
}
61
53
62
54
int cmd_main (int argc UNUSED , const char * * argv UNUSED )
0 commit comments