change net read test single file

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2bdf3499cff38ae1179de631fc135d1ea5e8f1da..8263ceecc35a838069f4902a9dc20309842bea51 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -12,12 +12,11 @@ TARGET_LINK_LIBRARIES("kds_s2000w_net_get_opt_tests"
        ${CMOCKA_LIBRARY}
        sane-kds_s2000w_net-static)
 
-ADD_EXECUTABLE("kds_s2000w_net_read_tests_run"
-       "kds_s2000w_net_read_tests_run.c"
+ADD_EXECUTABLE("kds_s2000w_net_read_tests"
        "kds_s2000w_net_read_tests.c"
        "kds_s2000w_client_mock.c")
-ADD_DEPENDENCIES("kds_s2000w_net_read_tests_run" sane-kds_s2000w_net-static)
-TARGET_LINK_LIBRARIES("kds_s2000w_net_read_tests_run"
+ADD_DEPENDENCIES("kds_s2000w_net_read_tests" sane-kds_s2000w_net-static)
+TARGET_LINK_LIBRARIES("kds_s2000w_net_read_tests"
        ${CMOCKA_LIBRARY}
        sane-kds_s2000w_net-static)
 
@@ -76,7 +75,7 @@ ADD_CUSTOM_TARGET("runningtests"
        "kds_s2000w_option_descriptor_tests_run"
        "kds_s2000w_net_get_opt_tests"
        "kds_s2000w_net_tests_run"
-       "kds_s2000w_net_read_tests_run"
+       "kds_s2000w_net_read_tests"
        "kds_s2000w_image_type_check_tests"
        "kds_s2000w_image_converter_tests")
 

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index e597776f698fa7a44940bed883e0fa9b8ec54326..dd00bc316da49d166b787412d8673c8dcfef663d 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -1,7 +1,11 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <setjmp.h>
+#include <cmocka.h>
 #include <stdlib.h>
 #include <sane/sane.h>
 #include <string.h>
-#include "kds_s2000w_net_read_tests.h"
 #include "kds_s2000w_client_mock.h"
 #include "../src/kds_s2000w_handler.h"
 #include "../src/kds_s2000w_net.h"
@@ -102,4 +106,16 @@ void sane_kds_s2000w_net_read_bytes_per_line_bigger_test()
        h->image->data = NULL;
        kds_s2000w_handler_free(h);
        h = NULL;
+}
+
+int main()
+{
+       const struct CMUnitTest net_read_tests[] = {
+               cmocka_unit_test(sane_kds_s2000w_net_read_test),
+               cmocka_unit_test(sane_kds_s2000w_net_read_without_data_test),
+               cmocka_unit_test(sane_kds_s2000w_net_read_empty_image_test),
+               cmocka_unit_test(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
+       };
+
+       return cmocka_run_group_tests(net_read_tests, NULL, NULL);
 }
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_read_tests.h b/tests/kds_s2000w_net_read_tests.h
deleted file mode 100644 (file)
index 665ba42..0000000
--- a/tests/kds_s2000w_net_read_tests.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef KDS_S2000W_NET_READ_TESTS_H
-#define KDS_S2000W_NET_READ_TESTS_H
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <setjmp.h>
-#include <cmocka.h>
-
-void sane_kds_s2000w_net_read_test();
-void sane_kds_s2000w_net_read_without_data_test();
-void sane_kds_s2000w_net_read_empty_image_test();
-void sane_kds_s2000w_net_read_bytes_per_line_bigger_test();
-
-#endif
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_read_tests_run.c b/tests/kds_s2000w_net_read_tests_run.c
deleted file mode 100644 (file)
index b5e1d1e..0000000
--- a/tests/kds_s2000w_net_read_tests_run.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "kds_s2000w_net_read_tests.h"
-
-int main()
-{
-       const struct CMUnitTest net_read_tests[] = {
-               cmocka_unit_test(sane_kds_s2000w_net_read_test),
-               cmocka_unit_test(sane_kds_s2000w_net_read_without_data_test),
-               cmocka_unit_test(sane_kds_s2000w_net_read_empty_image_test),
-               cmocka_unit_test(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
-       };
-
-       return cmocka_run_group_tests(net_read_tests, NULL, NULL);
-}
\ No newline at end of file