stv0g/Criterion
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added assert_null and structure arrays asserts

Browse source
This commit is contained in:
Snaipe 2015-04-14 19:44:30 +02:00
parent c583e7e742
commit 589bcf60fd
2 changed files with 114 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
include/criterion/assert.h
View file

@ -111,6 +111,22 @@ struct criterion_assert_args {
# define assert_geq(...) assert_op_(>=, __VA_ARGS__, .sentinel_ = 0)
# define expect_geq(...) expect_op_(>=, __VA_ARGS__, .sentinel_ = 0)
# define assert_null_(Value, ...) \
assert_impl(FATAL, (Value) == NULL, __VA_ARGS__)
# define expect_null_(Value, ...) \
assert_impl(NORMAL, (Value) == NULL, __VA_ARGS__)
# define assert_null(...) assert_null_(__VA_ARGS__, .sentinel_ = 0)
# define expect_null(...) expect_null_(__VA_ARGS__, .sentinel_ = 0)
# define assert_not_null_(Value, ...) \
assert_impl(FATAL, (Value) != NULL, __VA_ARGS__)
# define expect_not_null_(Value, ...) \
assert_impl(NORMAL, (Value) != NULL, __VA_ARGS__)
# define assert_not_null(...) assert_not_null_(__VA_ARGS__, .sentinel_ = 0)
# define expect_not_null(...) expect_not_null_(__VA_ARGS__, .sentinel_ = 0)
// Floating-point asserts
# define assert_float_eq(...) \
@ -173,23 +189,82 @@ struct criterion_assert_args {
// Array asserts
# define assert_arrays_eq(...) \
assert_arrays_eq_(__VA_ARGS__, .sentinel = 0)
assert_arrays_eq_(__VA_ARGS__, .sentinel_ = 0)
# define expect_arrays_eq(...) \
expect_arrays_eq_(__VA_ARGS__, .sentinel = 0)
expect_arrays_eq_(__VA_ARGS__, .sentinel_ = 0)
# define assert_arrays_neq(...) \
assert_arrays_neq_(__VA_ARGS__, .sentinel = 0)
assert_arrays_neq_(__VA_ARGS__, .sentinel_ = 0)
# define expect_arrays_neq(...) \
expect_arrays_neq_(__VA_ARGS__, .sentinel = 0)
expect_arrays_neq_(__VA_ARGS__, .sentinel_ = 0)
# define assert_arrays_eq_(A, B, Size, ...) \
assert_impl(FATAL, !memcmp((A), (B), (Size)), __VA_ARGS__)
# define assert_arrays_eq_(A, B, Size, ...) \
assert_impl(FATAL, !memcmp((A), (B), (Size)), \
.default_msg = "Arrays are not equal.", \
__VA_ARGS__)
# define expect_arrays_eq_(A, B, Size, ...) \
assert_impl(NORMAL, !memcmp((A), (B), (Size)), __VA_ARGS__)
assert_impl(NORMAL, !memcmp((A), (B), (Size)), \
.default_msg = "Arrays are not equal.", \
__VA_ARGS__)
# define assert_arrays_neq_(A, B, Size, ...) \
assert_impl(FATAL, memcmp((A), (B), (Size)), __VA_ARGS__)
# define expect_arrays_neq_(A, B, Size, ...) \
assert_impl(NORMAL, memcmp((A), (B), (Size)), __VA_ARGS__)
# define assert_arrays_neq_(A, B, Size, ...) \
assert_impl(FATAL, memcmp((A), (B), (Size)), \
.default_msg = "Arrays are equal", \
__VA_ARGS__)
# define expect_arrays_neq_(A, B, Size, ...) \
assert_impl(NORMAL, memcmp((A), (B), (Size)), \
.default_msg = "Arrays are equal", \
__VA_ARGS__)
# ifdef __GNUC__
# define CRIT_ARR_COMPARE_(A, B, Size, Cmp, Result) \
__typeof__(&(A)[0]) first = (A); \
__typeof__(&(B)[0]) second = (B); \
int equals = 1; \
for (size_t i = 0, size = (Size); equals && i < size; ++i) \
equals = equals && !Cmp(first + i, second + i)
# define assert_arrays_eq_cmp_(A, B, Size, Cmp, ...) \
do { \
CRIT_ARR_COMPARE_(A, B, Size, Cmp, equals); \
assert_impl(FATAL, equals, \
.default_msg = "Arrays are not equal", \
__VA_ARGS__); \
} while (0)
# define expect_arrays_eq_cmp_(A, B, Size, Cmp, ...) \
do { \
CRIT_ARR_COMPARE_(A, B, Size, Cmp, equals); \
assert_impl(NORMAL, equals, \
.default_msg = "Arrays are not equal", \
__VA_ARGS__); \
} while (0)
# define assert_arrays_eq_cmp(...) \
assert_arrays_eq_cmp_(__VA_ARGS__, .sentinel_ = 0)
# define expect_arrays_eq_cmp(...) \
expect_arrays_eq_cmp_(__VA_ARGS__, .sentinel_ = 0)
# define assert_arrays_neq_cmp_(A, B, Size, Cmp, ...) \
do { \
CRIT_ARR_COMPARE_(A, B, Size, Cmp, equals); \
assert_impl(FATAL, !equals, \
.default_msg = "Arrays not equal", \
__VA_ARGS__); \
} while (0)
# define expect_arrays_neq_cmp_(A, B, Size, Cmp, ...) \
do { \
CRIT_ARR_COMPARE_(A, B, Size, Cmp, equals); \
assert_impl(NORMAL, equals, \
.default_msg = "Arrays not equal", \
__VA_ARGS__); \
} while (0)
# define assert_arrays_neq_cmp(...) \
assert_arrays_eq_cmp_(__VA_ARGS__, .sentinel_ = 0)
# define expect_arrays_neq_cmp(...) \
expect_arrays_eq_cmp_(__VA_ARGS__, .sentinel_ = 0)
# endif /* !__GNUC__ */
#endif /* !CRITERION_ASSERT_H_ */

28
samples/asserts.c
View file

@ -50,3 +50,31 @@ Test(asserts, float) {
assert_neq(0.1 * 0.1, 0.01);
assert_float_eq(0.1 * 0.1, 0.01, 0.001);
}
struct dummy_struct {
char a;
size_t b;
};
int eq_dummy(struct dummy_struct *a, struct dummy_struct *b) {
return a->a != b->a || a->b != b->b;
}
Test(asserts, array) {
int arr1[] = {1, 2, 3, 4};
int arr2[] = {4, 3, 2, 1};
struct dummy_struct s1[] = {{4, 2}, {2, 4}};
struct dummy_struct s2[2];
memset(s2, 0xFF, sizeof(s2));
s2[0].a = 4;
s2[0].b = 2;
s2[1].a = 2;
s2[1].b = 4;
assert_arrays_eq(arr1, arr1, 4);
assert_arrays_neq(arr1, arr2, 4);
assert_arrays_neq(s1, s2, 2);
assert_arrays_eq_cmp(s1, s2, 2, eq_dummy);
}