espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-12-16 03:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rearrange details to always print if given, no matter if another msg added or not.

Browse Source 
Print output on failures no matter if verbose or not.
Enforce that HEX comparisons are unsigned comparisons.
This commit is contained in:
Mark VanderVoord
2022-04-19 16:21:04 -04:00
parent b9e9268d92
commit 0df1d442cb
5 changed files with 94 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/unity.c
View File

@@ -571,26 +571,26 @@ void UnityConcludeTest(void)
/*-----------------------------------------------*/
static void UnityAddMsgIfSpecified(const char* msg)
{
if (msg)
{
UnityPrint(UnityStrSpacer);
#ifdef UNITY_PRINT_TEST_CONTEXT
UNITY_PRINT_TEST_CONTEXT();
UnityPrint(UnityStrSpacer);
UNITY_PRINT_TEST_CONTEXT();
#endif
#ifndef UNITY_EXCLUDE_DETAILS
if (Unity.CurrentDetail1)
if (Unity.CurrentDetail1)
{
UnityPrint(UnityStrSpacer);
UnityPrint(UnityStrDetail1Name);
UnityPrint(Unity.CurrentDetail1);
if (Unity.CurrentDetail2)
{
UnityPrint(UnityStrDetail1Name);
UnityPrint(Unity.CurrentDetail1);
if (Unity.CurrentDetail2)
{
UnityPrint(UnityStrDetail2Name);
UnityPrint(Unity.CurrentDetail2);
}
UnityPrint(UnityStrSpacer);
UnityPrint(UnityStrDetail2Name);
UnityPrint(Unity.CurrentDetail2);
}
#endif
}
#endif
if (msg)
{
UnityPrint(UnityStrSpacer);
UnityPrint(msg);
}
}
@@ -819,12 +819,22 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
case 1:
expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT8*)expected;
actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT8*)actual;
if (style & (UNITY_DISPLAY_RANGE_UINT | UNITY_DISPLAY_RANGE_HEX))
{
expect_val &= 0x000000FF;
actual_val &= 0x000000FF;
}
increment = sizeof(UNITY_INT8);
break;
case 2:
expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT16*)expected;
actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT16*)actual;
if (style & (UNITY_DISPLAY_RANGE_UINT | UNITY_DISPLAY_RANGE_HEX))
{
expect_val &= 0x0000FFFF;
actual_val &= 0x0000FFFF;
}
increment = sizeof(UNITY_INT16);
break;
@@ -839,7 +849,14 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
default: /* default is length 4 bytes */
case 4:
expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT32*)expected;
actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT32*)actual;
actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT32*)actual;
#ifdef UNITY_SUPPORT_64
if (style & (UNITY_DISPLAY_RANGE_UINT | UNITY_DISPLAY_RANGE_HEX))
{
expect_val &= 0x00000000FFFFFFFF;
actual_val &= 0x00000000FFFFFFFF;
}
#endif
increment = sizeof(UNITY_INT32);
length = 4;
break;