From 8ba439e66aa4be483ba50c6e49ab187bd1ef7f22 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sun, 17 Mar 2024 12:22:10 +0100 Subject: [PATCH] migrate get parameter with image data --- tests/kds_s2000w_net_tests.c | 18 ++++++++---------- tests/kds_s2000w_net_tests.h | 7 +++++++ tests/runtests.c | 5 +++++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c index b5e5e1d..040e279 100644 --- a/tests/kds_s2000w_net_tests.c +++ b/tests/kds_s2000w_net_tests.c @@ -70,7 +70,7 @@ int kds_s2000w_client_open_session(response* response) return 0; } -START_TEST(kds_s2000w_net_get_parameters_with_image_data) +void kds_s2000w_net_get_parameters_with_image_data() { handler* h = init_handler(); h->read_info->scan_started = 1; @@ -85,18 +85,17 @@ START_TEST(kds_s2000w_net_get_parameters_with_image_data) SANE_Status status = _sane_kds_s2000w_net_get_parameters(h, ¶ms); - ck_assert_int_eq(params.format, 1); - ck_assert_int_eq(params.last_frame, 0); - ck_assert_int_eq(params.bytes_per_line, 42); - ck_assert_int_eq(params.pixels_per_line, 1080); - ck_assert_int_eq(params.lines, 100); - ck_assert_int_eq(params.depth, 8); - ck_assert_int_eq(status, SANE_STATUS_GOOD); + assert_int_equal(params.format, 1); + assert_int_equal(params.last_frame, 0); + assert_int_equal(params.bytes_per_line, 42); + assert_int_equal(params.pixels_per_line, 1080); + assert_int_equal(params.lines, 100); + assert_int_equal(params.depth, 8); + assert_int_equal(status, SANE_STATUS_GOOD); free_handler(h); h = NULL; } -END_TEST START_TEST(kds_s2000w_net_get_devices) { @@ -563,7 +562,6 @@ Suite* net_tests() tcase_add_test(net_tests, kds_s2000w_net_get_devices); tcase_add_test(net_tests, kds_s2000w_net_init); tcase_add_test(net_tests, kds_s2000w_net_get_devices_only_remote); - tcase_add_test(net_tests, kds_s2000w_net_get_parameters_with_image_data); tcase_add_test(net_tests, kds_s2000w_net_set_io_mode); tcase_add_test(net_tests, kds_s2000w_net_get_select_fd); tcase_add_test(net_tests, sane_kds_s2000w_net_control_get_option_zero); diff --git a/tests/kds_s2000w_net_tests.h b/tests/kds_s2000w_net_tests.h index e0709c6..ce48628 100644 --- a/tests/kds_s2000w_net_tests.h +++ b/tests/kds_s2000w_net_tests.h @@ -1,7 +1,14 @@ #ifndef KDS_S2000W_NET_TESTS_H #define KDS_S2000W_NET_TESTS_H +#include +#include +#include +#include +#include + #include +void kds_s2000w_net_get_parameters_with_image_data(); Suite* net_tests(); #endif \ No newline at end of file diff --git a/tests/runtests.c b/tests/runtests.c index ad722e5..2a0e9d3 100644 --- a/tests/runtests.c +++ b/tests/runtests.c @@ -44,8 +44,13 @@ int run_cmocka_tests() cmocka_unit_test(kds_s2000w_config_read_empty_config) }; + const struct CMUnitTest net_tests[] = { + cmocka_unit_test(kds_s2000w_net_get_parameters_with_image_data) + }; + result = cmocka_run_group_tests(net_read_tests, NULL, NULL); result |= cmocka_run_group_tests(read_config, NULL, NULL); + result |= cmocka_run_group_tests(net_tests, NULL, NULL); return result; } -- 2.39.5