Adding FW_CASSERT_1 macro for C #3896
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| return 0; | ||
| } | ||
|
|
||
| I8 CAssert1(FILE_NAME_ARG file, FwAssertArgType arg1, FwSizeType lineNo) { |
Check notice
Code scanning / CodeQL
Use of basic integral type Note
|
|
||
| I8 CAssert1(FILE_NAME_ARG file, FwAssertArgType arg1, FwSizeType lineNo) { | ||
| if (nullptr == Fw::s_assertHook) { | ||
| CHAR assertMsg[FW_ASSERT_TEXT_SIZE]; |
Check notice
Code scanning / CodeQL
Use of basic integral type Note
| I8 CAssert1(FILE_NAME_ARG file, FwAssertArgType arg1, FwSizeType lineNo) { | ||
| if (nullptr == Fw::s_assertHook) { | ||
| CHAR assertMsg[FW_ASSERT_TEXT_SIZE]; | ||
| Fw::defaultReportAssert(file, lineNo, 1, arg1, 0, 0, 0, 0, 0, assertMsg, static_cast<FwSizeType>(sizeof(assertMsg))); |
Check warning
Code scanning / CodeQL
Unchecked function argument Warning
| I8 CAssert1(FILE_NAME_ARG file, FwAssertArgType arg1, FwSizeType lineNo) { | ||
| if (nullptr == Fw::s_assertHook) { | ||
| CHAR assertMsg[FW_ASSERT_TEXT_SIZE]; | ||
| Fw::defaultReportAssert(file, lineNo, 1, arg1, 0, 0, 0, 0, 0, assertMsg, static_cast<FwSizeType>(sizeof(assertMsg))); |
Check warning
Code scanning / CodeQL
Unchecked function argument Warning
| I8 CAssert1(FILE_NAME_ARG file, FwAssertArgType arg1, FwSizeType lineNo) { | ||
| if (nullptr == Fw::s_assertHook) { | ||
| CHAR assertMsg[FW_ASSERT_TEXT_SIZE]; | ||
| Fw::defaultReportAssert(file, lineNo, 1, arg1, 0, 0, 0, 0, 0, assertMsg, static_cast<FwSizeType>(sizeof(assertMsg))); |
Check warning
Code scanning / CodeQL
Unchecked function argument Warning
| CHAR assertMsg[FW_ASSERT_TEXT_SIZE]; | ||
| Fw::defaultReportAssert(file, lineNo, 1, arg1, 0, 0, 0, 0, 0, assertMsg, static_cast<FwSizeType>(sizeof(assertMsg))); | ||
| } else { | ||
| Fw::s_assertHook->reportAssert(file, lineNo, 1, arg1, 0, 0, 0, 0, 0); |
Check warning
Code scanning / CodeQL
Unchecked function argument Warning
| CHAR assertMsg[FW_ASSERT_TEXT_SIZE]; | ||
| Fw::defaultReportAssert(file, lineNo, 1, arg1, 0, 0, 0, 0, 0, assertMsg, static_cast<FwSizeType>(sizeof(assertMsg))); | ||
| } else { | ||
| Fw::s_assertHook->reportAssert(file, lineNo, 1, arg1, 0, 0, 0, 0, 0); |
Check warning
Code scanning / CodeQL
Unchecked function argument Warning
| CHAR assertMsg[FW_ASSERT_TEXT_SIZE]; | ||
| Fw::defaultReportAssert(file, lineNo, 1, arg1, 0, 0, 0, 0, 0, assertMsg, static_cast<FwSizeType>(sizeof(assertMsg))); | ||
| } else { | ||
| Fw::s_assertHook->reportAssert(file, lineNo, 1, arg1, 0, 0, 0, 0, 0); |
Check warning
Code scanning / CodeQL
Unchecked function argument Warning
LeStarch
left a comment
LeStarch
left a comment
There was a problem hiding this comment.
One question on the test.
Fw/Types/test/ut/CAssertTest.cpp
Outdated
|
|
||
| // This should compile but not execute assertion in normal builds | ||
| // In debug builds with assertions enabled, this would trigger | ||
| FW_CASSERT_1(testValue != 0, testValue); |
There was a problem hiding this comment.
How does this not kill the UT?
There was a problem hiding this comment.
Ah yes, good catch! Removing this test and splitting it off into a separate, correct, test.
|
You may wish to break those tests into separate test cases. And you could put in an ASSERT_DEATH to prove that the assert will trip and kill the program. |
I've split up the AssertFailure case into another test. The proper way to do this is actually using a TestAssertHook. |
…k to properly test assertion failures.
2 participants
Change Description
Adding FW_CASSERT_1 macro to support a 1-arg assert in C
Rationale
There was no equivalent for the "heritage" (C) FSW_ASSERT_1() which will report an argument
Testing/Review Recommendations
Added UT for testing the assert
Future Work
None