diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/assert-tests.c | 16 | ||||
-rw-r--r-- | test/nslayout-object-tests.c | 32 | ||||
-rw-r--r-- | test/test-loader.c | 24 | ||||
-rw-r--r-- | test/tests.c | 4 | ||||
-rw-r--r-- | test/tests.h | 8 |
5 files changed, 42 insertions, 42 deletions
diff --git a/test/assert-tests.c b/test/assert-tests.c index 44bc2f7..f30efed 100644 --- a/test/assert-tests.c +++ b/test/assert-tests.c @@ -15,34 +15,34 @@ #endif /* TODO: Test for each individual param being NULL. */ -START_TEST (test_nslayout_layout_create_aborts1) +START_TEST (test_nsl_layout_create_aborts1) { - nslayout_layout *layout; + nsl_layout *layout; - (void) nslayout_layout_create(NULL, NULL, NULL, NULL, NULL, &layout); + (void) nsl_layout_create(NULL, NULL, NULL, NULL, NULL, &layout); } END_TEST /* TODO: Test for each individual param being NULL. */ -START_TEST (test_nslayout_layout_destroy_aborts1) +START_TEST (test_nsl_layout_destroy_aborts1) { - (void) nslayout_layout_destroy(NULL); + (void) nsl_layout_destroy(NULL); } END_TEST -void nslayout_assert_suite(SRunner *sr) +void nsl_assert_suite(SRunner *sr) { Suite *s = suite_create("libnslayout: API Assert tests"); TCase *tc_assert = tcase_create("Creation/Destruction"); tcase_add_test_raise_signal( tc_assert, - test_nslayout_layout_create_aborts1, + test_nsl_layout_create_aborts1, SIGABRT); tcase_add_test_raise_signal( tc_assert, - test_nslayout_layout_destroy_aborts1, + test_nsl_layout_destroy_aborts1, SIGABRT); suite_add_tcase(s, tc_assert); diff --git a/test/nslayout-object-tests.c b/test/nslayout-object-tests.c index 612a983..4a3f2c4 100644 --- a/test/nslayout-object-tests.c +++ b/test/nslayout-object-tests.c @@ -14,21 +14,21 @@ #define UNUSED(x) (void)(x) #endif -static nslayout_error nslayout_test_callback( - nslayout_layout *layout, +static nsl_error nsl_test_callback( + nsl_layout *layout, void *pw, - nslayout_request *req) + nsl_request *req) { UNUSED(req); UNUSED(layout); UNUSED(pw); - return NSLAYOUT_OK; + return NSL_OK; } -START_TEST (test_nslayout_layout_create_ok) +START_TEST (test_nsl_layout_create_ok) { - nslayout_layout *layout = NULL; - nslayout_error error; + nsl_layout *layout = NULL; + nsl_error error; dom_exception dom_error; css_error css_err; dom_document *doc; @@ -44,24 +44,24 @@ START_TEST (test_nslayout_layout_create_ok) css_err = css_select_ctx_create(&css_ctx); ck_assert(css_err == CSS_OK); - ck_assert(nslayout_init() == NSLAYOUT_OK); + ck_assert(nsl_init() == NSL_OK); - error = nslayout_layout_create(doc, + error = nsl_layout_create(doc, css_ctx, &media, - nslayout_test_callback, + nsl_test_callback, NULL, &layout); - fail_unless(error == NSLAYOUT_OK, + fail_unless(error == NSL_OK, "Unable to create layout"); fail_unless(layout != NULL, "Returned OK but str was still NULL"); - error = nslayout_layout_destroy(layout); - fail_unless(error == NSLAYOUT_OK, + error = nsl_layout_destroy(layout); + fail_unless(error == NSL_OK, "Unable to destroy layout"); - ck_assert(nslayout_fini() == NSLAYOUT_OK); + ck_assert(nsl_fini() == NSL_OK); css_err = css_select_ctx_destroy(css_ctx); ck_assert(css_err == CSS_OK); @@ -71,12 +71,12 @@ START_TEST (test_nslayout_layout_create_ok) END_TEST -void nslayout_nslayout_object_suite(SRunner *sr) +void nsl_nsl_object_suite(SRunner *sr) { Suite *s = suite_create("libnslayout: nslayout object tests"); TCase *tc_layout_basic = tcase_create("Creation/Destruction"); - tcase_add_test(tc_layout_basic, test_nslayout_layout_create_ok); + tcase_add_test(tc_layout_basic, test_nsl_layout_create_ok); suite_add_tcase(s, tc_layout_basic); srunner_add_suite(sr, s); diff --git a/test/test-loader.c b/test/test-loader.c index 6d52691..cab08d6 100644 --- a/test/test-loader.c +++ b/test/test-loader.c @@ -19,15 +19,15 @@ #define UNUSED(x) (void)(x) #endif -static nslayout_error test_loader_nslayout_test_callback( - nslayout_layout *layout, +static nsl_error test_loader_nsl_test_callback( + nsl_layout *layout, void *pw, - nslayout_request *req) + nsl_request *req) { UNUSED(req); UNUSED(layout); UNUSED(pw); - return NSLAYOUT_OK; + return NSL_OK; } struct test_loader_buffer { @@ -293,8 +293,8 @@ static bool test_loader( css_media_type media, size_t chunk_size) { - nslayout_layout *layout = NULL; - nslayout_error error; + nsl_layout *layout = NULL; + nsl_error error; struct test_loader_ctx load_ctx; bool complete = false; bool ret = false; @@ -320,13 +320,13 @@ static bool test_loader( } printf("Creating nsl layout\n"); - error = nslayout_layout_create(load_ctx.doc, + error = nsl_layout_create(load_ctx.doc, load_ctx.css_ctx, &media, - test_loader_nslayout_test_callback, + test_loader_nsl_test_callback, NULL, &layout); - if (error != NSLAYOUT_OK) { + if (error != NSL_OK) { goto fail; } @@ -340,13 +340,13 @@ static bool test_loader( } printf("Destroying layout\n"); - error = nslayout_layout_destroy(layout); + error = nsl_layout_destroy(layout); layout = NULL; - ret = (error == NSLAYOUT_OK); + ret = (error == NSL_OK); fail: if (layout != NULL) { - nslayout_layout_destroy(layout); + nsl_layout_destroy(layout); } test_loader_css_fini(&load_ctx); dom_node_unref(load_ctx.doc); diff --git a/test/tests.c b/test/tests.c index 48fc68c..9ca987c 100644 --- a/test/tests.c +++ b/test/tests.c @@ -38,9 +38,9 @@ int main(int argc, char **argv) sr = srunner_create(suite_create("Test suite for libnslayout")); #ifndef NDEBUG - nslayout_assert_suite(sr); + nsl_assert_suite(sr); #endif - nslayout_nslayout_object_suite(sr); + nsl_nsl_object_suite(sr); srunner_set_fork_status(sr, CK_FORK); srunner_run_all(sr, CK_ENV); diff --git a/test/tests.h b/test/tests.h index 9f05d9c..fd89bea 100644 --- a/test/tests.h +++ b/test/tests.h @@ -4,8 +4,8 @@ * Copyright 2015 Michael Drake <tlsa@netsurf-browser.org> */ -#ifndef nslayout_tests_h_ -#define nslayout_tests_h_ +#ifndef nsl_tests_h_ +#define nsl_tests_h_ #include <signal.h> @@ -13,7 +13,7 @@ #include <libnslayout/nslayout.h> -extern void nslayout_assert_suite(SRunner *); -extern void nslayout_nslayout_object_suite(SRunner *); +extern void nsl_assert_suite(SRunner *); +extern void nsl_nsl_object_suite(SRunner *); #endif |