devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests/xmppaddr: improve error reports

Browse Source 
COMPARE() assumes that the first argument is the reference. Swap
arguments to report right expected value.
This commit is contained in:
Dmitry Podgorny
2021-03-23 02:14:25 +02:00
parent e77cd53215
commit d1ce4b35ae
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/test.h
View File

@@ -33,17 +33,17 @@
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
#endif #endif
#define COMPARE(v1, v2) \ #define COMPARE(v1, v2) \
do { \ do { \
const char *__v1 = v1; \ const char *__v1 = v1; \
const char *__v2 = v2; \ const char *__v2 = v2; \
if (strcmp(__v1, __v2) != 0) { \ if (strcmp(__v1, __v2) != 0) { \
printf("%s differs!\n" \ printf("Error: %s\n" \
"expected: %s\n" \ "Expected: %s\n" \
"got: %s\n", \ "Got: %s\n", \
#v1, __v1, __v2); \ #v1 " != " #v2, __v1, __v2); \
exit(1); \ exit(1); \
} \ } \
} while (0) } while (0)
#define COMPARE_BUF(v1, len1, v2, len2) \ #define COMPARE_BUF(v1, len1, v2, len2) \
@@ -53,9 +53,9 @@
size_t __len1 = len1; \ size_t __len1 = len1; \
size_t __len2 = len2; \ size_t __len2 = len2; \
if (__len1 != __len2 || memcmp(__v1, __v2, __len1) != 0) { \ if (__len1 != __len2 || memcmp(__v1, __v2, __len1) != 0) { \
printf("%s differs!\n", #v1); \ printf("Error: %s\n", #v1 " != " #v2); \
printf("expected: 0x%s\n", test_bin_to_hex(__v1, __len1)); \ printf("Expected: 0x%s\n", test_bin_to_hex(__v1, __len1)); \
printf("got: 0x%s\n", test_bin_to_hex(__v2, __len2)); \ printf("Got: 0x%s\n", test_bin_to_hex(__v2, __len2)); \
exit(1); \ exit(1); \
} \ } \
} while (0) } while (0)

9
tests/test_xmppaddr.c
View File

@@ -36,17 +36,18 @@ int main()
xmppaddr_num[0] = xmppaddr_num[0] + xmpp_conn_cert_xmppaddr_num(conn); xmppaddr_num[0] = xmppaddr_num[0] + xmpp_conn_cert_xmppaddr_num(conn);
COMPARE(xmppaddr_num, "2"); COMPARE("2", xmppaddr_num);
for (n = 0; n < 3; ++n) { for (n = 0; n < 3; ++n) {
char *r = xmpp_conn_cert_xmppaddr(conn, n); char *r = xmpp_conn_cert_xmppaddr(conn, n);
switch (n) { switch (n) {
case 0: case 0:
COMPARE(r, "very.long.username@so.the.asn1.length.is.a.valid.ascii." COMPARE("very.long.username@so.the.asn1.length.is.a.valid.ascii."
"character"); "character",
r);
break; break;
case 1: case 1:
COMPARE(r, "second@xmpp.jid"); COMPARE("second@xmpp.jid", r);
break; break;
default: default:
if (r != NULL) { if (r != NULL) {