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 <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2022-02-20 17:49:12 +03:00
parent 4f22598c9a
commit 39e7a048f7
2 changed files with 13 additions and 13 deletions

View File

@ -22,7 +22,7 @@ AC_DEFUN([mc_UNIT_TESTS],[
else else
PKG_CHECK_MODULES( PKG_CHECK_MODULES(
CHECK, CHECK,
[check >= 0.9.8], [check >= 0.9.10],
[ [
have_check=yes have_check=yes
tests_msg="yes" tests_msg="yes"

View File

@ -178,11 +178,11 @@ START_TEST (filevercmp_test2)
result = filevercmp (i, j); result = filevercmp (i, j);
if (result < 0) if (result < 0)
ck_assert_int_eq (! !((size_t) _i < _j), 1); ck_assert_int_lt ((size_t) _i, _j);
else if (0 < result) else if (result > 0)
ck_assert_int_eq (! !(_j < (size_t) _i), 1); ck_assert_int_gt ((size_t) _i, _j);
else else
ck_assert_int_eq (! !(_j == (size_t) _i), 1); ck_assert_int_eq ((size_t) _i, _j);
} }
} }
/* *INDENT-OFF* */ /* *INDENT-OFF* */
@ -215,11 +215,11 @@ START_TEST (filevercmp_test3)
result = filevercmp (i, j); result = filevercmp (i, j);
if (result < 0) if (result < 0)
ck_assert_int_eq (! !((size_t) _i < _j), 1); ck_assert_int_lt ((size_t) _i, _j);
else if (0 < result) else if (result > 0)
ck_assert_int_eq (! !(_j < (size_t) _i), 1); ck_assert_int_gt ((size_t) _i, _j);
else else
ck_assert_int_eq (! !(_j == (size_t) _i), 1); ck_assert_int_eq ((size_t) _i, _j);
} }
} }
/* *INDENT-OFF* */ /* *INDENT-OFF* */
@ -253,11 +253,11 @@ START_TEST (filevercmp_test4)
result = filevercmp (i, j); result = filevercmp (i, j);
if (result < 0) if (result < 0)
ck_assert_int_eq (! !((size_t) _i < _j), 1); ck_assert_int_lt ((size_t) _i, _j);
else if (0 < result) else if (result > 0)
ck_assert_int_eq (! !(_j < (size_t) _i), 1); ck_assert_int_gt ((size_t) _i, _j);
else else
ck_assert_int_eq (! !(_j == (size_t) _i), 1); ck_assert_int_eq ((size_t) _i, _j);
} }
} }
/* *INDENT-OFF* */ /* *INDENT-OFF* */