From f09dadb1ed491094bb217e0575c4c09e736d0b0e Mon Sep 17 00:00:00 2001 From: Erik Ekman Date: Tue, 24 Aug 2021 23:07:36 +0200 Subject: [PATCH] test: Replace assert_msg(strcmp(),...) with str_eq str_eq will print the strings in case of failure: Assertion '"BB." == buf' failed: "BB." == "BB.", buf == "BA." --- tests/base32.c | 6 ++---- tests/base64.c | 6 ++---- tests/encoding.c | 6 ++---- tests/read.c | 3 +-- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/tests/base32.c b/tests/base32.c index 5e83b90..8f36c92 100644 --- a/tests/base32.c +++ b/tests/base32.c @@ -49,8 +49,7 @@ START_TEST(test_base32_encode) val = base32_ops.encode(buf, &len, testpairs[_i].a, strlen(testpairs[_i].a)); ck_assert(val == strlen(testpairs[_i].b)); - ck_assert_msg(strcmp(buf, testpairs[_i].b) == 0, - "'%s' != '%s'", buf, testpairs[_i].b); + ck_assert_str_eq(buf, testpairs[_i].b); } END_TEST @@ -64,8 +63,7 @@ START_TEST(test_base32_decode) val = base32_ops.decode(buf, &len, testpairs[_i].b, strlen(testpairs[_i].b)); ck_assert(val == strlen(testpairs[_i].a)); - ck_assert_msg(strcmp(buf, testpairs[_i].a) == 0, - "'%s' != '%s'", buf, testpairs[_i].a); + ck_assert_str_eq(buf, testpairs[_i].a); } END_TEST diff --git a/tests/base64.c b/tests/base64.c index 63aad42..bf72e43 100644 --- a/tests/base64.c +++ b/tests/base64.c @@ -74,8 +74,7 @@ START_TEST(test_base64_encode) val = base64_ops.encode(buf, &len, testpairs[_i].a, strlen(testpairs[_i].a)); ck_assert(val == strlen(testpairs[_i].b)); - ck_assert_msg(strcmp(buf, testpairs[_i].b) == 0, - "'%s' != '%s'", buf, testpairs[_i].b); + ck_assert_str_eq(buf, testpairs[_i].b); } END_TEST @@ -89,8 +88,7 @@ START_TEST(test_base64_decode) val = base64_ops.decode(buf, &len, testpairs[_i].b, strlen(testpairs[_i].b)); ck_assert(val == strlen(testpairs[_i].a)); - ck_assert_msg(strcmp(buf, testpairs[_i].a) == 0, - "'%s' != '%s'", buf, testpairs[_i].a); + ck_assert_str_eq(buf, testpairs[_i].a); } END_TEST diff --git a/tests/encoding.c b/tests/encoding.c index 07f280c..3a57ce1 100644 --- a/tests/encoding.c +++ b/tests/encoding.c @@ -50,8 +50,7 @@ START_TEST(test_inline_dotify) b = temp; inline_dotify(b, sizeof(temp)); - ck_assert_msg(strcmp(dottests[_i].b, temp) == 0, - "'%s' != '%s'", temp, dottests[_i].b); + ck_assert_str_eq(dottests[_i].b, temp); } END_TEST @@ -65,8 +64,7 @@ START_TEST(test_inline_undotify) b = temp; inline_undotify(b, sizeof(temp)); - ck_assert_msg(strcmp(dottests[_i].a, temp) == 0, - "'%s' != '%s'", temp, dottests[_i].a); + ck_assert_str_eq(dottests[_i].a, temp); } END_TEST diff --git a/tests/read.c b/tests/read.c index 2072d01..fea7b63 100644 --- a/tests/read.c +++ b/tests/read.c @@ -205,8 +205,7 @@ START_TEST(test_read_name_badjump_second) rv = readname((char*) jumper, sizeof(badjump2), &data, buf, 256); ck_assert(rv == 4); - ck_assert_msg(strcmp("BA.", buf) == 0, - "buf is not BA: %s", buf); + ck_assert_str_eq("BA.", buf); } free(jumper); }