michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ztest: run clang-format on ztest_assert.h

Browse source 
Simple pass to make the diff easier to read for additional changes.

Signed-off-by: Yuval Peress <peress@google.com>
This commit is contained in:
Yuval Peress 2022-06-27 11:41:01 -06:00 • committed by Anas Nashif
commit e26ea1b936
1 changed files with 42 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

86
subsys/testsuite/ztest/include/zephyr/ztest_assert.h
View file

@ -13,11 +13,12 @@
#ifndef ZEPHYR_TESTSUITE_ZTEST_ASSERT_H_
#define ZEPHYR_TESTSUITE_ZTEST_ASSERT_H_
#include <ztest.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
#include <stdbool.h>
#include <ztest.h>
#ifdef __cplusplus
extern "C" {
@ -30,8 +31,7 @@ void ztest_test_fail(void);
static inline bool z_zassert_(bool cond, const char *file, int line)
{
if (cond == false) {
PRINT("\n Assertion failed at %s:%d\n",
ztest_relative_filename(file), line);
PRINT("\n Assertion failed at %s:%d\n", ztest_relative_filename(file), line);
ztest_test_fail();
return false;
}
@ -39,23 +39,19 @@ static inline bool z_zassert_(bool cond, const char *file, int line)
return true;
}
#define z_zassert(cond, default_msg, file, line, func, msg, ...) \
z_zassert_(cond, file, line)
#define z_zassert(cond, default_msg, file, line, func, msg, ...) z_zassert_(cond, file, line)
#else /* CONFIG_ZTEST_ASSERT_VERBOSE != 0 */
static inline bool z_zassert(bool cond,
const char *default_msg,
const char *file,
int line, const char *func,
const char *msg, ...)
static inline bool z_zassert(bool cond, const char *default_msg, const char *file, int line,
const char *func, const char *msg, ...)
{
if (cond == false) {
va_list vargs;
va_start(vargs, msg);
PRINT("\n Assertion failed at %s:%d: %s: %s\n",
ztest_relative_filename(file), line, func, default_msg);
PRINT("\n Assertion failed at %s:%d: %s: %s\n", ztest_relative_filename(file),
line, func, default_msg);
vprintk(msg, vargs);
printk("\n");
va_end(vargs);
@ -64,8 +60,8 @@ static inline bool z_zassert(bool cond,
}
#if CONFIG_ZTEST_ASSERT_VERBOSE == 2
else {
PRINT("\n Assertion succeeded at %s:%d (%s)\n",
ztest_relative_filename(file), line, func);
PRINT("\n Assertion succeeded at %s:%d (%s)\n", ztest_relative_filename(file),
line, func);
}
#endif
return true;
@ -73,7 +69,6 @@ static inline bool z_zassert(bool cond,
#endif /* CONFIG_ZTEST_ASSERT_VERBOSE */
/**
* @defgroup ztest_assert Ztest assertion macros
* @ingroup ztest
@ -97,14 +92,13 @@ static inline bool z_zassert(bool cond,
* @param msg Optional, can be NULL. Message to print if @a cond is false.
* @param default_msg Message to print if @a cond is false
*/
#define zassert(cond, default_msg, msg, ...) do { \
bool _ret = z_zassert(cond, msg ? ("(" default_msg ")") : (default_msg), \
__FILE__, __LINE__, __func__, \
msg ? msg : "", ##__VA_ARGS__); \
#define zassert(cond, default_msg, msg, ...) \
do { \
bool _ret = z_zassert(cond, msg ? ("(" default_msg ")") : (default_msg), __FILE__, \
__LINE__, __func__, msg ? msg : "", ##__VA_ARGS__); \
if (!_ret) { \
/* If kernel but without multithreading return. */ \
COND_CODE_1(KERNEL, \
(COND_CODE_1(CONFIG_MULTITHREADING, (), (return;))), \
COND_CODE_1(KERNEL, (COND_CODE_1(CONFIG_MULTITHREADING, (), (return;))), \
()) \
} \
} while (0)
@ -113,50 +107,43 @@ static inline bool z_zassert(bool cond,
* @brief Assert that this function call won't be reached
* @param msg Optional message to print if the assertion fails
*/
#define zassert_unreachable(msg, ...) zassert(0, "Reached unreachable code", \
msg, ##__VA_ARGS__)
#define zassert_unreachable(msg, ...) zassert(0, "Reached unreachable code", msg, ##__VA_ARGS__)
/**
* @brief Assert that @a cond is true
* @param cond Condition to check
* @param msg Optional message to print if the assertion fails
*/
#define zassert_true(cond, msg, ...) zassert(cond, #cond " is false", \
msg, ##__VA_ARGS__)
#define zassert_true(cond, msg, ...) zassert(cond, #cond " is false", msg, ##__VA_ARGS__)
/**
* @brief Assert that @a cond is false
* @param cond Condition to check
* @param msg Optional message to print if the assertion fails
*/
#define zassert_false(cond, msg, ...) zassert(!(cond), #cond " is true", \
msg, ##__VA_ARGS__)
#define zassert_false(cond, msg, ...) zassert(!(cond), #cond " is true", msg, ##__VA_ARGS__)
/**
* @brief Assert that @a cond is 0 (success)
* @param cond Condition to check
* @param msg Optional message to print if the assertion fails
*/
#define zassert_ok(cond, msg, ...) zassert(!(cond), #cond " is non-zero", \
msg, ##__VA_ARGS__)
#define zassert_ok(cond, msg, ...) zassert(!(cond), #cond " is non-zero", msg, ##__VA_ARGS__)
/**
* @brief Assert that @a ptr is NULL
* @param ptr Pointer to compare
* @param msg Optional message to print if the assertion fails
*/
#define zassert_is_null(ptr, msg, ...) zassert((ptr) == NULL, \
#ptr " is not NULL", \
msg, ##__VA_ARGS__)
#define zassert_is_null(ptr, msg, ...) \
zassert((ptr) == NULL, #ptr " is not NULL", msg, ##__VA_ARGS__)
/**
* @brief Assert that @a ptr is not NULL
* @param ptr Pointer to compare
* @param msg Optional message to print if the assertion fails
*/
#define zassert_not_null(ptr, msg, ...) zassert((ptr) != NULL, \
#ptr " is NULL", msg, \
##__VA_ARGS__)
#define zassert_not_null(ptr, msg, ...) zassert((ptr) != NULL, #ptr " is NULL", msg, ##__VA_ARGS__)
/**
* @brief Assert that @a a equals @a b
@ -167,9 +154,8 @@ static inline bool z_zassert(bool cond,
* @param b Value to compare
* @param msg Optional message to print if the assertion fails
*/
#define zassert_equal(a, b, msg, ...) zassert((a) == (b), \
#a " not equal to " #b, \
msg, ##__VA_ARGS__)
#define zassert_equal(a, b, msg, ...) \
zassert((a) == (b), #a " not equal to " #b, msg, ##__VA_ARGS__)
/**
* @brief Assert that @a a does not equal @a b
@ -180,9 +166,8 @@ static inline bool z_zassert(bool cond,
* @param b Value to compare
* @param msg Optional message to print if the assertion fails
*/
#define zassert_not_equal(a, b, msg, ...) zassert((a) != (b), \
#a " equal to " #b, \
msg, ##__VA_ARGS__)
#define zassert_not_equal(a, b, msg, ...) \
zassert((a) != (b), #a " equal to " #b, msg, ##__VA_ARGS__)
/**
* @brief Assert that @a a equals @a b
@ -194,8 +179,7 @@ static inline bool z_zassert(bool cond,
* @param msg Optional message to print if the assertion fails
*/
#define zassert_equal_ptr(a, b, msg, ...) \
zassert((void *)(a) == (void *)(b), #a " not equal to " #b, \
msg, ##__VA_ARGS__)
zassert((void *)(a) == (void *)(b), #a " not equal to " #b, msg, ##__VA_ARGS__)
/**
* @brief Assert that @a a is within @a b with delta @a d
@ -206,8 +190,7 @@ static inline bool z_zassert(bool cond,
* @param msg Optional message to print if the assertion fails
*/
#define zassert_within(a, b, d, msg, ...) \
zassert(((a) >= ((b) - (d))) && ((a) <= ((b) + (d))), \
#a " not within " #b " +/- " #d, \
zassert(((a) >= ((b) - (d))) && ((a) <= ((b) + (d))), #a " not within " #b " +/- " #d, \
msg, ##__VA_ARGS__)
/**
@ -220,9 +203,8 @@ static inline bool z_zassert(bool cond,
* @param msg Optional message to print if the assertion fails
*/
#define zassert_between_inclusive(a, l, u, msg, ...) \
zassert(((a) >= (l)) && ((a) <= (u)), \
#a " not between " #l " and " #u " inclusive", \
msg, ##__VA_ARGS__)
zassert(((a) >= (l)) && ((a) <= (u)), #a " not between " #l " and " #u " inclusive", msg, \
##__VA_ARGS__)
/**
* @brief Assert that 2 memory buffers have the same contents
@ -235,8 +217,7 @@ static inline bool z_zassert(bool cond,
* @param ... Arguments, see @ref zassert_mem_equal__
* for real arguments accepted.
*/
#define zassert_mem_equal(...) \
zassert_mem_equal__(__VA_ARGS__)
#define zassert_mem_equal(...) zassert_mem_equal__(__VA_ARGS__)
/**
* @brief Internal assert that 2 memory buffers have the same contents
@ -250,8 +231,7 @@ static inline bool z_zassert(bool cond,
* @param msg Optional message to print if the assertion fails
*/
#define zassert_mem_equal__(buf, exp, size, msg, ...) \
zassert(memcmp(buf, exp, size) == 0, #buf " not equal to " #exp, \
msg, ##__VA_ARGS__)
zassert(memcmp(buf, exp, size) == 0, #buf " not equal to " #exp, msg, ##__VA_ARGS__)
/**
* @}