Skip to content

L
linux
Commit 40f39777 authored by Daniel Latypov's avatar Daniel Latypov Committed by Shuah Khan
Browse files
Options

kunit: decrease macro layering for integer asserts 

Introduce a KUNIT_BINARY_INT_ASSERTION for the likes of KUNIT_EXPECT_LT.
This is analagous to KUNIT_BINARY_STR_ASSERTION.

Note: this patch leaves the EQ/NE macros untouched since those share
some intermediate macros for the pointer-based macros.

The current macro chain looks like:
KUNIT_EXPECT_LT_MSG => KUNIT_BASE_LT_MSG_ASSERTION => KUNIT_BASE_BINARY_ASSERTION
KUNIT_EXPECT_GT_MSG => KUNIT_BASE_GT_MSG_ASSERTION => KUNIT_BASE_BINARY_ASSERTION
<ditto for LE, GE, and ASSERT variants>

After this change:
KUNIT_EXPECT_LT_MSG => KUNIT_BINARY_INT_ASSERTION => KUNIT_BASE_BINARY_ASSERTION
KUNIT_EXPECT_GT_MSG => KUNIT_BINARY_INT_ASSERTION => KUNIT_BASE_BINARY_ASSERTION

I.e. we've traded all the unique intermediary macros for a single shared
KUNIT_BINARY_INT_ASSERTION. The only difference is that users of
KUNIT_BINARY_INT_ASSERTION also need to pass the operation (==, <, etc.).
Signed-off-by: default avatarDaniel Latypov <dlatypov@google.com>
Reviewed-by: default avatarDavid Gow <davidgow@google.com>
Reviewed-by: default avatarBrendan Higgins <brendanhiggins@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 955df7d8
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 148 deletions
include/kunit/test.h
View file @ 40f39777
...@@ -920,77 +920,28 @@ do { \ ...@@ -920,77 +920,28 @@ do { \
fmt, \ fmt, \
##__VA_ARGS__) ##__VA_ARGS__)
#define KUNIT_BASE_LT_MSG_ASSERTION(test, \ #define KUNIT_BINARY_EQ_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\
assert_class, \ KUNIT_BASE_EQ_MSG_ASSERTION(test, \
ASSERT_CLASS_INIT, \ kunit_binary_assert, \
assert_type, \ KUNIT_INIT_BINARY_ASSERT_STRUCT, \
left, \
right, \
fmt, \
...) \
KUNIT_BASE_BINARY_ASSERTION(test, \
assert_class, \
ASSERT_CLASS_INIT, \
assert_type, \
left, <, right, \
fmt, \
##__VA_ARGS__)
#define KUNIT_BASE_LE_MSG_ASSERTION(test, \
assert_class, \
ASSERT_CLASS_INIT, \
assert_type, \
left, \
right, \
fmt, \
...) \
KUNIT_BASE_BINARY_ASSERTION(test, \
assert_class, \
ASSERT_CLASS_INIT, \
assert_type, \
left, <=, right, \
fmt, \
##__VA_ARGS__)
#define KUNIT_BASE_GT_MSG_ASSERTION(test, \
assert_class, \
ASSERT_CLASS_INIT, \
assert_type, \ assert_type, \
left, \ left, \
right, \ right, \
fmt, \ fmt, \
...) \
KUNIT_BASE_BINARY_ASSERTION(test, \
assert_class, \
ASSERT_CLASS_INIT, \
assert_type, \
left, >, right, \
fmt, \
##__VA_ARGS__) ##__VA_ARGS__)
#define KUNIT_BASE_GE_MSG_ASSERTION(test, \ #define KUNIT_BINARY_INT_ASSERTION(test, \
assert_class, \ assert_type, \
ASSERT_CLASS_INIT, \ left, \
assert_type, \ op, \
left, \ right, \
right, \ fmt, \
fmt, \
...) \ ...) \
KUNIT_BASE_BINARY_ASSERTION(test, \ KUNIT_BASE_BINARY_ASSERTION(test, \
assert_class, \
ASSERT_CLASS_INIT, \
assert_type, \
left, >=, right, \
fmt, \
##__VA_ARGS__)
#define KUNIT_BINARY_EQ_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\
KUNIT_BASE_EQ_MSG_ASSERTION(test, \
kunit_binary_assert, \ kunit_binary_assert, \
KUNIT_INIT_BINARY_ASSERT_STRUCT, \ KUNIT_INIT_BINARY_ASSERT_STRUCT, \
assert_type, \ assert_type, \
left, \ left, op, right, \
right, \
fmt, \ fmt, \
##__VA_ARGS__) ##__VA_ARGS__)
...@@ -1034,46 +985,6 @@ do { \ ...@@ -1034,46 +985,6 @@ do { \
fmt, \ fmt, \
##__VA_ARGS__) ##__VA_ARGS__)
#define KUNIT_BINARY_LT_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\
KUNIT_BASE_LT_MSG_ASSERTION(test, \
kunit_binary_assert, \
KUNIT_INIT_BINARY_ASSERT_STRUCT, \
assert_type, \
left, \
right, \
fmt, \
##__VA_ARGS__)
#define KUNIT_BINARY_LE_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\
KUNIT_BASE_LE_MSG_ASSERTION(test, \
kunit_binary_assert, \
KUNIT_INIT_BINARY_ASSERT_STRUCT, \
assert_type, \
left, \
right, \
fmt, \
##__VA_ARGS__)
#define KUNIT_BINARY_GT_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\
KUNIT_BASE_GT_MSG_ASSERTION(test, \
kunit_binary_assert, \
KUNIT_INIT_BINARY_ASSERT_STRUCT, \
assert_type, \
left, \
right, \
fmt, \
##__VA_ARGS__)
#define KUNIT_BINARY_GE_MSG_ASSERTION(test, assert_type, left, right, fmt, ...)\
KUNIT_BASE_GE_MSG_ASSERTION(test, \
kunit_binary_assert, \
KUNIT_INIT_BINARY_ASSERT_STRUCT, \
assert_type, \
left, \
right, \
fmt, \
##__VA_ARGS__)
#define KUNIT_BINARY_STR_ASSERTION(test, \ #define KUNIT_BINARY_STR_ASSERTION(test, \
assert_type, \ assert_type, \
left, \ left, \
...@@ -1259,12 +1170,11 @@ do { \ ...@@ -1259,12 +1170,11 @@ do { \
KUNIT_EXPECT_LT_MSG(test, left, right, NULL) KUNIT_EXPECT_LT_MSG(test, left, right, NULL)
#define KUNIT_EXPECT_LT_MSG(test, left, right, fmt, ...) \ #define KUNIT_EXPECT_LT_MSG(test, left, right, fmt, ...) \
KUNIT_BINARY_LT_MSG_ASSERTION(test, \ KUNIT_BINARY_INT_ASSERTION(test, \
KUNIT_EXPECTATION, \ KUNIT_EXPECTATION, \
left, \ left, <, right, \
right, \ fmt, \
fmt, \ ##__VA_ARGS__)
##__VA_ARGS__)
/** /**
* KUNIT_EXPECT_LE() - Expects that @left is less than or equal to @right. * KUNIT_EXPECT_LE() - Expects that @left is less than or equal to @right.
...@@ -1281,12 +1191,11 @@ do { \ ...@@ -1281,12 +1191,11 @@ do { \
KUNIT_EXPECT_LE_MSG(test, left, right, NULL) KUNIT_EXPECT_LE_MSG(test, left, right, NULL)
#define KUNIT_EXPECT_LE_MSG(test, left, right, fmt, ...) \ #define KUNIT_EXPECT_LE_MSG(test, left, right, fmt, ...) \
KUNIT_BINARY_LE_MSG_ASSERTION(test, \ KUNIT_BINARY_INT_ASSERTION(test, \
KUNIT_EXPECTATION, \ KUNIT_ASSERTION, \
left, \ left, <=, right, \
right, \ fmt, \
fmt, \ ##__VA_ARGS__)
##__VA_ARGS__)
/** /**
* KUNIT_EXPECT_GT() - An expectation that @left is greater than @right. * KUNIT_EXPECT_GT() - An expectation that @left is greater than @right.
...@@ -1303,12 +1212,11 @@ do { \ ...@@ -1303,12 +1212,11 @@ do { \
KUNIT_EXPECT_GT_MSG(test, left, right, NULL) KUNIT_EXPECT_GT_MSG(test, left, right, NULL)
#define KUNIT_EXPECT_GT_MSG(test, left, right, fmt, ...) \ #define KUNIT_EXPECT_GT_MSG(test, left, right, fmt, ...) \
KUNIT_BINARY_GT_MSG_ASSERTION(test, \ KUNIT_BINARY_INT_ASSERTION(test, \
KUNIT_EXPECTATION, \ KUNIT_EXPECTATION, \
left, \ left, >, right, \
right, \ fmt, \
fmt, \ ##__VA_ARGS__)
##__VA_ARGS__)
/** /**
* KUNIT_EXPECT_GE() - Expects that @left is greater than or equal to @right. * KUNIT_EXPECT_GE() - Expects that @left is greater than or equal to @right.
...@@ -1325,12 +1233,11 @@ do { \ ...@@ -1325,12 +1233,11 @@ do { \
KUNIT_EXPECT_GE_MSG(test, left, right, NULL) KUNIT_EXPECT_GE_MSG(test, left, right, NULL)
#define KUNIT_EXPECT_GE_MSG(test, left, right, fmt, ...) \ #define KUNIT_EXPECT_GE_MSG(test, left, right, fmt, ...) \
KUNIT_BINARY_GE_MSG_ASSERTION(test, \ KUNIT_BINARY_INT_ASSERTION(test, \
KUNIT_EXPECTATION, \ KUNIT_EXPECTATION, \
left, \ left, >=, right, \
right, \ fmt, \
fmt, \ ##__VA_ARGS__)
##__VA_ARGS__)
/** /**
* KUNIT_EXPECT_STREQ() - Expects that strings @left and @right are equal. * KUNIT_EXPECT_STREQ() - Expects that strings @left and @right are equal.
...@@ -1536,12 +1443,11 @@ do { \ ...@@ -1536,12 +1443,11 @@ do { \
KUNIT_ASSERT_LT_MSG(test, left, right, NULL) KUNIT_ASSERT_LT_MSG(test, left, right, NULL)
#define KUNIT_ASSERT_LT_MSG(test, left, right, fmt, ...) \ #define KUNIT_ASSERT_LT_MSG(test, left, right, fmt, ...) \
KUNIT_BINARY_LT_MSG_ASSERTION(test, \ KUNIT_BINARY_INT_ASSERTION(test, \
KUNIT_ASSERTION, \ KUNIT_EXPECTATION, \
left, \ left, <, right, \
right, \ fmt, \
fmt, \ ##__VA_ARGS__)
##__VA_ARGS__)
/** /**
* KUNIT_ASSERT_LE() - An assertion that @left is less than or equal to @right. * KUNIT_ASSERT_LE() - An assertion that @left is less than or equal to @right.
* @test: The test context object. * @test: The test context object.
...@@ -1557,12 +1463,11 @@ do { \ ...@@ -1557,12 +1463,11 @@ do { \
KUNIT_ASSERT_LE_MSG(test, left, right, NULL) KUNIT_ASSERT_LE_MSG(test, left, right, NULL)
#define KUNIT_ASSERT_LE_MSG(test, left, right, fmt, ...) \ #define KUNIT_ASSERT_LE_MSG(test, left, right, fmt, ...) \
KUNIT_BINARY_LE_MSG_ASSERTION(test, \ KUNIT_BINARY_INT_ASSERTION(test, \
KUNIT_ASSERTION, \ KUNIT_ASSERTION, \
left, \ left, <=, right, \
right, \ fmt, \
fmt, \ ##__VA_ARGS__)
##__VA_ARGS__)
/** /**
* KUNIT_ASSERT_GT() - An assertion that @left is greater than @right. * KUNIT_ASSERT_GT() - An assertion that @left is greater than @right.
...@@ -1579,12 +1484,11 @@ do { \ ...@@ -1579,12 +1484,11 @@ do { \
KUNIT_ASSERT_GT_MSG(test, left, right, NULL) KUNIT_ASSERT_GT_MSG(test, left, right, NULL)
#define KUNIT_ASSERT_GT_MSG(test, left, right, fmt, ...) \ #define KUNIT_ASSERT_GT_MSG(test, left, right, fmt, ...) \
KUNIT_BINARY_GT_MSG_ASSERTION(test, \ KUNIT_BINARY_INT_ASSERTION(test, \
KUNIT_ASSERTION, \ KUNIT_EXPECTATION, \
left, \ left, >, right, \
right, \ fmt, \
fmt, \ ##__VA_ARGS__)
##__VA_ARGS__)
/** /**
* KUNIT_ASSERT_GE() - Assertion that @left is greater than or equal to @right. * KUNIT_ASSERT_GE() - Assertion that @left is greater than or equal to @right.
...@@ -1601,12 +1505,11 @@ do { \ ...@@ -1601,12 +1505,11 @@ do { \
KUNIT_ASSERT_GE_MSG(test, left, right, NULL) KUNIT_ASSERT_GE_MSG(test, left, right, NULL)
#define KUNIT_ASSERT_GE_MSG(test, left, right, fmt, ...) \ #define KUNIT_ASSERT_GE_MSG(test, left, right, fmt, ...) \
KUNIT_BINARY_GE_MSG_ASSERTION(test, \ KUNIT_BINARY_INT_ASSERTION(test, \
KUNIT_ASSERTION, \ KUNIT_ASSERTION, \
left, \ left, >=, right, \
right, \ fmt, \
fmt, \ ##__VA_ARGS__)
##__VA_ARGS__)
/** /**
* KUNIT_ASSERT_STREQ() - An assertion that strings @left and @right are equal. * KUNIT_ASSERT_STREQ() - An assertion that strings @left and @right are equal.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7