ThrowTheSwitch/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-09-23 18:47:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #713 from jonathangjertsen/string-first-char-diff

Browse Source 
Print index and value of first character that differs in string comparisons
This commit is contained in:
Mark VanderVoord
2026-07-03 11:22:01 -04:00
committed by GitHub
parent 82e10aa1ca 1ec1f45077
commit 3b481b79ae
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/unity.c
+29 -5
View File
@@ -44,6 +44,7 @@ static const char UNITY_PROGMEM UnityStrOrEqual[] = "or equal to
static const char UNITY_PROGMEM UnityStrNotEqual[] = " to be not equal to ";
static const char UNITY_PROGMEM UnityStrElement[] = " Element ";
static const char UNITY_PROGMEM UnityStrByte[] = " Byte ";
static const char UNITY_PROGMEM UnityStrCharacter[] = " Character ";
static const char UNITY_PROGMEM UnityStrMemory[] = " Memory Mismatch.";
static const char UNITY_PROGMEM UnityStrDelta[] = " Values Not Within Delta ";
static const char UNITY_PROGMEM UnityStrPointless[] = " You Asked Me To Compare Nothing, Which Was Pointless.";
@@ -649,7 +650,21 @@ static void UnityAddMsgIfSpecified(const char* msg)
}
/*-----------------------------------------------*/
static void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual)
static void UnityPrintFirstStringDifference(const char *expected, const char *actual, UNITY_UINT32 i_diff)
{
if ((expected != NULL) && (actual != NULL))
{
UnityPrint(UnityStrCharacter);
UnityPrintNumberUnsigned(i_diff);
UnityPrint(UnityStrExpected);
UnityPrintNumberByStyle(expected[i_diff], UNITY_DISPLAY_STYLE_CHAR);
UnityPrint(UnityStrWas);
UnityPrintNumberByStyle(actual[i_diff], UNITY_DISPLAY_STYLE_CHAR);
}
}
/*-----------------------------------------------*/
static void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual, UNITY_UINT32 i_diff)
{
UnityPrint(UnityStrExpected);
if (expected != NULL)
@@ -673,12 +688,14 @@ static void UnityPrintExpectedAndActualStrings(const char* expected, const char*
{
UnityPrint(UnityStrNull);
}
UnityPrintFirstStringDifference(expected, actual, i_diff);
}
/*-----------------------------------------------*/
static void UnityPrintExpectedAndActualStringsLen(const char* expected,
const char* actual,
const UNITY_UINT32 length)
UNITY_UINT32 length,
UNITY_UINT32 i_diff)
{
UnityPrint(UnityStrExpected);
if (expected != NULL)
@@ -702,6 +719,7 @@ static void UnityPrintExpectedAndActualStringsLen(const char* expected,
{
UnityPrint(UnityStrNull);
}
UnityPrintFirstStringDifference(expected, actual, i_diff);
}
/*-----------------------------------------------
@@ -1711,6 +1729,7 @@ void UnityAssertEqualString(const char* expected,
const UNITY_LINE_TYPE lineNumber)
{
UNITY_UINT32 i;
UNITY_UINT32 i_diff = 0;
RETURN_IF_FAIL_OR_IGNORE;
@@ -1722,6 +1741,7 @@ void UnityAssertEqualString(const char* expected,
if (expected[i] != actual[i])
{
Unity.CurrentTestFailed = 1;
i_diff = i;
break;
}
}
@@ -1737,7 +1757,7 @@ void UnityAssertEqualString(const char* expected,
if (Unity.CurrentTestFailed)
{
UnityTestResultsFailBegin(lineNumber);
UnityPrintExpectedAndActualStrings(expected, actual);
UnityPrintExpectedAndActualStrings(expected, actual, i_diff);
UnityAddMsgIfSpecified(msg);
UNITY_FAIL_AND_BAIL;
}
@@ -1751,6 +1771,7 @@ void UnityAssertEqualStringLen(const char* expected,
const UNITY_LINE_TYPE lineNumber)
{
UNITY_UINT32 i;
UNITY_UINT32 i_diff = 0;
RETURN_IF_FAIL_OR_IGNORE;
@@ -1762,6 +1783,7 @@ void UnityAssertEqualStringLen(const char* expected,
if (expected[i] != actual[i])
{
Unity.CurrentTestFailed = 1;
i_diff = i;
break;
}
}
@@ -1777,7 +1799,7 @@ void UnityAssertEqualStringLen(const char* expected,
if (Unity.CurrentTestFailed)
{
UnityTestResultsFailBegin(lineNumber);
UnityPrintExpectedAndActualStringsLen(expected, actual, length);
UnityPrintExpectedAndActualStringsLen(expected, actual, length, i_diff);
UnityAddMsgIfSpecified(msg);
UNITY_FAIL_AND_BAIL;
}
@@ -1792,6 +1814,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
const UNITY_FLAGS_T flags)
{
UNITY_UINT32 i = 0;
UNITY_UINT32 i_diff = 0;
UNITY_UINT32 j = 0;
const char* expd = NULL;
const char* act = NULL;
@@ -1839,6 +1862,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
if (expd[i] != act[i])
{
Unity.CurrentTestFailed = 1;
i_diff = i;
break;
}
}
@@ -1859,7 +1883,7 @@ void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
UnityPrint(UnityStrElement);
UnityPrintNumberUnsigned(j);
}
UnityPrintExpectedAndActualStrings(expd, act);
UnityPrintExpectedAndActualStrings(expd, act, i_diff);
UnityAddMsgIfSpecified(msg);
UNITY_FAIL_AND_BAIL;
}