Browse Source

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>
Andrew Borodin 3 years ago
parent
commit
39e7a048f7
2 changed files with 13 additions and 13 deletions
  1. 1 1
      m4.include/mc-tests.m4
  2. 12 12
      tests/lib/strutil/filevercmp.c

+ 1 - 1
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"

+ 12 - 12
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* */