diff options
Diffstat (limited to 'test/urldbtest.c')
| -rw-r--r-- | test/urldbtest.c | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/test/urldbtest.c b/test/urldbtest.c index 75a7210b0..1c76de1ee 100644 --- a/test/urldbtest.c +++ b/test/urldbtest.c @@ -77,6 +77,9 @@ struct test_urls { #define NELEMS(x) (sizeof(x) / sizeof((x)[0])) +/* Stubs */ +nserror nslog_set_filter_by_options() { return NSERROR_OK; } + /** * generate test output filenames */ @@ -143,7 +146,7 @@ static nsurl *make_url(const char *url) { nsurl *nsurl; if (nsurl_create(url, &nsurl) != NSERROR_OK) { - LOG("failed creating nsurl"); + NSLOG(netsurf, INFO, "failed creating nsurl"); exit(1); } return nsurl; @@ -229,9 +232,8 @@ static void urldb_lwc_iterator(lwc_string *str, void *pw) { int *scount = pw; - LOG("[%3u] %.*s", str->refcnt, - (int)lwc_string_length(str), - lwc_string_data(str)); + NSLOG(netsurf, INFO, "[%3u] %.*s", str->refcnt, + (int)lwc_string_length(str), lwc_string_data(str)); (*scount)++; } @@ -245,7 +247,7 @@ static void urldb_teardown(void) corestrings_fini(); - LOG("Remaining lwc strings:"); + NSLOG(netsurf, INFO, "Remaining lwc strings:"); lwc_iterate_strings(urldb_lwc_iterator, &scount); ck_assert_int_eq(scount, 0); } @@ -712,7 +714,7 @@ static int cb_count; static bool urldb_iterate_entries_cb(nsurl *url, const struct url_data *data) { - LOG("url: %s", nsurl_access(url)); + NSLOG(netsurf, INFO, "url: %s", nsurl_access(url)); /* fprintf(stderr, "url:%s\ntitle:%s\n\n",nsurl_access(url), data->title); */ cb_count++; return true; @@ -867,27 +869,6 @@ START_TEST(urldb_auth_details_test) END_TEST -START_TEST(urldb_thumbnail_test) -{ - nsurl *url; - struct bitmap *bmap; - struct bitmap *res; - bool set; - - url = make_url(wikipedia_url); - bmap = (struct bitmap*)url; - - set = urldb_set_thumbnail(url, bmap); - ck_assert(set == true); - - res = urldb_get_thumbnail(url); - ck_assert(res != NULL); - ck_assert(res == bmap); - - nsurl_unref(url); -} -END_TEST - START_TEST(urldb_cert_permissions_test) { nsurl *url; @@ -983,7 +964,6 @@ static TCase *urldb_case_create(void) tcase_add_test(tc, urldb_iterate_partial_numeric_v4_test); tcase_add_test(tc, urldb_iterate_partial_numeric_v6_test); tcase_add_test(tc, urldb_auth_details_test); - tcase_add_test(tc, urldb_thumbnail_test); tcase_add_test(tc, urldb_cert_permissions_test); tcase_add_test(tc, urldb_update_visit_test); tcase_add_test(tc, urldb_reset_visit_test); @@ -995,7 +975,7 @@ static TCase *urldb_case_create(void) static bool urldb_iterate_cookies_cb(const struct cookie_data *data) { - LOG("%p", data); + NSLOG(netsurf, INFO, "%p", data); /* fprintf(stderr, "domain:%s\npath:%s\nname:%s\n\n",data->domain, data->path, data->name);*/ return true; } |