migrate read test to mocka

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index 0a2c4d2a5e455c468679b0a5535ac44c3670e177..5fd8119fe60614ad3c59b7af94d3c577f0b9332d 100644 (file)
--- 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 d3c5e905964124c2c8165ba64971fa49088f28eb..e6d75773648e1b0cf486f6a6b1a2d0eb4d1feb1d 100644 (file)
--- 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 100f9fec2bbceb2923f5a01e0f6ab71080a01123..1a47bbf23b1a9f65513012c16113853c0915cb9d 100644 (file)
--- 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)
        };