From d1ce4b35ae09a3ccf5cd993e17d0b7366731b137 Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Tue, 23 Mar 2021 02:14:25 +0200 Subject: [PATCH] tests/xmppaddr: improve error reports COMPARE() assumes that the first argument is the reference. Swap arguments to report right expected value. --- tests/test.h | 28 ++++++++++++++-------------- tests/test_xmppaddr.c | 9 +++++---- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tests/test.h b/tests/test.h index c12408b..a0ad636 100644 --- a/tests/test.h +++ b/tests/test.h @@ -33,17 +33,17 @@ #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) #endif -#define COMPARE(v1, v2) \ - do { \ - const char *__v1 = v1; \ - const char *__v2 = v2; \ - if (strcmp(__v1, __v2) != 0) { \ - printf("%s differs!\n" \ - "expected: %s\n" \ - "got: %s\n", \ - #v1, __v1, __v2); \ - exit(1); \ - } \ +#define COMPARE(v1, v2) \ + do { \ + const char *__v1 = v1; \ + const char *__v2 = v2; \ + if (strcmp(__v1, __v2) != 0) { \ + printf("Error: %s\n" \ + "Expected: %s\n" \ + "Got: %s\n", \ + #v1 " != " #v2, __v1, __v2); \ + exit(1); \ + } \ } while (0) #define COMPARE_BUF(v1, len1, v2, len2) \ @@ -53,9 +53,9 @@ size_t __len1 = len1; \ size_t __len2 = len2; \ if (__len1 != __len2 || memcmp(__v1, __v2, __len1) != 0) { \ - printf("%s differs!\n", #v1); \ - printf("expected: 0x%s\n", test_bin_to_hex(__v1, __len1)); \ - printf("got: 0x%s\n", test_bin_to_hex(__v2, __len2)); \ + printf("Error: %s\n", #v1 " != " #v2); \ + printf("Expected: 0x%s\n", test_bin_to_hex(__v1, __len1)); \ + printf("Got: 0x%s\n", test_bin_to_hex(__v2, __len2)); \ exit(1); \ } \ } while (0) diff --git a/tests/test_xmppaddr.c b/tests/test_xmppaddr.c index 34c774c..39539f9 100644 --- a/tests/test_xmppaddr.c +++ b/tests/test_xmppaddr.c @@ -36,17 +36,18 @@ int main() 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) { char *r = xmpp_conn_cert_xmppaddr(conn, n); switch (n) { case 0: - COMPARE(r, "very.long.username@so.the.asn1.length.is.a.valid.ascii." - "character"); + COMPARE("very.long.username@so.the.asn1.length.is.a.valid.ascii." + "character", + r); break; case 1: - COMPARE(r, "second@xmpp.jid"); + COMPARE("second@xmpp.jid", r); break; default: if (r != NULL) {