migrate test get devices

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 040e27947b7851ce0060e489e04ae4a3e62bf976..e8937208c3d027ada529134795899f74ba28b9e9 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -97,17 +97,17 @@ void kds_s2000w_net_get_parameters_with_image_data()
        h = NULL;
 }
 
-START_TEST(kds_s2000w_net_get_devices)
+void kds_s2000w_net_get_devices()
 {
        SANE_Device*** device_list = malloc(sizeof(SANE_Device**));
 
        _sane_kds_s2000w_net_get_devices(device_list, 0);
        
-       ck_assert_str_eq(device_list[0][0]->name, "kds_s2000w_net");
-       ck_assert_str_eq(device_list[0][0]->vendor, "Kodak");
-       ck_assert_str_eq(device_list[0][0]->model, "Kodak Alaris s2000w series");
-       ck_assert_str_eq(device_list[0][0]->type, "sheetfed scanner");
-       ck_assert_ptr_null(device_list[0][1]);
+       assert_string_equal(device_list[0][0]->name, "kds_s2000w_net");
+       assert_string_equal(device_list[0][0]->vendor, "Kodak");
+       assert_string_equal(device_list[0][0]->model, "Kodak Alaris s2000w series");
+       assert_string_equal(device_list[0][0]->type, "sheetfed scanner");
+       assert_null(device_list[0][1]);
 
        free(device_list[0][0]);
        device_list[0][0] = NULL;
@@ -116,7 +116,6 @@ START_TEST(kds_s2000w_net_get_devices)
        free(device_list);
        device_list = NULL;
 }
-END_TEST
 
 START_TEST(kds_s2000w_net_init)
 {
@@ -559,7 +558,6 @@ Suite* net_tests()
        Suite* net_tests_suite = suite_create("kds_s2000w_net");
 
        TCase* net_tests = tcase_create("kds_s2000w_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_set_io_mode);

diff --git a/tests/kds_s2000w_net_tests.h b/tests/kds_s2000w_net_tests.h
index ce48628448e10f74b62251ad5548af115f104c3d..3dd4a45aa34c065292311c6783b7536eb1a2f8e7 100644 (file)
--- a/tests/kds_s2000w_net_tests.h
+++ b/tests/kds_s2000w_net_tests.h
@@ -9,6 +9,7 @@
 #include <check.h>
 
 void kds_s2000w_net_get_parameters_with_image_data();
+void kds_s2000w_net_get_devices();
 Suite* net_tests();
 
 #endif
\ No newline at end of file

diff --git a/tests/runtests.c b/tests/runtests.c
index 2a0e9d310a6666f6e337fc36e52c9258a305056e..3890108cb1e5d987e8546e8664543c1ea8024820 100644 (file)
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -45,7 +45,8 @@ int run_cmocka_tests()
        };
 
        const struct CMUnitTest net_tests[] = {
-               cmocka_unit_test(kds_s2000w_net_get_parameters_with_image_data)
+               cmocka_unit_test(kds_s2000w_net_get_parameters_with_image_data),
+               cmocka_unit_test(kds_s2000w_net_get_devices)
        };
 
        result = cmocka_run_group_tests(net_read_tests, NULL, NULL);