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

Removed __VA_ARG__ concatenation GCC extension as it has a better alternative in this case.

Browse source
This commit is contained in:
Snaipe 2015-03-11 03:39:37 +01:00
parent e7dc892c42
commit 919c49853d
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
include/criterion/assert.h
View file

@ -55,53 +55,53 @@ enum criterion_assert_kind {
// Common asserts
# define assert(Condition, ...) assert_impl(FATAL, (Condition), ## __VA_ARGS__)
# define expect(Condition, ...) assert_impl(NORMAL, (Condition), ## __VA_ARGS__)
# define assert(Condition, ...) assert_impl(FATAL, (Condition), "" __VA_ARGS__)
# define expect(Condition, ...) assert_impl(NORMAL, (Condition), "" __VA_ARGS__)
# define assert_not(Condition, ...) assert(!(Condition), ## __VA_ARGS__)
# define expect_not(Condition, ...) expect(!(Condition), ## __VA_ARGS__)
# define assert_not(Condition, ...) assert(!(Condition), "" __VA_ARGS__)
# define expect_not(Condition, ...) expect(!(Condition), "" __VA_ARGS__)
// Native asserts
# define assert_equal(Actual, Expected, ...) \
assert((Actual) == (Expected), ## __VA_ARGS__)
assert((Actual) == (Expected), "" __VA_ARGS__)
# define expect_equal(Actual, Expected, ...) \
expect((Actual) == (Expected), ## __VA_ARGS__)
expect((Actual) == (Expected), "" __VA_ARGS__)
# define assert_not_equal(Actual, Expected, ...) \
assert((Actual) != (Expected), ## __VA_ARGS__)
assert((Actual) != (Expected), "" __VA_ARGS__)
# define expectNotEqual(Actual, Expected, ...) \
expect((Actual) != (Expected), ## __VA_ARGS__)
expect((Actual) != (Expected), "" __VA_ARGS__)
// Floating-point asserts
# define assert_float_equal(Actual, Expected, Epsilon, ...) \
assert((Expected) - (Actual) < (Epsilon) && (Actual) - (Expected) < (Epsilon), ## __VA_ARGS__)
assert((Expected) - (Actual) < (Epsilon) && (Actual) - (Expected) < (Epsilon), "" __VA_ARGS__)
# define expect_float_equal(Actual, Expected, Epsilon, ...) \
expect((Expected) - (Actual) < (Epsilon) && (Actual) - (Expected) < (Epsilon), ## __VA_ARGS__)
expect((Expected) - (Actual) < (Epsilon) && (Actual) - (Expected) < (Epsilon), "" __VA_ARGS__)
// String asserts
# define assert_strings_equal(Actual, Expected, ...) \
assert(!strcmp((Actual), (Expected)), ## __VA_ARGS__)
assert(!strcmp((Actual), (Expected)), "" __VA_ARGS__)
# define expect_strings_equal(Actual, Expected, ...) \
expect(!strcmp((Actual), (Expected)), ## __VA_ARGS__)
expect(!strcmp((Actual), (Expected)), "" __VA_ARGS__)
# define assert_strings_not_equal(Actual, Expected, ...) \
assert(strcmp((Actual), (Expected)), ## __VA_ARGS__)
assert(strcmp((Actual), (Expected)), "" __VA_ARGS__)
# define expect_strings_not_equal(Actual, Expected, ...) \
expect(strcmp((Actual), (Expected)), ## __VA_ARGS__)
expect(strcmp((Actual), (Expected)), "" __VA_ARGS__)
// Array asserts
# define assert_arrays_equal(A, B, Size, ...) \
assert(!memcmp((A), (B), (Size)), ## __VA_ARGS__)
assert(!memcmp((A), (B), (Size)), "" __VA_ARGS__)
# define expect_arrays_equal(A, B, Size, ...) \
expect(!memcmp((A), (B), (Size)), ## __VA_ARGS__)
expect(!memcmp((A), (B), (Size)), "" __VA_ARGS__)
# define assert_arrays_not_equal(A, B, Size, ...) \
assert(memcmp((A), (B), (Size)), ## __VA_ARGS__)
assert(memcmp((A), (B), (Size)), "" __VA_ARGS__)
# define expect_arrays_not_equal(A, B, Size, ...) \
expect(memcmp((A), (B), (Size)), ## __VA_ARGS__)
expect(memcmp((A), (B), (Size)), "" __VA_ARGS__)
#endif /* !CRITERION_ASSERT_H_ */