Skip to content

Expand Array Assert Macros #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ergo720 merged 6 commits into from
Aug 19, 2026
Merged

Expand Array Assert Macros #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd05230
assertion: Missing semicolon in xc source file
RadWolfie Aug 15, 2026
23cdb54
assertion: break down macros to be more accessible
RadWolfie Aug 15, 2026
7e67d77
assertion: fix varname to var_name
RadWolfie Aug 15, 2026
c3518b3
assertion: add array member array macros support
RadWolfie Aug 15, 2026
d1d2988
assertion: add nested member macros support
RadWolfie Aug 15, 2026
9f57aea
xe: update section suite to use new macro
RadWolfie Aug 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
182 changes: 134 additions & 48 deletions src/assertions/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
} \
return test_passed

#define GEN_CHECK_EX(check_var, expected_var, varname, func_line) \
#define GEN_CHECK_EX(check_var, expected_var, var_name, func_line) \
if ((check_var) != (expected_var)) { \
print( \
((sizeof(check_var) > 4) ? \
" ERROR(line %d): Expected %s = 0x%llX, Got = 0x%llX" : \
" ERROR(line %d): Expected %s = 0x%X, Got = 0x%X" \
), \
func_line, varname, (expected_var), (check_var) \
func_line, var_name, (expected_var), (check_var) \
); \
TEST_FAILED(); \
} \
Expand All @@ -36,19 +36,19 @@
" OK(line %d): %s = 0x%llX" : \
" OK(line %d): %s = 0x%X" \
), \
func_line, varname, (check_var) \
func_line, var_name, (check_var) \
); \
}
#define GEN_CHECK(check_var, expected_var, varname) GEN_CHECK_EX(check_var, expected_var, varname, __LINE__)
#define GEN_CHECK(check_var, expected_var, var_name) GEN_CHECK_EX(check_var, expected_var, var_name, __LINE__)

#define GEN_CHECK_RANGE_EX(check_var, expected_var, length, varname, func_line) \
#define GEN_CHECK_RANGE_EX(check_var, expected_var, length, var_name, func_line) \
if ((check_var) < (expected_var) || (check_var) > (expected_var) + (length)) { \
print( \
((sizeof(check_var) > 4) ? \
" ERROR(line %d): Expected range %s = 0x%llX-0x%llX, Got = 0x%llX" : \
" ERROR(line %d): Expected range %s = 0x%X-0x%X, Got = 0x%X" \
), \
func_line, varname, (expected_var), (expected_var) + (length), (check_var) \
func_line, var_name, (expected_var), (expected_var) + (length), (check_var) \
); \
TEST_FAILED(); \
} \
Expand All @@ -58,55 +58,141 @@
" OK(line %d): range %s = 0x%llX" : \
" OK(line %d): range %s = 0x%X" \
), \
func_line, varname, (check_var) \
func_line, var_name, (check_var) \
); \
}
#define GEN_CHECK_RANGE(check_var, expected_var, length, varname) GEN_CHECK_RANGE_EX(check_var, expected_var, length, varname, __LINE__)
#define GEN_CHECK_RANGE(check_var, expected_var, length, var_name) GEN_CHECK_RANGE_EX(check_var, expected_var, length, var_name, __LINE__)

#define GEN_CHECK_ARRAY_EX(check_var, expected_var, size, varname, func_line) \
#define GEN_CHECK_ARRAY_DIRECT_EX(check_var, expected_var, var_name, index, func_line) \
if ((check_var) != (expected_var)) { \
print( \
((sizeof((check_var)) > 4) ? \
" ERROR(line %d): Expected array %s[%u] = 0x%llX, Got = 0x%llX" : \
" ERROR(line %d): Expected array %s[%u] = 0x%X, Got = 0x%X" \
), \
func_line, var_name, (unsigned)index, (expected_var), (check_var) \
); \
TEST_FAILED(); \
} \
else if (TEST_VERBOSE) { \
print( \
((sizeof((check_var)) > 4) ? \
" OK(line %d): array %s[%u] = 0x%llX" : \
" OK(line %d): array %s[%u] = 0x%X" \
), \
func_line, var_name, (unsigned)index, (check_var) \
); \
}
#define GEN_CHECK_ARRAY_DIRECT(check_var, expected_var, var_name, index) \
GEN_CHECK_ARRAY_DIRECT_EX(check_var, expected_var, var_name, index, __LINE__)

#define GEN_CHECK_ARRAY_INDEX_EX(check_var, expected_var, var_name, index, func_line) \
GEN_CHECK_ARRAY_DIRECT_EX((check_var)[index], (expected_var)[index], var_name, index, func_line)

#define GEN_CHECK_ARRAY_INDEX(check_var, expected_var, var_name, index) \
GEN_CHECK_ARRAY_INDEX_EX(check_var, expected_var, var_name, index, __LINE__)

#define GEN_CHECK_ARRAY_EX(check_var, expected_var, size, var_name, func_line) \
for (unsigned i = 0; i < (size); i++) { \
if ((check_var)[i] != (expected_var)[i]) { \
print( \
((sizeof((check_var)[i]) > 4) ? \
" ERROR(line %d): Expected array %s[%u] = 0x%llX, Got = 0x%llX" : \
" ERROR(line %d): Expected array %s[%u] = 0x%X, Got = 0x%X" \
), \
func_line, varname, i, (expected_var)[i], (check_var)[i] \
); \
TEST_FAILED(); \
} \
else if (TEST_VERBOSE) { \
print( \
((sizeof((check_var)[i]) > 4) ? \
" OK(line %d): array %s[%u] = 0x%llX" : \
" OK(line %d): array %s[%u] = 0x%X" \
), \
func_line, varname, i, (check_var)[i] \
); \
} \
GEN_CHECK_ARRAY_INDEX_EX(check_var, expected_var, var_name, i, func_line) \
}
#define GEN_CHECK_ARRAY(check_var, expected_var, size, var_name) GEN_CHECK_ARRAY_EX(check_var, expected_var, size, var_name, __LINE__)

#define GEN_CHECK_ARRAY_MEMBER_DIRECT_EX(check_var, expected_var, var_name, index, member_name, func_line) \
if ((check_var) != (expected_var)) { \
print( \
((sizeof((check_var)) > 4) ? \
" ERROR(line %d): Expected array member %s[%u].%s = 0x%llX, Got = 0x%llX" : \
" ERROR(line %d): Expected array member %s[%u].%s = 0x%X, Got = 0x%X" \
), \
func_line, var_name, (unsigned)index, member_name, (check_var) \
); \
TEST_FAILED(); \
} \
else if (TEST_VERBOSE) { \
print( \
((sizeof((check_var)) > 4) ? \
" OK(line %d): array member %s[%u].%s = 0x%llX" : \
" OK(line %d): array member %s[%u].%s = 0x%X" \
), \
func_line, var_name, (unsigned)index, member_name, (check_var) \
); \
}
#define GEN_CHECK_ARRAY(check_var, expected_var, size, varname) GEN_CHECK_ARRAY_EX(check_var, expected_var, size, varname, __LINE__)
#define GEN_CHECK_ARRAY_MEMBER_DIRECT(check_var, expected_var, var_name, index, member_name) \
GEN_CHECK_ARRAY_MEMBER_DIRECT_EX(check_var, expected_var, var_name, index, member_name, __LINE__)

#define GEN_CHECK_ARRAY_MEMBER_INDEX_EX(var, m_check, m_expected, var_name, index, func_line) \
GEN_CHECK_ARRAY_MEMBER_DIRECT_EX((var)[index].m_check, (var)[index].m_expected, var_name, index, #m_check, func_line)

#define GEN_CHECK_ARRAY_MEMBER_EX(var, m_check, m_expected, size, varname, func_line) \
#define GEN_CHECK_ARRAY_MEMBER_INDEX(var, m_check, m_expected, var_name, index) \
GEN_CHECK_ARRAY_MEMBER_INDEX_EX(var, m_check, m_expected, var_name, index, __LINE__)

#define GEN_CHECK_ARRAY_MEMBER_EX(var, m_check, m_expected, size, var_name, func_line) \
for (unsigned i = 0; i < (size); i++) { \
if ((var)[i].m_check != (var)[i].m_expected) { \
print( \
((sizeof((var)[i].m_check) > 4) ? \
" ERROR(line %d): Expected array member %s[%u].%s = 0x%llX, Got %s[%u].%s = 0x%llX" : \
" ERROR(line %d): Expected array member %s[%u].%s = 0x%X, Got %s[%u].%s = 0x%X" \
), \
func_line, varname, i, #m_expected, (var)[i].m_expected, varname, i, #m_check, (var)[i].m_check \
); \
TEST_FAILED(); \
GEN_CHECK_ARRAY_MEMBER_INDEX_EX(var, m_check, m_expected, var_name, i, func_line); \
}
#define GEN_CHECK_ARRAY_MEMBER(var, m_check, m_expected, size, var_name) GEN_CHECK_ARRAY_MEMBER_EX(var, m_check, m_expected, size, var_name, __LINE__)

#define GEN_CHECK_ARRAY_MEMBER_ARRAY_DIRECT_EX(check_var, expected_var, var_name, index_1, member_name, index_2, func_line) \
if ((check_var) != (expected_var)) { \
print( \
((sizeof((check_var)) > 4) ? \
" ERROR(line %d): Expected member array %s[%u].%s[0x%08X] = 0x%llX, Got = 0x%llX" : \
" ERROR(line %d): Expected member array %s[%u].%s[0x%08X] = 0x%X, Got = 0x%X" \
), \
func_line, var_name, (unsigned)index_1, member_name, (unsigned)index_2, (expected_var), (check_var) \
); \
TEST_FAILED(); \
} \
else if (TEST_VERBOSE) { \
print( \
((sizeof((check_var)) > 4) ? \
" OK(line %d): member array %s[%u].%s[0x%08X] = 0x%llX" : \
" OK(line %d): member array %s[%u].%s[0x%08X] = 0x%X" \
), \
func_line, var_name, (unsigned)index_1, member_name, (unsigned)index_2, (check_var) \
); \
}
#define GEN_CHECK_ARRAY_MEMBER_ARRAY_DIRECT(check_var, expected_var, var_name, index_1, member_name, index_2) \
GEN_CHECK_ARRAY_MEMBER_ARRAY_DIRECT_EX(check_var, expected_var, var_name, index_1, member_name, index_2, __LINE__)

#define GEN_CHECK_ARRAY_MEMBER_ARRAY_EX(var, m_check, m_expected, size_1, size_2, var_name, func_line) \
for (unsigned i = 0; i < (size_1); i++) { \
for (unsigned ii = 0; ii < (size_2); ii++) { \
GEN_CHECK_ARRAY_MEMBER_ARRAY_DIRECT_EX((var)[i].m_check[ii], (var)[i].m_expected[ii], var_name, i, #m_check, ii, func_line); \
} \
else if (TEST_VERBOSE) { \
print( \
((sizeof((var)[i].m_check) > 4) ? \
" OK(line %d): array member %s[%u].%s = 0x%llX" : \
" OK(line %d): array member %s[%u].%s = 0x%X" \
), \
func_line, varname, i, #m_expected, (var)[i].m_check \
); \
}
#define GEN_CHECK_ARRAY_MEMBER_ARRAY(var, m_check, m_expected, size_1, size_2, var_name) \
GEN_CHECK_ARRAY_MEMBER_ARRAY_EX(var, m_check, m_expected, size_1, size_2, var_name, __LINE__)

#define GEN_CHECK_NESTED_MEMBER_DIRECT_EX(check_var, expected_var, var_name, index_1, index_2, member_name, func_line) \
if ((check_var) != (expected_var)) { \
print( \
((sizeof((check_var)) > 4) ? \
" ERROR(line %d): Expected nested member %s[%u][0x%08X].%s = 0x%llX, Got = 0x%llX" : \
" ERROR(line %d): Expected nested member %s[%u][0x%08X].%s = 0x%X, Got = 0x%X" \
), \
func_line, var_name, (unsigned)index_1, (unsigned)index_2, member_name, (expected_var), (check_var) \
); \
TEST_FAILED(); \
} \
else if (TEST_VERBOSE) { \
print( \
((sizeof((check_var)) > 4) ? \
" OK(line %d): nested member %s[%u][0x%08X].%s = 0x%llX" : \
" OK(line %d): nested member %s[%u][0x%08X].%s = 0x%X" \
), \
func_line, var_name, (unsigned)index_1, (unsigned)index_2, member_name, (check_var) \
); \
}
#define GEN_CHECK_NESTED_MEMBER_DIRECT(check_var, expected_var, var_name, index_1, index_2, member_name) \
GEN_CHECK_NESTED_MEMBER_DIRECT_EX(check_var, expected_var, var_name, index_1, index_2, member_name, __LINE__)

#define GEN_CHECK_NESTED_MEMBER_EX(var, m_check, m_expected, size_1, size_2, var_name, func_line) \
for (unsigned i = 0; i < (size_1); i++) { \
for (unsigned ii = 0; ii < (size_2); ii++) { \
GEN_CHECK_NESTED_MEMBER_DIRECT_EX((var)[i][ii].m_check, (var)[i][ii].m_expected, var_name, i, ii, #m_check, func_line); \
} \
}
#define GEN_CHECK_ARRAY_MEMBER(var, m_check, m_expected, size, varname) GEN_CHECK_ARRAY_MEMBER_EX(var, m_check, m_expected, size, varname, __LINE__)
#define GEN_CHECK_NESTED_MEMBER(var, m_check, m_expected, size_1, size_2, var_name) \
GEN_CHECK_NESTED_MEMBER_EX(var, m_check, m_expected, size_1, size_2, var_name, __LINE__)
2 changes: 1 addition & 1 deletion src/assertions/xc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ BOOL assert_hashed_result_ex(
XcSHAUpdate(sha1_ctx, input, len);
XcSHAFinal(sha1_ctx, digest);

GEN_CHECK_ARRAY_EX(digest, expected_result, 20, test_name, line_number)
GEN_CHECK_ARRAY_EX(digest, expected_result, 20, test_name, line_number);

ASSERT_FOOTER(test_name);
}
Loading