bruno/cutest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bruno:719ff16481d47ce278e9a0af9ec371c10f679b97
Branches Tags
bruno:master
..
compare: bruno:master
Branches Tags
bruno:master

2 Commits
719ff16481 ... master

Author SHA1 Message Date
Bruno Raoult
4497561ccf change MemEquals pointers to "const void *ptr" 2024-01-12 17:07:16 +01:00
Bruno Raoult
1da9d3e65e change MemEq output 2024-01-12 14:27:04 +01:00
2 changed files with 12 additions and 12 deletions
Expand all files Collapse all files

20
CuTest.c
View File

@@ -224,20 +224,21 @@ void CuAssertStrEquals_LineMsg(CuTest* tc, const char* file, int line, const cha
} }
void CuAssertMemEquals_LineMsg(CuTest* tc, const char* file, int line, const char* message, void CuAssertMemEquals_LineMsg(CuTest* tc, const char* file, int line, const char* message,
const char* expected, const char* actual, const int len) const void *expected, const void *actual, const int len)
{ {
size_t diffc = 0; size_t diffc = 0;
const uchar *exp = expected, *act = actual;
/* below, len*2*2 is to display twice len hex strings, 128 is for extra chars. /* below, len*2*2 is to display twice len hex strings, 128 is for extra chars.
* This is rather conservative. * This is rather conservative.
*/ */
char buf[128 + len * 2 * 2]; char buf[128 + len * 2 * 2];
if (! (expected || actual)) /* both NULL */ if (! (exp || act)) /* both NULL */
return; return;
if (! (expected && actual)) { /* one is null */ if (! (exp && act)) { /* one is null */
sprintf(buf, "%s pointer is null", expected ? "actual": "expected"); sprintf(buf, "<%s> pointer is null", exp ? "actual": "expected");
} else { } else {
if (!(diffc = CuMemCmp(expected, actual, len))) if (!(diffc = CuMemCmp(exp, act, len)))
return; return;
} }
if (diffc--) { /* compare was done and wrong */ if (diffc--) { /* compare was done and wrong */
@@ -245,15 +246,14 @@ void CuAssertMemEquals_LineMsg(CuTest* tc, const char* file, int line, const cha
char common[len * 2 + 1]; char common[len * 2 + 1];
/* we will build the "common" mem string /* we will build the "common" mem string
*/ */
printf("len=%d diffc = %lu\n", len, diffc);
for (i = 0; i < diffc; ++i) for (i = 0; i < diffc; ++i)
sprintf(common + i * 2, "%02X", *(expected + i)); sprintf(common + i * 2, "%02X", *(exp + i));
/* and final message /* and final message
*/ */
sprintf(buf, sprintf(buf,
"expected <0x%s-%02X...> but was <0x%s-%02X...> (differ char %lu)\n", "expected <0x%s[%02X]...> but was <0x%s[%02X]...> (differ at char %lu)\n",
common, *(expected + i), common, *(exp + i),
common, *(actual + i), common, *(act + i),
diffc); diffc);
} }
CuFail_Line(tc, file, line, message, buf); CuFail_Line(tc, file, line, message, buf);

4
CuTest.h
View File

@@ -73,9 +73,9 @@ void CuAssertStrEquals_LineMsg(CuTest* tc,
const char* expected, const char* actual); const char* expected, const char* actual);
void CuAssertMemEquals_LineMsg(CuTest* tc, void CuAssertMemEquals_LineMsg(CuTest* tc,
const char *file, int line, const char *message, const char *file, int line, const char *message,
const char *expected, const char *actual, const int len); const void *expected, const void *actual, const int len);
void CuAssertMem_LineMsg(CuTest* tc, const char* file, int line, const char* message, void CuAssertMem_LineMsg(CuTest* tc, const char* file, int line, const char* message,
const char* expected, const char* actual, const int len); const void *expected, const void *actual, const int len);
void CuAssertIntEquals_LineMsg(CuTest* tc, void CuAssertIntEquals_LineMsg(CuTest* tc,
const char* file, int line, const char* message, const char* file, int line, const char* message,
int expected, int actual); int expected, int actual);