[Issue #3] Merge branch 'asserts'
This commit is contained in:
commit
c75b5e09db
1 changed files with 37 additions and 8 deletions
|
@ -24,6 +24,7 @@
|
|||
#ifndef CRITERION_ASSERT_H_
|
||||
# define CRITERION_ASSERT_H_
|
||||
|
||||
# include <string.h>
|
||||
# include <stdlib.h>
|
||||
# include <stdbool.h>
|
||||
# include "criterion.h"
|
||||
|
@ -40,7 +41,7 @@ enum criterion_assert_kind {
|
|||
do { \
|
||||
int passed = !!(Condition); \
|
||||
struct criterion_assert_stats stat = { \
|
||||
.kind = Kind, \
|
||||
.kind = (Kind), \
|
||||
.condition = #Condition, \
|
||||
.message = "" __VA_ARGS__, \
|
||||
.passed = passed, \
|
||||
|
@ -48,16 +49,44 @@ enum criterion_assert_kind {
|
|||
.line = __LINE__, \
|
||||
}; \
|
||||
send_event(ASSERT, &stat, sizeof (stat)); \
|
||||
if (!passed && Kind == FATAL) \
|
||||
if (!passed && (Kind) == FATAL) \
|
||||
return; \
|
||||
} while (0)
|
||||
|
||||
# define expect(Condition, ...) assertImpl(NORMAL, Condition, __VA_ARGS__)
|
||||
# define assert(Condition, ...) assertImpl(FATAL, Condition, __VA_ARGS__)
|
||||
# define assert(Condition, ...) assertImpl(FATAL, (Condition), ## __VA_ARGS__)
|
||||
# define expect(Condition, ...) assertImpl(NORMAL, (Condition), ## __VA_ARGS__)
|
||||
|
||||
# define assertArrayEquals(A, B, Size, ...) \
|
||||
assertImpl(NORMAL, !memcmp((A), (B), Size), __VA_ARGS__)
|
||||
# define expectArrayEquals(A, B, Size, ...) \
|
||||
assertImpl(FATAL, !memcmp((A), (B), Size), __VA_ARGS__)
|
||||
# define assertArraysEqual(A, B, Size, ...) \
|
||||
assert(!memcmp((A), (B), (Size)), ## __VA_ARGS__)
|
||||
# define expectArraysEqual(A, B, Size, ...) \
|
||||
expect(!memcmp((A), (B), (Size)), ## __VA_ARGS__)
|
||||
|
||||
# define assertEqual(Actual, Expected, ...) \
|
||||
assert((Actual) == (Expected), ## __VA_ARGS__)
|
||||
# define expectEqual(Actual, Expected, ...) \
|
||||
expect((Actual) == (Expected), ## __VA_ARGS__)
|
||||
|
||||
# define assertStringsEqual(Actual, Expected, ...) \
|
||||
assert(!strcmp((Actual), (Expected)), ## __VA_ARGS__)
|
||||
# define expectStringsEqual(Actual, Expected, ...) \
|
||||
expect(!strcmp((Actual), (Expected)), ## __VA_ARGS__)
|
||||
|
||||
# define assertNot(Condition, ...) assert(!(Condition), ## __VA_ARGS__)
|
||||
# define expectNot(Condition, ...) expect(!(Condition), ## __VA_ARGS__)
|
||||
|
||||
# define assertNotEqual(Actual, Expected, ...) \
|
||||
assert((Actual) != (Expected), ## __VA_ARGS__)
|
||||
# define expectNotEqual(Actual, Expected, ...) \
|
||||
expect((Actual) != (Expected), ## __VA_ARGS__)
|
||||
|
||||
# define assertArraysNotEqual(A, B, Size, ...) \
|
||||
assert(memcmp((A), (B), (Size)), ## __VA_ARGS__)
|
||||
# define expectArraysNotEqual(A, B, Size, ...) \
|
||||
expect(memcmp((A), (B), (Size)), ## __VA_ARGS__)
|
||||
|
||||
# define assertStringsNotEqual(Actual, Expected, ...) \
|
||||
assert(strcmp((Actual), (Expected)), ## __VA_ARGS__)
|
||||
# define expectStringsNotEqual(Actual, Expected, ...) \
|
||||
expect(strcmp((Actual), (Expected)), ## __VA_ARGS__)
|
||||
|
||||
#endif /* !CRITERION_ASSERT_H_ */
|
||||
|
|
Loading…
Add table
Reference in a new issue