From: Bastian Dehn Date: Sun, 17 Mar 2024 11:09:19 +0000 (+0100) Subject: migrate read test to mocka X-Git-Tag: v1.0.0^2~73^2~15 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=0bc8ab8ceeac0a3641de4903fbd50ed2274fd0e5;p=sane-kds-s2000w-net.git migrate read test to mocka --- diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c index 0a2c4d2..5fd8119 100644 --- a/tests/kds_s2000w_net_read_tests.c +++ b/tests/kds_s2000w_net_read_tests.c @@ -58,7 +58,7 @@ void sane_kds_s2000w_net_read_empty_image() h = NULL; } -START_TEST(sane_kds_s2000w_net_read_test) +void sane_kds_s2000w_net_read_test() { handler* h = init_handler(); h->pnm_image->size = 65539; @@ -77,9 +77,9 @@ START_TEST(sane_kds_s2000w_net_read_test) _sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length); - ck_assert_int_eq(*length, 65536); - ck_assert_mem_eq(dataptr, h->pnm_image->data + 3, 65536); - ck_assert_int_eq(h->read_info->read_size, 65539); + assert_int_equal(*length, 65536); + assert_memory_equal(dataptr, h->pnm_image->data + 3, 65536); + assert_int_equal(h->read_info->read_size, 65539); free(dataptr); dataptr = NULL; @@ -88,8 +88,6 @@ START_TEST(sane_kds_s2000w_net_read_test) free_handler(h); h = NULL; } -END_TEST - START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test) { @@ -128,7 +126,6 @@ Suite* net_read() Suite* read = suite_create("kds_s2000w_net_read"); TCase* net_read = tcase_create("read"); - tcase_add_test(net_read, sane_kds_s2000w_net_read_test); tcase_add_test(net_read, sane_kds_s2000w_net_read_bytes_per_line_bigger_test); suite_add_tcase(read, net_read); diff --git a/tests/kds_s2000w_net_read_tests.h b/tests/kds_s2000w_net_read_tests.h index d3c5e90..e6d7577 100644 --- a/tests/kds_s2000w_net_read_tests.h +++ b/tests/kds_s2000w_net_read_tests.h @@ -11,6 +11,7 @@ void sane_kds_s2000w_net_read_cancel_test(); void sane_kds_s2000w_net_read_without_data(); void sane_kds_s2000w_net_read_empty_image(); +void sane_kds_s2000w_net_read_test(); Suite* net_read(); #endif \ No newline at end of file diff --git a/tests/runtests.c b/tests/runtests.c index 100f9fe..1a47bbf 100644 --- a/tests/runtests.c +++ b/tests/runtests.c @@ -32,7 +32,8 @@ int run_cmocka_tests() const struct CMUnitTest net_read_tests[] = { cmocka_unit_test(sane_kds_s2000w_net_read_cancel_test), cmocka_unit_test(sane_kds_s2000w_net_read_without_data), - cmocka_unit_test(sane_kds_s2000w_net_read_empty_image) + cmocka_unit_test(sane_kds_s2000w_net_read_empty_image), + cmocka_unit_test(sane_kds_s2000w_net_read_test) };