change test parts

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index e47fc6b0b4f45b5211f829e1c1be0faf95d3e552..df48283edf980494af70d5098bb07dce4c11881a 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <math.h>
 #include <sane/sane.h>
-#include <config.h>
+#include "config.h"
 #include "kds_s2000w_option_descriptors.h"
 #include "kds_s2000w_handler.h"
 #include "kds_s2000w_debug.h"

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5850314d0fc48bd4103c679e4b3374b166d2e63b..dff7f9f4e80e7088e3172d6747dbc7ea31bf20db 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,4 +10,6 @@ target_link_libraries("runtests" check subunit sane-kds_s2000w_net)
 
 add_custom_target("runningtests" ALL "./runtests"
        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-       DEPENDS "runtests")
\ No newline at end of file
+       DEPENDS "runtests")
+
+target_include_directories("runtests" PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/../src")
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_get_params_tests.c b/tests/kds_s2000w_net_get_params_tests.c
index b6fcf5cdffa0eb77cc77fa7cbec15657d41a949e..c60b745f267c89e90551650bb2f64662baff48a9 100644 (file)
--- a/tests/kds_s2000w_net_get_params_tests.c
+++ b/tests/kds_s2000w_net_get_params_tests.c
@@ -29,4 +29,14 @@ START_TEST(kds_s2000w_net_get_parameters_with_image_data)
        free_handler(h);
        h = NULL;
 }
-END_TEST
\ No newline at end of file
+END_TEST
+
+Suite* get_params()
+{
+       Suite* get_params = suite_create("kds_s2000w_net_get_parameters");
+
+       TCase* net_get_params = tcase_create("get parameters");
+       tcase_add_test(net_get_params, kds_s2000w_net_get_parameters_with_image_data);
+       suite_add_tcase(get_params, net_get_params);
+       return get_params;
+}
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index 6bf84c3d991cbfb469d2384b96e90ee460381bb0..124c86727fad15c8b7c03bf22423cff3902424b5 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -143,4 +143,20 @@ START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
        free_handler(h);
        h = NULL;
 }
-END_TEST
\ No newline at end of file
+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_find_first_data_byte_test);
+       tcase_add_test(net_read, sane_kds_s2000w_net_read_cancel_test);
+       tcase_add_test(net_read, sane_kds_s2000w_net_read_without_data);
+       tcase_add_test(net_read, sane_kds_s2000w_net_read_empty_image);
+       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);
+       return read;
+}
\ No newline at end of file

diff --git a/tests/kds_s2000w_read_config_tests.c b/tests/kds_s2000w_read_config_tests.c
index 16928cd8c80e317f66337022b0c08db8f6bd46a4..f4d2f3270a1b2cbe56491d896ff5e31e963e056e 100644 (file)
--- a/tests/kds_s2000w_read_config_tests.c
+++ b/tests/kds_s2000w_read_config_tests.c
@@ -64,4 +64,18 @@ START_TEST(kds_s2000w_config_read_empty_config)
        free(config);
        config = NULL;
 }
-END_TEST
\ No newline at end of file
+END_TEST
+
+Suite* config_read()
+{
+       Suite* read_config = suite_create("kds_s2000w_net_read_config");
+
+       TCase* net_config_read = tcase_create("read config");
+       tcase_add_test(net_config_read, kds_s2000w_config_read_empty_config);
+       tcase_add_test(net_config_read, kds_s2000w_config_read_parameter);
+       tcase_add_test(net_config_read, kds_s2000w_config_read_parameters_without_trim);
+       tcase_add_test(net_config_read, kds_s2000w_config_multiple_parameters);
+       suite_add_tcase(read_config, net_config_read);
+       
+       return read_config;
+}
\ No newline at end of file

diff --git a/tests/runtests.c b/tests/runtests.c
index 4e429c65c5905f15b24c9fc3648ccd3cbb79cf8c..e3e59ba03966ca7adc2a58e7d3396492d017a2c7 100644 (file)
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -19,46 +19,6 @@ void void_mock() {}
 #include "kds_s2000w_net_get_params_tests.c"
 #include "kds_s2000w_read_config_tests.c"
 
-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_find_first_data_byte_test);
-       tcase_add_test(net_read, sane_kds_s2000w_net_read_cancel_test);
-       tcase_add_test(net_read, sane_kds_s2000w_net_read_without_data);
-       tcase_add_test(net_read, sane_kds_s2000w_net_read_empty_image);
-       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);
-       return read;
-}
-
-Suite* get_params()
-{
-       Suite* get_params = suite_create("kds_s2000w_net_get_parameters");
-
-       TCase* net_get_params = tcase_create("get parameters");
-       tcase_add_test(net_get_params, kds_s2000w_net_get_parameters_with_image_data);
-       suite_add_tcase(get_params, net_get_params);
-       return get_params;
-}
-
-Suite* config_read()
-{
-       Suite* read_config = suite_create("kds_s2000w_net_read_config");
-
-       TCase* net_config_read = tcase_create("read config");
-       tcase_add_test(net_config_read, kds_s2000w_config_read_empty_config);
-       tcase_add_test(net_config_read, kds_s2000w_config_read_parameter);
-       tcase_add_test(net_config_read, kds_s2000w_config_read_parameters_without_trim);
-       tcase_add_test(net_config_read, kds_s2000w_config_multiple_parameters);
-       suite_add_tcase(read_config, net_config_read);
-       
-       return read_config;
-}
-
 int main()
 {
        int failed = 0;