From 67ec3bccaae4e43db89ee52d27c7fa403a6cf795 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Thu, 2 Mar 2023 22:30:42 +0000 Subject: test/abts: More numeric types to compare/assert. * test/abts.h(): Declare abts_{uint,long,ulong,llong,ullong}_{n,}equal() and the corresponding ABTS_{UINT,LONG,ULONG,LLONG,ULLONG}_{N,}EQUAL() wrappers. * test/abts.c(): Implement abts_{uint,long,ulong,llong,ullong}_{n,}equal() using a common macro. test/abts: Follow up to r1902191: Fix IMPL_abts_T_nequal. * test/abts.c(IMPL_abts_T_nequal): Invert logic from IMPL_abts_T_equal (bad copypasta) Merge r1902191, r1902192 from trunk. Merges r1902220 from 1.8.x. Submitted by: ylavic git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1907999 13f79535-47bb-0310-9956-ffa450edef68 --- test/abts.c | 86 +++++++++++++++++++++++++++++++------------------------------ test/abts.h | 37 +++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 45 deletions(-) diff --git a/test/abts.c b/test/abts.c index ef9f9dbf1..a4df871ab 100644 --- a/test/abts.c +++ b/test/abts.c @@ -240,50 +240,52 @@ void abts_log_message(const char *fmt, ...) } } -void abts_int_equal(abts_case *tc, const int expected, const int actual, int lineno) -{ - update_status(); - if (tc->failed) return; - - if (expected == actual) return; - - tc->failed = TRUE; - if (verbose) { - fprintf(stderr, "Line %d: expected <%d>, but saw <%d>\n", lineno, expected, actual); - fflush(stderr); - } +#define IMPL_abts_T_equal(T, NAME, FMT, CAST) \ +void abts_##NAME##_equal(abts_case *tc, const T expected, const T actual, int lineno) \ +{ \ + update_status(); \ + if (tc->failed) return; \ + \ + if (expected == actual) return; \ + \ + tc->failed = TRUE; \ + if (verbose) { \ + fprintf(stderr, "Line %d: expected <%" FMT ">, but saw <%" FMT ">\n", \ + lineno, CAST expected, CAST actual); \ + fflush(stderr); \ + } \ } - -void abts_int_nequal(abts_case *tc, const int expected, const int actual, int lineno) -{ - update_status(); - if (tc->failed) return; - - if (expected != actual) return; - - tc->failed = TRUE; - if (verbose) { - fprintf(stderr, "Line %d: expected something other than <%d>, but saw <%d>\n", - lineno, expected, actual); - fflush(stderr); - } -} - -void abts_size_equal(abts_case *tc, size_t expected, size_t actual, int lineno) -{ - update_status(); - if (tc->failed) return; - - if (expected == actual) return; - - tc->failed = TRUE; - if (verbose) { - /* Note that the comparison is type-exact, reporting must be a best-fit */ - fprintf(stderr, "Line %d: expected %lu, but saw %lu\n", lineno, - (unsigned long)expected, (unsigned long)actual); - fflush(stderr); - } +IMPL_abts_T_equal(int, int, "d", (int)) +IMPL_abts_T_equal(unsigned int, uint, "u", (unsigned int)) +IMPL_abts_T_equal(long, long, "ld", (long)) +IMPL_abts_T_equal(unsigned long, ulong, "lu", (unsigned long)) +IMPL_abts_T_equal(long long, llong, "lld", (long long)) +IMPL_abts_T_equal(unsigned long long, ullong, "llu", (unsigned long long)) +IMPL_abts_T_equal(size_t, size, "lu", (unsigned long)) + +#define IMPL_abts_T_nequal(T, NAME, FMT, CAST) \ +void abts_##NAME##_nequal(abts_case *tc, const T expected, const T actual, int lineno) \ +{ \ + update_status(); \ + if (tc->failed) return; \ + \ + if (expected != actual) return; \ + \ + tc->failed = TRUE; \ + if (verbose) { \ + fprintf(stderr, "Line %d: expected something other than <%" FMT ">, " \ + "but saw <%" FMT ">\n", \ + lineno, CAST expected, CAST actual); \ + fflush(stderr); \ + } \ } +IMPL_abts_T_nequal(int, int, "d", (int)) +IMPL_abts_T_nequal(unsigned int, uint, "u", (unsigned int)) +IMPL_abts_T_nequal(long, long, "ld", (long)) +IMPL_abts_T_nequal(unsigned long, ulong, "lu", (unsigned long)) +IMPL_abts_T_nequal(long long, llong, "lld", (long long)) +IMPL_abts_T_nequal(unsigned long long, ullong, "llu", (unsigned long long)) +IMPL_abts_T_nequal(size_t, size, "lu", (unsigned long)) void abts_str_equal(abts_case *tc, const char *expected, const char *actual, int lineno) { diff --git a/test/abts.h b/test/abts.h index ed1c092d9..4ce6cf544 100644 --- a/test/abts.h +++ b/test/abts.h @@ -70,6 +70,28 @@ void abts_log_message(const char *fmt, ...); void abts_int_equal(abts_case *tc, const int expected, const int actual, int lineno); void abts_int_nequal(abts_case *tc, const int expected, const int actual, int lineno); +void abts_uint_equal(abts_case *tc, const unsigned int expected, + const unsigned int actual, int lineno); +void abts_uint_nequal(abts_case *tc, const unsigned int expected, + const unsigned int actual, int lineno); +void abts_long_equal(abts_case *tc, const long expected, + const long actual, int lineno); +void abts_long_nequal(abts_case *tc, const long expected, + const long actual, int lineno); +void abts_ulong_equal(abts_case *tc, const unsigned long expected, + const unsigned long actual, int lineno); +void abts_ulong_nequal(abts_case *tc, const unsigned long expected, + const unsigned long actual, int lineno); +void abts_llong_equal(abts_case *tc, const long long expected, + const long long actual, int lineno); +void abts_llong_nequal(abts_case *tc, const long long expected, + const long long actual, int lineno); +void abts_ullong_equal(abts_case *tc, const unsigned long long expected, + const unsigned long long actual, int lineno); +void abts_ullong_nequal(abts_case *tc, const unsigned long long expected, + const unsigned long long actual, int lineno); +void abts_size_equal(abts_case *tc, size_t expected, size_t actual, int lineno); +void abts_size_nequal(abts_case *tc, size_t expected, size_t actual, int lineno); void abts_str_equal(abts_case *tc, const char *expected, const char *actual, int lineno); void abts_str_nequal(abts_case *tc, const char *expected, const char *actual, size_t n, int lineno); @@ -79,11 +101,22 @@ void abts_true(abts_case *tc, int condition, int lineno); void abts_fail(abts_case *tc, const char *message, int lineno); void abts_not_impl(abts_case *tc, const char *message, int lineno); void abts_assert(abts_case *tc, const char *message, int condition, int lineno); -void abts_size_equal(abts_case *tc, size_t expected, size_t actual, int lineno); /* Convenience macros. Ryan hates these! */ #define ABTS_INT_EQUAL(a, b, c) abts_int_equal(a, b, c, __LINE__) #define ABTS_INT_NEQUAL(a, b, c) abts_int_nequal(a, b, c, __LINE__) +#define ABTS_UINT_EQUAL(a, b, c) abts_uint_equal(a, b, c, __LINE__) +#define ABTS_UINT_NEQUAL(a, b, c) abts_uint_nequal(a, b, c, __LINE__) +#define ABTS_LONG_EQUAL(a, b, c) abts_long_equal(a, b, c, __LINE__) +#define ABTS_LONG_NEQUAL(a, b, c) abts_long_nequal(a, b, c, __LINE__) +#define ABTS_ULONG_EQUAL(a, b, c) abts_ulong_equal(a, b, c, __LINE__) +#define ABTS_ULONG_NEQUAL(a, b, c) abts_ulong_nequal(a, b, c, __LINE__) +#define ABTS_LLONG_EQUAL(a, b, c) abts_llong_equal(a, b, c, __LINE__) +#define ABTS_LLONG_NEQUAL(a, b, c) abts_llong_nequal(a, b, c, __LINE__) +#define ABTS_ULLONG_EQUAL(a, b, c) abts_ullong_equal(a, b, c, __LINE__) +#define ABTS_ULLONG_NEQUAL(a, b, c) abts_ullong_nequal(a, b, c, __LINE__) +#define ABTS_SIZE_EQUAL(a, b, c) abts_size_equal(a, b, c, __LINE__) +#define ABTS_SIZE_NEQUAL(a, b, c) abts_size_nequal(a, b, c, __LINE__) #define ABTS_STR_EQUAL(a, b, c) abts_str_equal(a, b, c, __LINE__) #define ABTS_STR_NEQUAL(a, b, c, d) abts_str_nequal(a, b, c, d, __LINE__) #define ABTS_PTR_NOTNULL(a, b) abts_ptr_notnull(a, b, __LINE__) @@ -93,8 +126,6 @@ void abts_size_equal(abts_case *tc, size_t expected, size_t actual, int lineno); #define ABTS_NOT_IMPL(a, b) abts_not_impl(a, b, __LINE__); #define ABTS_ASSERT(a, b, c) abts_assert(a, b, c, __LINE__); -#define ABTS_SIZE_EQUAL(a, b, c) abts_size_equal(a, b, c, __LINE__) - abts_suite *run_tests(abts_suite *suite); abts_suite *run_tests1(abts_suite *suite); -- cgit v1.2.1