From 39e7a048f76f9637c5b16d75ec3a12663d1206c9 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 20 Feb 2022 17:49:12 +0300 Subject: [PATCH] tests/lib/strutil/filevercmp.c: minor improvements. Use ck_assert_int_lt() and ck_assert_int_gt() to check integer values. Increase minimal version of Check up to 0.9.10. Signed-off-by: Andrew Borodin --- m4.include/mc-tests.m4 | 2 +- tests/lib/strutil/filevercmp.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/m4.include/mc-tests.m4 b/m4.include/mc-tests.m4 index 257218ecb..0814aff9a 100644 --- a/m4.include/mc-tests.m4 +++ b/m4.include/mc-tests.m4 @@ -22,7 +22,7 @@ AC_DEFUN([mc_UNIT_TESTS],[ else PKG_CHECK_MODULES( CHECK, - [check >= 0.9.8], + [check >= 0.9.10], [ have_check=yes tests_msg="yes" diff --git a/tests/lib/strutil/filevercmp.c b/tests/lib/strutil/filevercmp.c index f03148233..abd27b400 100644 --- a/tests/lib/strutil/filevercmp.c +++ b/tests/lib/strutil/filevercmp.c @@ -178,11 +178,11 @@ START_TEST (filevercmp_test2) result = filevercmp (i, j); if (result < 0) - ck_assert_int_eq (! !((size_t) _i < _j), 1); - else if (0 < result) - ck_assert_int_eq (! !(_j < (size_t) _i), 1); + ck_assert_int_lt ((size_t) _i, _j); + else if (result > 0) + ck_assert_int_gt ((size_t) _i, _j); else - ck_assert_int_eq (! !(_j == (size_t) _i), 1); + ck_assert_int_eq ((size_t) _i, _j); } } /* *INDENT-OFF* */ @@ -215,11 +215,11 @@ START_TEST (filevercmp_test3) result = filevercmp (i, j); if (result < 0) - ck_assert_int_eq (! !((size_t) _i < _j), 1); - else if (0 < result) - ck_assert_int_eq (! !(_j < (size_t) _i), 1); + ck_assert_int_lt ((size_t) _i, _j); + else if (result > 0) + ck_assert_int_gt ((size_t) _i, _j); else - ck_assert_int_eq (! !(_j == (size_t) _i), 1); + ck_assert_int_eq ((size_t) _i, _j); } } /* *INDENT-OFF* */ @@ -253,11 +253,11 @@ START_TEST (filevercmp_test4) result = filevercmp (i, j); if (result < 0) - ck_assert_int_eq (! !((size_t) _i < _j), 1); - else if (0 < result) - ck_assert_int_eq (! !(_j < (size_t) _i), 1); + ck_assert_int_lt ((size_t) _i, _j); + else if (result > 0) + ck_assert_int_gt ((size_t) _i, _j); else - ck_assert_int_eq (! !(_j == (size_t) _i), 1); + ck_assert_int_eq ((size_t) _i, _j); } } /* *INDENT-OFF* */