diff --git a/utest.h b/utest.h index 29cc164..9a85952 100644 --- a/utest.h +++ b/utest.h @@ -495,19 +495,19 @@ *utest_result = 1; \ } -#define EXPECT_STRNEQ(x, y) \ - if (0 != UTEST_STRNCMP(x, y, strlen(x))) { \ +#define EXPECT_STRNEQ(x, y, n) \ + if (0 != UTEST_STRNCMP(x, y, n)) { \ UTEST_PRINTF("%s:%u: Failure\n", __FILE__, __LINE__); \ - UTEST_PRINTF(" Expected : \"%s\"\n", x); \ - UTEST_PRINTF(" Actual : \"%s\"\n", y); \ + UTEST_PRINTF(" Expected : \"%.*s\"\n", (int)n, x); \ + UTEST_PRINTF(" Actual : \"%.*s\"\n", (int)n, y); \ *utest_result = 1; \ } -#define EXPECT_STRNNE(x, y) \ - if (0 == UTEST_STRNCMP(x, y, strlen(x))) { \ +#define EXPECT_STRNNE(x, y, n) \ + if (0 == UTEST_STRNCMP(x, y, n)) { \ UTEST_PRINTF("%s:%u: Failure\n", __FILE__, __LINE__); \ - UTEST_PRINTF(" Expected : \"%s\"\n", x); \ - UTEST_PRINTF(" Actual : \"%s\"\n", y); \ + UTEST_PRINTF(" Expected : \"%.*s\"\n", (int)n, x); \ + UTEST_PRINTF(" Actual : \"%.*s\"\n", (int)n, y); \ *utest_result = 1; \ } @@ -604,20 +604,20 @@ return; \ } -#define ASSERT_STRNEQ(x, y) \ - if (0 != UTEST_STRNCMP(x, y, strlen(x))) { \ +#define ASSERT_STRNEQ(x, y, n) \ + if (0 != UTEST_STRNCMP(x, y, n)) { \ UTEST_PRINTF("%s:%u: Failure\n", __FILE__, __LINE__); \ - UTEST_PRINTF(" Expected : \"%s\"\n", x); \ - UTEST_PRINTF(" Actual : \"%s\"\n", y); \ + UTEST_PRINTF(" Expected : \"%.*s\"\n", (int)n, x); \ + UTEST_PRINTF(" Actual : \"%.*s\"\n", (int)n, y); \ *utest_result = 1; \ return; \ } -#define ASSERT_STRNNE(x, y) \ - if (0 == UTEST_STRNCMP(x, y, strlen(x))) { \ +#define ASSERT_STRNNE(x, y, n) \ + if (0 == UTEST_STRNCMP(x, y, n)) { \ UTEST_PRINTF("%s:%u: Failure\n", __FILE__, __LINE__); \ - UTEST_PRINTF(" Expected : \"%s\"\n", x); \ - UTEST_PRINTF(" Actual : \"%s\"\n", y); \ + UTEST_PRINTF(" Expected : \"%.*s\"\n", (int)n, x); \ + UTEST_PRINTF(" Actual : \"%.*s\"\n", (int)n, y); \ *utest_result = 1; \ return; \ }