3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-23 08:25:58 +01:00
Code Issues Releases Wiki Activity

Wrap UNITY_TEST_ASSERT in a do ... while(0) block

Browse Source 
This ensures that constructions like the following work correctly:

  if(condition)
    TEST_ASSERT(a);
  else
    TEST_ASSERT(b);
This commit is contained in:
John Lindgren
2020-04-09 13:03:16 -04:00
parent 10fd84f02b
commit 2485d49d13
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/unity_internals.h
View File

@@ -763,7 +763,7 @@ int UnityTestMatches(void);
* Test Asserts * Test Asserts
*-------------------------------------------------------*/ *-------------------------------------------------------*/
#define UNITY_TEST_ASSERT(condition, line, message) if (condition) {} else {UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), (message));} #define UNITY_TEST_ASSERT(condition, line, message) do {if (condition) {} else {UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), (message));}} while(0)
#define UNITY_TEST_ASSERT_NULL(pointer, line, message) UNITY_TEST_ASSERT(((pointer) == NULL), (UNITY_LINE_TYPE)(line), (message)) #define UNITY_TEST_ASSERT_NULL(pointer, line, message) UNITY_TEST_ASSERT(((pointer) == NULL), (UNITY_LINE_TYPE)(line), (message))
#define UNITY_TEST_ASSERT_NOT_NULL(pointer, line, message) UNITY_TEST_ASSERT(((pointer) != NULL), (UNITY_LINE_TYPE)(line), (message)) #define UNITY_TEST_ASSERT_NOT_NULL(pointer, line, message) UNITY_TEST_ASSERT(((pointer) != NULL), (UNITY_LINE_TYPE)(line), (message))
#define UNITY_TEST_ASSERT_EMPTY(pointer, line, message) UNITY_TEST_ASSERT(((pointer[0]) == 0), (UNITY_LINE_TYPE)(line), (message)) #define UNITY_TEST_ASSERT_EMPTY(pointer, line, message) UNITY_TEST_ASSERT(((pointer[0]) == 0), (UNITY_LINE_TYPE)(line), (message))

13
test/tests/test_unity_core.c
View File

@@ -133,6 +133,19 @@ void testFalse(void)
TEST_ASSERT_UNLESS(0); TEST_ASSERT_UNLESS(0);
} }
void testSingleStatement(void)
{
for(int i = 0; i < 2; i++)
{
/* TEST_ASSERT_TRUE should expand to a single C statement, minus
* the semicolon. This if-else will fail to compile otherwise. */
if(i > 0)
TEST_ASSERT_TRUE(i);
else
TEST_ASSERT_FALSE(i);
}
}
void testPreviousPass(void) void testPreviousPass(void)
{ {
TEST_ASSERT_EQUAL_INT(0U, Unity.TestFailures); TEST_ASSERT_EQUAL_INT(0U, Unity.TestFailures);