migrate read test without data

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index 1a7b9494239d6cd24fb578f930554df79a74b4a6..59befbae0df51a03297fa64af7741097c5706469 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -24,7 +24,7 @@ void sane_kds_s2000w_net_read_cancel_test()
        h = NULL;
 }
 
-START_TEST(sane_kds_s2000w_net_read_without_data)
+void sane_kds_s2000w_net_read_without_data()
 {
        int length = 0;
        handler* h = init_handler();
@@ -32,14 +32,13 @@ START_TEST(sane_kds_s2000w_net_read_without_data)
 
        SANE_Status status = _sane_kds_s2000w_net_read(h, (void*) dataptr, 65536, &length);
 
-       ck_assert_int_eq(status, SANE_STATUS_EOF);
+       assert_int_equal(status, SANE_STATUS_EOF);
 
        free(dataptr);
        dataptr = NULL;
        free_handler(h);
        h = NULL;
 }
-END_TEST
 
 START_TEST(sane_kds_s2000w_net_read_empty_image)
 {
@@ -130,7 +129,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_without_data);
        tcase_add_test(net_read, sane_kds_s2000w_net_read_empty_image);
        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);

diff --git a/tests/kds_s2000w_net_read_tests.h b/tests/kds_s2000w_net_read_tests.h
index 41a2b42a48afe92edd89e2c904376fb757e1140d..02c4196ea191de2f32f7b649a7fd9dda86236b31 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.h
+++ b/tests/kds_s2000w_net_read_tests.h
@@ -9,6 +9,7 @@
 #include <check.h>
 
 void sane_kds_s2000w_net_read_cancel_test();
+void sane_kds_s2000w_net_read_without_data();
 Suite* net_read();
 
 #endif
\ No newline at end of file

diff --git a/tests/runtests.c b/tests/runtests.c
index a7271ec5e25e07b0963189c27f3b23b90735ac01..7b9cf1b95477cf85e04843a44c320d00b20abc78 100644 (file)
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -30,7 +30,8 @@ int run_check_tests()
 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_cancel_test),
+               cmocka_unit_test(sane_kds_s2000w_net_read_without_data)
        };