rename tests with net tests

diff --git a/tests/kds_s2000w_net_get_params_tests.c b/tests/kds_s2000w_net_get_params_tests.c
deleted file mode 100644 (file)
index c60b745..0000000
--- a/tests/kds_s2000w_net_get_params_tests.c
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <check.h>
-#include <stdlib.h>
-#include <sane/sane.h>
-#include "../src/kds_s2000w_handler.h"
-
-START_TEST(kds_s2000w_net_get_parameters_with_image_data)
-{
-       handler* h = init_handler();
-       h->read_info->scan_started = 1;
-       h->current_metadata->valid = 1;
-       h->current_metadata->format = 1;
-       h->current_metadata->is_last = 0;
-       h->current_metadata->bytes_per_line = 42;
-       h->current_metadata->pixels_per_line = 1080;
-       h->current_metadata->lines = 100;
-       h->current_metadata->depth = 8;
-       SANE_Parameters params;
-
-       SANE_Status status = _sane_kds_s2000w_net_get_parameters(h, &params);
-
-       ck_assert_int_eq(params.format, 1);
-       ck_assert_int_eq(params.last_frame, 0);
-       ck_assert_int_eq(params.bytes_per_line, 42);
-       ck_assert_int_eq(params.pixels_per_line, 1080);
-       ck_assert_int_eq(params.lines, 100);
-       ck_assert_int_eq(params.depth, 8);
-       ck_assert_int_eq(status, SANE_STATUS_GOOD);
-
-       free_handler(h);
-       h = NULL;
-}
-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_tests.c b/tests/kds_s2000w_net_tests.c
new file mode 100644 (file)
index 0000000..3a06b7f
--- /dev/null
+++ b/tests/kds_s2000w_net_tests.c
@@ -0,0 +1,42 @@
+#include <check.h>
+#include <stdlib.h>
+#include <sane/sane.h>
+#include "../src/kds_s2000w_handler.h"
+
+START_TEST(kds_s2000w_net_get_parameters_with_image_data)
+{
+       handler* h = init_handler();
+       h->read_info->scan_started = 1;
+       h->current_metadata->valid = 1;
+       h->current_metadata->format = 1;
+       h->current_metadata->is_last = 0;
+       h->current_metadata->bytes_per_line = 42;
+       h->current_metadata->pixels_per_line = 1080;
+       h->current_metadata->lines = 100;
+       h->current_metadata->depth = 8;
+       SANE_Parameters params;
+
+       SANE_Status status = _sane_kds_s2000w_net_get_parameters(h, &params);
+
+       ck_assert_int_eq(params.format, 1);
+       ck_assert_int_eq(params.last_frame, 0);
+       ck_assert_int_eq(params.bytes_per_line, 42);
+       ck_assert_int_eq(params.pixels_per_line, 1080);
+       ck_assert_int_eq(params.lines, 100);
+       ck_assert_int_eq(params.depth, 8);
+       ck_assert_int_eq(status, SANE_STATUS_GOOD);
+
+       free_handler(h);
+       h = NULL;
+}
+END_TEST
+
+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_parameters_with_image_data);
+       suite_add_tcase(net_tests_suite, net_tests);
+       return net_tests_suite;
+}
\ No newline at end of file

diff --git a/tests/runtests.c b/tests/runtests.c
index 714762d0f981f18ae9537a8531a1ab429e3eefb3..dedd97db77172bc09471db85744f3d0890cce47a 100644 (file)
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -1,7 +1,7 @@
 #include <check.h>
 #include <unistd.h>
 #include "kds_s2000w_net_read_tests.c"
-#include "kds_s2000w_net_get_params_tests.c"
+#include "kds_s2000w_net_tests.c"
 #include "kds_s2000w_read_config_tests.c"
 
 int main()
@@ -10,7 +10,7 @@ int main()
        Suite* kds_s2000w_net = suite_create("kds_s2000w_net");
        SRunner* runner = srunner_create(kds_s2000w_net);
        srunner_add_suite(runner, net_read());
-       srunner_add_suite(runner, get_params());
+       srunner_add_suite(runner, net_tests());
        srunner_add_suite(runner, config_read());
 
        srunner_run_all(runner, CK_NORMAL);