migrate get parameter with image data

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index b5e5e1d6b860a11da0373bde2f3d460305581e52..040e27947b7851ce0060e489e04ae4a3e62bf976 100644 (file)
--- 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, &params);
 
-       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 e0709c608e07b2280a1dbdeca422ae756194f1ad..ce48628448e10f74b62251ad5548af115f104c3d 100644 (file)
--- 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 <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
 #include <check.h>
 
+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 ad722e55056a7c463a91248ec33856573f03c37c..2a0e9d310a6666f6e337fc36e52c9258a305056e 100644 (file)
--- 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;
 }