From 3738ee93ebcc3552774b6361fccea2b8ab80e101 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>

Date: Tue, 22 Jun 2021 10:32:29 +0200

Subject: [PATCH] `fail_if` and `fail_unless` are deprecated

https://libcheck.github.io/check/doc/check_html/check_4.html#Convenience-Test-Functions

It also fixes a couple of covscan warnings of the following type:

```

Error: COMPILER_WARNING (CWE-685):

librepo-1.12.1/tests/fixtures.h:5: included_from: Included from here.

librepo-1.12.1/tests/test_checksum.c:15: included_from: Included from here.

librepo-1.12.1/tests/test_checksum.c: scope_hint: In function 'test_checksum'

librepo-1.12.1/tests/test_checksum.c:58:9: warning[-Wformat-extra-args]: too many arguments for format

\#   58 |         "Checksum is %s instead of %s", checksum, expected);

\#      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

\#   56|       fail_if(tmp_err);

\#   57|       fail_if(strcmp(checksum, expected),

\#   58|->         "Checksum is %s instead of %s", checksum, expected);

\#   59|       lr_free(checksum);

\#   60|       close(fd);

```

---

 tests/test_checksum.c           |  88 +++----

 tests/test_downloader.c         |  93 +++----

 tests/test_gpg.c                |  32 +--

 tests/test_handle.c             | 140 +++++-----

 tests/test_lrmirrorlist.c       | 114 ++++-----

 tests/test_metalink.c           | 438 ++++++++++++++++----------------

 tests/test_mirrorlist.c         |  40 +--

 tests/test_package_downloader.c |  48 ++--

 tests/test_repo_zck.c           |  20 +-

 tests/test_repoconf.c           |  24 +-

 tests/test_repomd.c             |  38 +--

 tests/test_url_substitution.c   |  50 ++--

 tests/test_util.c               | 146 +++++------

 tests/test_version.c            |  24 +-

 14 files changed, 640 insertions(+), 655 deletions(-)

diff --git a/tests/test_checksum.c b/tests/test_checksum.c

index d0aba365..cd28cd17 100644

--- a/tests/test_checksum.c

+++ b/tests/test_checksum.c

@@ -38,8 +38,8 @@ build_test_file(const char *filename, const char *content)

 {

     FILE *fp = fopen(filename, "w");

     size_t len = strlen(content);

-    fail_if(fp == NULL);

-    fail_unless(fwrite(content, 1, len, fp) == len);

+    ck_assert_ptr_nonnull(fp);

+    ck_assert(fwrite(content, 1, len, fp) == len);

     fclose(fp);

 }

@@ -51,11 +51,11 @@ test_checksum(const char *filename, LrChecksumType ch_type, char *expected)

     GError *tmp_err = NULL;

     fd = open(filename, O_RDONLY);

-    fail_if(fd < 0);

+    ck_assert_int_ge(fd, 0);

     checksum = lr_checksum_fd(ch_type, fd, &tmp_err);

-    fail_if(checksum == NULL);

-    fail_if(tmp_err);

-    fail_if(strcmp(checksum, expected),

+    ck_assert_ptr_nonnull(checksum);

+    ck_assert_ptr_null(tmp_err);

+    ck_assert_msg(!strcmp(checksum, expected),

         "Checksum is %s instead of %s", checksum, expected);

     lr_free(checksum);

     close(fd);

@@ -85,7 +85,7 @@ START_TEST(test_checksum_fd)

     test_checksum(file, LR_CHECKSUM_SHA384, CHKS_VAL_01_SHA384);

     test_checksum(file, LR_CHECKSUM_SHA512, CHKS_VAL_01_SHA512);

-    fail_if(remove(file) != 0, "Cannot delete temporary test file");

+    ck_assert_msg(remove(file) == 0, "Cannot delete temporary test file");

     lr_free(file);

 }

 END_TEST

@@ -107,28 +107,28 @@ START_TEST(test_cached_checksum_matches)

     filename = lr_pathconcat(test_globals.tmpdir, "/test_checksum_matches", NULL);

     f = fopen(filename, "w");

-    fail_if(f == NULL);

+    ck_assert_ptr_nonnull(f);

     fwrite("foo\nbar\n", 1, 8, f);

     fclose(f);

     // Assert no cached checksum exists

     attr_ret = GETXATTR(filename, timestamp_key, &buf, sizeof(buf)-1);

-    fail_if(attr_ret != -1);  // Cached timestamp should not exists

+    ck_assert(attr_ret == -1);  // Cached timestamp should not exists

     attr_ret = GETXATTR(filename, checksum_key, &buf, sizeof(buf)-1);

-    fail_if(attr_ret != -1);  // Cached checksum should not exists

+    ck_assert(attr_ret == -1);  // Cached checksum should not exists

     // Calculate checksum

     fd = open(filename, O_RDONLY);

-    fail_if(fd < 0);

+    ck_assert_int_ge(fd, 0);

     checksum_ret = lr_checksum_fd_cmp(LR_CHECKSUM_SHA256,

                                       fd,

                                       expected,

                                       1,

                                       &matches,

                                       &tmp_err);

-    fail_if(tmp_err);

-    fail_if(!checksum_ret);

-    fail_if(!matches);

+    ck_assert_ptr_null(tmp_err);

+    ck_assert(checksum_ret);

+    ck_assert(matches);

     close(fd);

     // Assert cached checksum exists

@@ -141,33 +141,33 @@ START_TEST(test_cached_checksum_matches)

             goto exit_label;

         }

         // Any other errno means fail

-        fail_if(attr_ret == -1);

+        ck_assert(attr_ret != -1);

     } else {

         buf[attr_ret] = 0;

-        fail_if(strcmp(buf, expected));

+        ck_assert_str_eq(buf, expected);

     }

     // stored timestamp matches the file mtime

     ret = stat(filename, &st);

-    fail_if(ret != 0);

+    ck_assert_int_eq(ret, 0);

     mtime_str = g_strdup_printf("%lli", (long long) st.st_mtime);

     attr_ret = GETXATTR(filename, timestamp_key, &buf, sizeof(buf)-1);

-    fail_if(attr_ret == -1);

+    ck_assert(attr_ret != -1);

     buf[attr_ret] = 0;

-    fail_if(strcmp(buf, mtime_str));

+    ck_assert_str_eq(buf, mtime_str);

     // Calculate checksum again (cached shoud be used this time)

     fd = open(filename, O_RDONLY);

-    fail_if(fd < 0);

+    ck_assert_int_ge(fd, 0);

     checksum_ret = lr_checksum_fd_cmp(LR_CHECKSUM_SHA256,

                                       fd,

                                       expected,

                                       1,

                                       &matches,

                                       &tmp_err);

-    fail_if(tmp_err);

-    fail_if(!checksum_ret);

-    fail_if(!matches);

+    ck_assert_ptr_null(tmp_err);

+    ck_assert(checksum_ret);

+    ck_assert(matches);

     close(fd);

 exit_label:

@@ -195,19 +195,19 @@ START_TEST(test_cached_checksum_value)

     filename = lr_pathconcat(test_globals.tmpdir, "/test_checksum_value", NULL);

     f = fopen(filename, "w");

-    fail_if(f == NULL);

+    ck_assert_ptr_nonnull(f);

     fwrite("foo\nbar\n", 1, 8, f);

     fclose(f);

     // Assert no cached checksum exists

     attr_ret = GETXATTR(filename, timestamp_key, &buf, sizeof(buf)-1);

-    fail_if(attr_ret != -1);  // Cached timestamp should not exists

+    ck_assert(attr_ret == -1);  // Cached timestamp should not exists

     attr_ret = GETXATTR(filename, checksum_key, &buf, sizeof(buf)-1);

-    fail_if(attr_ret != -1);  // Cached checksum should not exists

+    ck_assert(attr_ret == -1);  // Cached checksum should not exists

     // Calculate checksum

     fd = open(filename, O_RDONLY);

-    fail_if(fd < 0);

+    ck_assert_int_ge(fd, 0);

     checksum_ret = lr_checksum_fd_compare(LR_CHECKSUM_SHA256,

                                       fd,

                                       "",

@@ -215,20 +215,20 @@ START_TEST(test_cached_checksum_value)

                                       &matches,

                                       &calculated,

                                       &tmp_err);

-    fail_if(tmp_err);

-    fail_if(!checksum_ret);

+    ck_assert_ptr_null(tmp_err);

+    ck_assert(checksum_ret);

     // We pass in an empty string for expected, so we must not match.

-    fail_if(matches);

+    ck_assert(!matches);

     close(fd);

-    fail_if(strcmp(calculated, expected));

+    ck_assert_str_eq(calculated, expected);

     // Assert no cached checksum exists

     // This assumes issue #235 is unresolved. Once it is, this code

     // should fail and the test will need updated.

     attr_ret = GETXATTR(filename, timestamp_key, &buf, sizeof(buf)-1);

-    fail_if(attr_ret != -1);  // Cached timestamp should not exists

+    ck_assert(attr_ret == -1);  // Cached timestamp should not exists

     attr_ret = GETXATTR(filename, checksum_key, &buf, sizeof(buf)-1);

-    fail_if(attr_ret != -1);  // Cached checksum should not exists

+    ck_assert(attr_ret == -1);  // Cached checksum should not exists

     lr_free(calculated);

     lr_free(filename);

@@ -252,42 +252,42 @@ START_TEST(test_cached_checksum_clear)

     filename = lr_pathconcat(test_globals.tmpdir, "/test_checksum_clear", NULL);

     f = fopen(filename, "w");

-    fail_if(f == NULL);

+    ck_assert_ptr_nonnull(f);

     fclose(f);

     // set extended attributes

     fd = open(filename, O_RDONLY);

-    fail_if(fd < 0);

+    ck_assert_int_ge(fd, 0);

     attr_ret = FSETXATTR(fd, timestamp_key, value, strlen(value), 0);

     if (attr_ret == -1) {

         if (errno == ENOTSUP) {

             goto cleanup;

         }

-        fail_if(attr_ret == -1);

+        ck_assert(attr_ret != -1);

     }

     attr_ret = FSETXATTR(fd, checksum_key, value, strlen(value), 0);

-    fail_if(attr_ret == -1);

+    ck_assert(attr_ret != -1);

     attr_ret = FSETXATTR(fd, other_key, value, strlen(value), 0);

-    fail_if(attr_ret == -1);

+    ck_assert(attr_ret != -1);

     // verify that xattrs are set

     attr_ret = GETXATTR(filename, timestamp_key, &buf, sizeof(buf));

-    fail_if(attr_ret == -1);

+    ck_assert(attr_ret != -1);

     attr_ret = GETXATTR(filename, checksum_key, &buf, sizeof(buf));

-    fail_if(attr_ret == -1);

+    ck_assert(attr_ret != -1);

     attr_ret = GETXATTR(filename, other_key, &buf, sizeof(buf));

-    fail_if(attr_ret == -1);

+    ck_assert(attr_ret != -1);

     lr_checksum_clear_cache(fd);

     // verify that checksum xattrs are removed

     attr_ret = GETXATTR(filename, timestamp_key, &buf, sizeof(buf));

-    fail_if(attr_ret != -1);

+    ck_assert(attr_ret == -1);

     attr_ret = GETXATTR(filename, checksum_key, &buf, sizeof(buf));

-    fail_if(attr_ret != -1);

+    ck_assert(attr_ret == -1);

     // other then checksum related attributes are not removed

     attr_ret = GETXATTR(filename, other_key, &buf, sizeof(buf));

-    fail_if(attr_ret == -1);

+    ck_assert(attr_ret != -1);

 cleanup:

     close(fd);

     lr_free(filename);

diff --git a/tests/test_downloader.c b/tests/test_downloader.c

index e6155105..34958ab1 100644

--- a/tests/test_downloader.c

+++ b/tests/test_downloader.c

@@ -20,18 +20,14 @@

 START_TEST(test_downloader_no_list)

 {

-    int ret;

     GError *err = NULL;

-

-    ret = lr_download(NULL, FALSE, &err;;

-    fail_if(!ret);

-    fail_if(err);

+    ck_assert(lr_download(NULL, FALSE, &err));

+    ck_assert_ptr_null(err);

 }

 END_TEST

 START_TEST(test_downloader_single_file)

 {

-    int ret;

     LrHandle *handle;

     GSList *list = NULL;

     GError *err = NULL;

@@ -43,12 +39,12 @@ START_TEST(test_downloader_single_file)

     // Prepare handle

     handle = lr_handle_init();

-    fail_if(handle == NULL);

+    ck_assert_ptr_nonnull(handle);

     char *urls[] = {"http://www.google.com", NULL};

-    fail_if(!lr_handle_setopt(handle, NULL, LRO_URLS, urls));

+    ck_assert(lr_handle_setopt(handle, NULL, LRO_URLS, urls));

     lr_handle_prepare_internal_mirrorlist(handle, FALSE, &tmp_err);

-    fail_if(tmp_err);

+    ck_assert_ptr_null(tmp_err);

     // Prepare list of download targets

@@ -57,20 +53,19 @@ START_TEST(test_downloader_single_file)

     fd1 = mkstemp(tmpfn1);

     lr_free(tmpfn1);

-    fail_if(fd1 < 0);

+    ck_assert_int_ge(fd1, 0);

     t1 = lr_downloadtarget_new(handle, "index.html", NULL, fd1, NULL, NULL,

                                0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL,

                                FALSE, FALSE);

-    fail_if(!t1);

+    ck_assert_ptr_nonnull(t1);

     list = g_slist_append(list, t1);

     // Download

-    ret = lr_download(list, FALSE, &err;;

-    fail_if(!ret);

-    fail_if(err);

+    ck_assert(lr_download(list, FALSE, &err));

+    ck_assert_ptr_null(err);

     lr_handle_free(handle);

@@ -91,7 +86,6 @@ END_TEST

 START_TEST(test_downloader_single_file_2)

 {

-    int ret;

     GSList *list = NULL;

     GError *err = NULL;

     int fd1;

@@ -104,20 +98,19 @@ START_TEST(test_downloader_single_file_2)

     fd1 = mkstemp(tmpfn1);

     lr_free(tmpfn1);

-    fail_if(fd1 < 0);

+    ck_assert_int_ge(fd1, 0);

     t1 = lr_downloadtarget_new(NULL, "http://seznam.cz/index.html", NULL,

                                fd1, NULL, NULL, 0, 0, NULL, NULL, NULL,

                                NULL, NULL, 0, 0, NULL, FALSE, FALSE);

-    fail_if(!t1);

+    ck_assert_ptr_nonnull(t1);

     list = g_slist_append(list, t1);

     // Download

-    ret = lr_download(list, FALSE, &err;;

-    fail_if(!ret);

-    fail_if(err);

+    ck_assert(lr_download(list, FALSE, &err));

+    ck_assert_ptr_null(err);

     // Check results

@@ -136,7 +129,6 @@ END_TEST

 START_TEST(test_downloader_two_files)

 {

-    int ret;

     LrHandle *handle;

     GSList *list = NULL;

     GError *err = NULL;

@@ -148,12 +140,12 @@ START_TEST(test_downloader_two_files)

     // Prepare handle

     handle = lr_handle_init();

-    fail_if(handle == NULL);

+    ck_assert_ptr_nonnull(handle);

     char *urls[] = {"http://www.google.com", NULL};

-    fail_if(!lr_handle_setopt(handle, NULL, LRO_URLS, urls));

+    ck_assert(lr_handle_setopt(handle, NULL, LRO_URLS, urls));

     lr_handle_prepare_internal_mirrorlist(handle, FALSE, &tmp_err);

-    fail_if(tmp_err);

+    ck_assert_ptr_null(tmp_err);

     // Prepare list of download targets

@@ -164,26 +156,25 @@ START_TEST(test_downloader_two_files)

     fd2 = mkstemp(tmpfn2);

     lr_free(tmpfn1);

     lr_free(tmpfn2);

-    fail_if(fd1 < 0);

-    fail_if(fd2 < 0);

+    ck_assert_int_ge(fd1, 0);

+    ck_assert_int_ge(fd2, 0);

     t1 = lr_downloadtarget_new(handle, "index.html", NULL, fd1, NULL,

                                NULL, 0, 0, NULL, NULL, NULL,

                                NULL, NULL, 0, 0, NULL, FALSE, FALSE);

-    fail_if(!t1);

+    ck_assert_ptr_nonnull(t1);

     t2 = lr_downloadtarget_new(handle, "index.html", "http://seznam.cz", fd2,

                                NULL, NULL, 0, 0, NULL, NULL, NULL,

                                NULL, NULL, 0, 0, NULL, FALSE, FALSE);

-    fail_if(!t2);

+    ck_assert_ptr_nonnull(t2);

     list = g_slist_append(list, t1);

     list = g_slist_append(list, t2);

     // Download

-    ret = lr_download(list, FALSE, &err;;

-    fail_if(!ret);

-    fail_if(err);

+    ck_assert(lr_download(list, FALSE, &err));

+    ck_assert_ptr_null(err);

     lr_handle_free(handle);

@@ -205,7 +196,6 @@ END_TEST

 START_TEST(test_downloader_three_files_with_error)

 {

-    int ret;

     LrHandle *handle;

     GSList *list = NULL;

     GError *err = NULL;

@@ -217,12 +207,12 @@ START_TEST(test_downloader_three_files_with_error)

     // Prepare handle

     handle = lr_handle_init();

-    fail_if(handle == NULL);

+    ck_assert_ptr_nonnull(handle);

     char *urls[] = {"http://www.google.com", NULL};

-    fail_if(!lr_handle_setopt(handle, NULL, LRO_URLS, urls));

+    ck_assert(lr_handle_setopt(handle, NULL, LRO_URLS, urls));

     lr_handle_prepare_internal_mirrorlist(handle, FALSE, &tmp_err);

-    fail_if(tmp_err);

+    ck_assert_ptr_null(tmp_err);

     // Prepare list of download targets

@@ -236,25 +226,25 @@ START_TEST(test_downloader_three_files_with_error)

     lr_free(tmpfn1);

     lr_free(tmpfn2);

     lr_free(tmpfn3);

-    fail_if(fd1 < 0);

-    fail_if(fd2 < 0);

-    fail_if(fd3 < 0);

+    ck_assert_int_ge(fd1, 0);

+    ck_assert_int_ge(fd2, 0);

+    ck_assert_int_ge(fd3, 0);

     t1 = lr_downloadtarget_new(handle, "index.html", NULL, fd1, NULL, NULL,

                                0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL,

                                FALSE, FALSE);

-    fail_if(!t1);

+    ck_assert_ptr_nonnull(t1);

     t2 = lr_downloadtarget_new(handle, "index.html", "http://seznam.cz", fd2,

                                NULL, NULL, 0, 0, NULL, NULL, NULL, NULL,

                                NULL, 0, 0, NULL, FALSE, FALSE);

-    fail_if(!t2);

+    ck_assert_ptr_nonnull(t2);

     t3 = lr_downloadtarget_new(handle, "i_hope_this_page_doesnt_exists.html",

                                "http://google.com", fd3, NULL, NULL,

                                0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL,

                                FALSE, FALSE);

-    fail_if(!t3);

+    ck_assert_ptr_nonnull(t3);

     list = g_slist_append(list, t1);

     list = g_slist_append(list, t2);

@@ -262,9 +252,8 @@ START_TEST(test_downloader_three_files_with_error)

     // Download

-    ret = lr_download(list, FALSE, &err;;

-    fail_if(!ret);

-    fail_if(err);

+    ck_assert(lr_download(list, FALSE, &err));

+    ck_assert_ptr_null(err);

     lr_handle_free(handle);

@@ -314,7 +303,6 @@ START_TEST(test_downloader_checksum)

     int i;

     for (i = 0; tests[i].sha512; i++) {

-        int ret;

         LrHandle *handle;

         GSList *list = NULL;

         GError *err = NULL;

@@ -328,12 +316,12 @@ START_TEST(test_downloader_checksum)

         // Prepare handle

         handle = lr_handle_init();

-        fail_if(handle == NULL);

+        ck_assert_ptr_nonnull(handle);

         char *urls[] = {"file:///", NULL};

-        fail_if(!lr_handle_setopt(handle, NULL, LRO_URLS, urls));

+        ck_assert(lr_handle_setopt(handle, NULL, LRO_URLS, urls));

         lr_handle_prepare_internal_mirrorlist(handle, FALSE, &tmp_err);

-        fail_if(tmp_err);

+        ck_assert_ptr_null(tmp_err);

         // Prepare list of download targets

@@ -342,7 +330,7 @@ START_TEST(test_downloader_checksum)

         fd1 = mkstemp(tmpfn1);

         lr_free(tmpfn1);

-        fail_if(fd1 < 0);

+        ck_assert_int_ge(fd1, 0);

         checksum = lr_downloadtargetchecksum_new(LR_CHECKSUM_SHA512,

                                                  tests[i].sha512);

@@ -351,15 +339,14 @@ START_TEST(test_downloader_checksum)

         t1 = lr_downloadtarget_new(handle, "dev/null", NULL, fd1, NULL, checksums,

                                    0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL,

                                    FALSE, FALSE);

-        fail_if(!t1);

+        ck_assert_ptr_nonnull(t1);

         list = g_slist_append(list, t1);

         // Download

-        ret = lr_download(list, FALSE, &err;;

-        fail_if(!ret);

-        fail_if(err);

+        ck_assert(lr_download(list, FALSE, &err));

+        ck_assert_ptr_null(err);

         lr_handle_free(handle);

diff --git a/tests/test_gpg.c b/tests/test_gpg.c

index 1f956d8b..fd322e38 100644

--- a/tests/test_gpg.c

+++ b/tests/test_gpg.c

@@ -39,24 +39,24 @@ START_TEST(test_gpg_check_signature)

                              "repo_yum_01/repodata/repomd.xml_bad.asc", NULL);

     ret = lr_gpg_import_key(key_path, tmp_home_path, &tmp_err);

-    fail_if(!ret);

-    fail_if(tmp_err);

+    ck_assert(ret);

+    ck_assert_ptr_null(tmp_err);

     // Valid key and data

     ret = lr_gpg_check_signature(signature_path,

                                  data_path,

                                  tmp_home_path,

                                  &tmp_err);

-    fail_if(!ret);

-    fail_if(tmp_err);

+    ck_assert(ret);

+    ck_assert_ptr_null(tmp_err);

     // Bad signature signed with unknown key

     ret = lr_gpg_check_signature(_signature_path,

                                  data_path,

                                  tmp_home_path,

                                  &tmp_err);

-    fail_if(ret);

-    fail_if(!tmp_err);

+    ck_assert(!ret);

+    ck_assert_ptr_nonnull(tmp_err);

     g_error_free(tmp_err);

     tmp_err = NULL;

@@ -65,31 +65,31 @@ START_TEST(test_gpg_check_signature)

                                  _data_path,

                                  tmp_home_path,

                                  &tmp_err);

-    fail_if(ret);

-    fail_if(!tmp_err);

+    ck_assert(!ret);

+    ck_assert_ptr_nonnull(tmp_err);

     g_error_free(tmp_err);

     tmp_err = NULL;

     // Import the 2nd key

     ret = lr_gpg_import_key(_key_path, tmp_home_path, &tmp_err);

-    fail_if(!ret);

-    fail_if(tmp_err);

+    ck_assert(ret);

+    ck_assert_ptr_null(tmp_err);

     // Valid key and data

     ret = lr_gpg_check_signature(_signature_path,

                                  _data_path,

                                  tmp_home_path,

                                  &tmp_err);

-    fail_if(!ret);

-    fail_if(tmp_err);

+    ck_assert(ret);

+    ck_assert_ptr_null(tmp_err);

     // Bad signature signed with known key

     ret = lr_gpg_check_signature(_signature_path,

                                  data_path,

                                  tmp_home_path,

                                  &tmp_err);

-    fail_if(ret);

-    fail_if(!tmp_err);

+    ck_assert(!ret);

+    ck_assert_ptr_nonnull(tmp_err);

     g_error_free(tmp_err);

     tmp_err = NULL;

@@ -98,8 +98,8 @@ START_TEST(test_gpg_check_signature)

                                  data_path,

                                  tmp_home_path,

                                  &tmp_err);

-    fail_if(ret);

-    fail_if(!tmp_err);

+    ck_assert(!ret);

+    ck_assert_ptr_nonnull(tmp_err);

     g_error_free(tmp_err);

     tmp_err = NULL;

diff --git a/tests/test_handle.c b/tests/test_handle.c

index d8b3c3fe..a80df4eb 100644

--- a/tests/test_handle.c

+++ b/tests/test_handle.c

@@ -22,42 +22,42 @@ START_TEST(test_handle)

     GError *tmp_err = NULL;

     h = lr_handle_init();

-    fail_if(h == NULL);

+    ck_assert_ptr_nonnull(h);

     lr_handle_free(h);

     h = NULL;

     /* This test is meant to check memory leaks. (Use valgrind) */

     h = lr_handle_init();

     char *urls[] = {"foo", NULL};

-    fail_if(!lr_handle_setopt(h, &tmp_err, LRO_URLS, urls));

-    fail_if(tmp_err);

-    fail_if(!lr_handle_setopt(h, &tmp_err, LRO_URLS, urls));

-    fail_if(tmp_err);

-    fail_if(!lr_handle_setopt(h, &tmp_err, LRO_MIRRORLIST, "foo"));

-    fail_if(tmp_err);

-    fail_if(!lr_handle_setopt(h, &tmp_err, LRO_MIRRORLIST, "bar"));

-    fail_if(tmp_err);

-    fail_if(!lr_handle_setopt(h, NULL, LRO_USERPWD, "user:pwd"));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_PROXY, "proxy"));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_PROXYUSERPWD, "proxyuser:pwd"));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_DESTDIR, "foodir"));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_USERAGENT, "librepo/0.0"));

+    ck_assert(lr_handle_setopt(h, &tmp_err, LRO_URLS, urls));

+    ck_assert_ptr_null(tmp_err);

+    ck_assert(lr_handle_setopt(h, &tmp_err, LRO_URLS, urls));

+    ck_assert_ptr_null(tmp_err);

+    ck_assert(lr_handle_setopt(h, &tmp_err, LRO_MIRRORLIST, "foo"));

+    ck_assert_ptr_null(tmp_err);

+    ck_assert(lr_handle_setopt(h, &tmp_err, LRO_MIRRORLIST, "bar"));

+    ck_assert_ptr_null(tmp_err);

+    ck_assert(lr_handle_setopt(h, NULL, LRO_USERPWD, "user:pwd"));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_PROXY, "proxy"));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_PROXYUSERPWD, "proxyuser:pwd"));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_DESTDIR, "foodir"));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_USERAGENT, "librepo/0.0"));

     char *dlist[] = {"primary", "filelists", NULL};

-    fail_if(!lr_handle_setopt(h, NULL, LRO_YUMDLIST, dlist));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_YUMBLIST, dlist));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_YUMDLIST, dlist));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_YUMBLIST, dlist));

     LrUrlVars *vars = NULL;

     vars = lr_urlvars_set(vars, "foo", "bar");

-    fail_if(!lr_handle_setopt(h, NULL, LRO_VARSUB, vars));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_FASTESTMIRRORCACHE,

+    ck_assert(lr_handle_setopt(h, NULL, LRO_VARSUB, vars));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_FASTESTMIRRORCACHE,

                               "/var/cache/fastestmirror.librepo"));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_SSLCLIENTCERT, "/etc/cert.pem"));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_SSLCLIENTKEY, "/etc/cert.key"));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_SSLCACERT, "/etc/ca.pem"));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_PROXY_SSLCLIENTCERT, "/etc/proxy_cert.pem"));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_PROXY_SSLCLIENTKEY, "/etc/proxy_cert.key"));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_PROXY_SSLCACERT, "/etc/proxy_ca.pem"));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_HTTPAUTHMETHODS, LR_AUTH_NTLM));

-    fail_if(!lr_handle_setopt(h, NULL, LRO_PROXYAUTHMETHODS, LR_AUTH_DIGEST));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_SSLCLIENTCERT, "/etc/cert.pem"));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_SSLCLIENTKEY, "/etc/cert.key"));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_SSLCACERT, "/etc/ca.pem"));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_PROXY_SSLCLIENTCERT, "/etc/proxy_cert.pem"));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_PROXY_SSLCLIENTKEY, "/etc/proxy_cert.key"));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_PROXY_SSLCACERT, "/etc/proxy_ca.pem"));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_HTTPAUTHMETHODS, LR_AUTH_NTLM));

+    ck_assert(lr_handle_setopt(h, NULL, LRO_PROXYAUTHMETHODS, LR_AUTH_DIGEST));

     lr_handle_free(h);

 }

 END_TEST

@@ -73,90 +73,90 @@ START_TEST(test_handle_getinfo)

     h = lr_handle_init();

     num = -1;

-    fail_if(!lr_handle_getinfo(h, &tmp_err, LRI_UPDATE, &num);;

-    fail_if(num != 0);

-    fail_if(tmp_err);

+    ck_assert(lr_handle_getinfo(h, &tmp_err, LRI_UPDATE, &num);;

+    ck_assert(num == 0);

+    ck_assert_ptr_null(tmp_err);

     strlist = NULL;

-    fail_if(!lr_handle_getinfo(h, &tmp_err, LRI_URLS, &strlist));

-    fail_if(strlist != NULL);

-    fail_if(tmp_err);

+    ck_assert(lr_handle_getinfo(h, &tmp_err, LRI_URLS, &strlist));

+    ck_assert_ptr_null(strlist);

+    ck_assert_ptr_null(tmp_err);

     str = NULL;

-    fail_if(!lr_handle_getinfo(h, NULL, LRI_MIRRORLIST, &str);;