kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add assert_hex & assert_hex_within

This commit is contained in:
hathach 2013-01-13 20:39:01 +07:00
parent b7b9531b9b
commit f991475183
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tests/test/test_assertion.c
View File

@ -106,3 +106,46 @@ void test_assert_int_within_greater(void)
ASSERT_INT_WITHIN (1, 5, 10, (void) 0);
TEST_FAIL();
}
//--------------------------------------------------------------------+
// HEX
//--------------------------------------------------------------------+
void test_assert_hex_equal(void)
{
ASSERT_HEX (0xffee, 0xffee, (void) 0);
ASSERT_HEX_EQUAL (0xffee, 0xffee, (void) 0);
uint32_t x = 0xf0f0;
uint32_t y = 0xf0f0;
ASSERT_HEX (x++, y++, (void) 0); // test side effect
TEST_ASSERT_EQUAL(0xf0f1, x);
TEST_ASSERT_EQUAL(0xf0f1, y);
ASSERT_HEX(0x1234, 0x4321, (void) 0);
TEST_FAIL();
}
void test_assert_hex_within_succeed(void)
{
ASSERT_HEX_WITHIN (0xff00, 0xffff, 0xff11, (void) 0);
ASSERT_HEX_WITHIN (0xff00, 0xffff, 0xff00, (void) 0);
ASSERT_HEX_WITHIN (0xff00, 0xffff, 0xffff, (void) 0);
}
void test_assert_hex_within_less(void)
{
ASSERT_HEX_WITHIN (0xff00, 0xffff, 0xeeee, (void) 0);
TEST_FAIL();
}
void test_assert_hex_within_greater(void)
{
ASSERT_HEX_WITHIN (0xff00, 0xffff, 0x1eeee, (void) 0);
TEST_FAIL();
}

19
tinyusb/common/assertion.h
View File

@ -105,8 +105,6 @@ extern "C"
//--------------------------------------------------------------------+
// Integer Assert
//--------------------------------------------------------------------+
#define TEST_INT_EQUAL
#define ASSERT_INT(...) ASSERT_INT_EQUAL(__VA_ARGS__)
#define ASSERT_INT_EQUAL(expected, actual, error) \
ASSERT_DEFINE(\
@ -122,6 +120,23 @@ extern "C"
error,\
"expected within %d-%d, actual %d", low, up, act)
//--------------------------------------------------------------------+
// Hex Assert
//--------------------------------------------------------------------+
#define ASSERT_HEX(...) ASSERT_HEX_EQUAL(__VA_ARGS__)
#define ASSERT_HEX_EQUAL(expected, actual, error) \
ASSERT_DEFINE(\
uint32_t exp = (expected); uint32_t act = (actual),\
exp==act,\
error,\
"expected 0x%x, actual 0x%x", exp, act)
#define ASSERT_HEX_WITHIN(lower, upper, actual, error) \
ASSERT_DEFINE(\
uint32_t low = (lower); uint32_t up = (upper); uint32_t act = (actual),\
(low <= act) && (act <= up),\
error,\
"expected within 0x%x-0x%x, actual 0x%x", low, up, act)
#ifdef __cplusplus
}