change merge two tests into one

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 7ced344a467bd66339e869acfca6e5f45afb13fc..5cb5acb8c4bbf00bbb6e064387129a1f707d0293 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -130,19 +130,9 @@ void kds_s2000w_net_get_devices_no_mem_device_array_test()
 
        assert_int_equal(status, SANE_STATUS_NO_MEM);
 
-       free(device_list);
-       device_list = NULL;
-       sane_kds_s2000w_net_exit();
-}
-
-void kds_s2000w_net_get_devices_no_mem_device_array_entries_test()
-{
-       SANE_Device*** device_list = malloc(sizeof(SANE_Device**));
-       if (device_list == NULL)
-               return;
-
+       status = 0;
        set_no_mem_counter(1);
-       SANE_Status status = sane_kds_s2000w_net_get_devices(device_list, 0);
+       status = sane_kds_s2000w_net_get_devices(device_list, 0);
 
        assert_int_equal(status, SANE_STATUS_NO_MEM);
 
@@ -783,7 +773,6 @@ int main()
                cmocka_unit_test(kds_s2000w_net_init_test),
                cmocka_unit_test(kds_s2000w_net_get_devices_test),
                cmocka_unit_test(kds_s2000w_net_get_devices_no_mem_device_array_test),
-               cmocka_unit_test(kds_s2000w_net_get_devices_no_mem_device_array_entries_test),
                cmocka_unit_test(kds_s2000w_net_get_devices_only_remote_test),
                cmocka_unit_test(sane_kds_s2000w_net_get_parameter_color_test),
                cmocka_unit_test(sane_kds_s2000w_net_get_parameter_bw_test),