migrate read bigger read test

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index 5fd8119fe60614ad3c59b7af94d3c577f0b9332d..8229c493b26c883e1cb00dcbb678396f034ad91e 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -89,7 +89,7 @@ void sane_kds_s2000w_net_read_test()
        h = NULL;
 }
 
-START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
+void sane_kds_s2000w_net_read_bytes_per_line_bigger_test()
 {
        handler* h = init_handler();
        h->read_info->cancel = 0;
@@ -110,7 +110,7 @@ START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
        _sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length);
        _sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length);
 
-       ck_assert_int_eq(h->read_info->read_size, 95003);
+       assert_int_equal(h->read_info->read_size, 95003);
 
        free(dataptr);
        dataptr = NULL;
@@ -118,16 +118,4 @@ START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
        length = NULL;
        free_handler(h);
        h = NULL;
-}
-END_TEST
-
-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_bytes_per_line_bigger_test);
-
-       suite_add_tcase(read, net_read);
-       return read;
 }
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_read_tests.h b/tests/kds_s2000w_net_read_tests.h
index e6d75773648e1b0cf486f6a6b1a2d0eb4d1feb1d..107db579084b439b4f841b0938f7f960125e6487 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.h
+++ b/tests/kds_s2000w_net_read_tests.h
@@ -6,12 +6,10 @@
 #include <setjmp.h>
 #include <cmocka.h>
 
-#include <check.h>
-
 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();
+void sane_kds_s2000w_net_read_bytes_per_line_bigger_test();
 
 #endif
\ No newline at end of file

diff --git a/tests/runtests.c b/tests/runtests.c
index 1a47bbf23b1a9f65513012c16113853c0915cb9d..06568873d76df5e7838705dd6f8ca17b636d9384 100644 (file)
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -15,7 +15,6 @@ int run_check_tests()
        int result = 0;
        Suite* kds_s2000w_net = suite_create("kds_s2000w_net");
        SRunner* runner = srunner_create(kds_s2000w_net);
-       srunner_add_suite(runner, net_read());
        srunner_add_suite(runner, net_tests());
        srunner_add_suite(runner, config_read());
 
@@ -33,10 +32,10 @@ int run_cmocka_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_test)
+               cmocka_unit_test(sane_kds_s2000w_net_read_test),
+               cmocka_unit_test(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
        };
 
-
        return cmocka_run_group_tests(net_read_tests, NULL, NULL);
 }