From: Bastian Dehn <hhaalo@arcor.de>
Date: Mon, 11 Mar 2024 19:36:08 +0000 (+0100)
Subject: add header files for tests
X-Git-Tag: v1.0.0^2~112
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=2c0c1596e71ed178752d9f3360aed25cf4dfe66e;p=sane-kds-s2000w-net.git

add header files for tests
---

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 3455199..8224f86 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -3,8 +3,8 @@
 #include <string.h>
 #include <unistd.h>
 #include <math.h>
-#include <sane/sane.h>
 #include "config.h"
+#include "kds_s2000w_net.h"
 #include "kds_s2000w_option_descriptors.h"
 #include "kds_s2000w_handler.h"
 #include "kds_s2000w_debug.h"
diff --git a/src/kds_s2000w_net.h b/src/kds_s2000w_net.h
new file mode 100644
index 0000000..e20f990
--- /dev/null
+++ b/src/kds_s2000w_net.h
@@ -0,0 +1,18 @@
+#ifndef KDS_S2000W_NET_H
+#define KDS_S2000W_NET_H
+#include <sane/sane.h>
+
+SANE_Status _sane_kds_s2000w_net_init(SANE_Int* version_code, SANE_Auth_Callback authorize);
+void _sane_kds_s2000w_net_exit(void);
+SANE_Status _sane_kds_s2000w_net_get_devices(SANE_Device*** device_list, SANE_Bool local_only);
+SANE_Status _sane_kds_s2000w_net_open(SANE_String_Const devicename, SANE_Handle* handle);
+void _sane_kds_s2000w_net_close(SANE_Handle handle);
+const SANE_Option_Descriptor* _sane_kds_s2000w_net_get_option_descriptor(SANE_Handle handle, SANE_Int option);
+void _sane_kds_s2000w_net_cancel(SANE_Handle handle);
+SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,	SANE_Parameters* params);
+SANE_Status _sane_kds_s2000w_net_start(SANE_Handle handle);
+SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data, SANE_Int max_length, SANE_Int* length);
+SANE_Status _sane_kds_s2000w_net_set_io_mode(SANE_Handle handle, SANE_Bool non_blocking);
+SANE_Status _sane_kds_s2000w_net_get_select_fd(SANE_Handle handle, SANE_Int* fd);
+
+#endif
\ No newline at end of file
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index dff7f9f..6d97c21 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,7 +4,11 @@ find_library(CHECK NAMES check REQUIRED)
 find_library(SUBUNIT NAMES subunit REQUIRED)
 find_library(MATH NAMES m REQUIRED)
 
-add_executable("runtests" "runtests.c")
+add_executable("runtests"
+	"kds_s2000w_net_read_tests.c"
+	"kds_s2000w_net_tests.c"
+	"kds_s2000w_read_config_tests.c"
+	"runtests.c")
 add_dependencies("runtests" sane-kds_s2000w_net)
 target_link_libraries("runtests" check subunit sane-kds_s2000w_net)
 
diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index bee8d41..b6e1fcd 100644
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -1,22 +1,8 @@
-#include <check.h>
 #include <stdlib.h>
 #include <sane/sane.h>
-#include "../src/kds_s2000w_net.c"
-
-START_TEST(sane_kds_s2000w_net_find_first_data_byte_test)
-{
-	char data[] = {
-		0x50, 0x36, 0x0a, 0x31,
-		0x31, 0x35, 0x39, 0x20,
-		0x38, 0x32, 0x39, 0x0a,
-		0x32, 0x35, 0x35, 0x0a
-	};
-
-	int header_bytes = _sane_kds_s2000w_net_find_first_data_byte(data);
-
-	ck_assert_int_eq(header_bytes, 16);
-}
-END_TEST
+#include "kds_s2000w_net_read_tests.h"
+#include "../src/kds_s2000w_handler.h"
+#include "../src/kds_s2000w_net.h"
 
 START_TEST(sane_kds_s2000w_net_read_cancel_test)
 {
@@ -150,7 +136,6 @@ 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);
diff --git a/tests/kds_s2000w_net_read_tests.h b/tests/kds_s2000w_net_read_tests.h
new file mode 100644
index 0000000..03b4194
--- /dev/null
+++ b/tests/kds_s2000w_net_read_tests.h
@@ -0,0 +1,7 @@
+#ifndef KDS_S2000W_NET_READ_TESTS_H
+#define KDS_S2000W_NET_READ_TESTS_H
+#include <check.h>
+
+Suite* net_read();
+
+#endif
\ No newline at end of file
diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 56d2045..ebe9772 100644
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -1,6 +1,7 @@
-#include <check.h>
 #include <stdlib.h>
 #include <sane/sane.h>
+#include "kds_s2000w_net_tests.h"
+#include "../src/kds_s2000w_net.h"
 #include "../src/kds_s2000w_handler.h"
 
 START_TEST(kds_s2000w_net_get_parameters_with_image_data)
diff --git a/tests/kds_s2000w_net_tests.h b/tests/kds_s2000w_net_tests.h
new file mode 100644
index 0000000..e0709c6
--- /dev/null
+++ b/tests/kds_s2000w_net_tests.h
@@ -0,0 +1,7 @@
+#ifndef KDS_S2000W_NET_TESTS_H
+#define KDS_S2000W_NET_TESTS_H
+#include <check.h>
+
+Suite* net_tests();
+
+#endif
\ 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 f4d2f32..c6ebe59 100644
--- a/tests/kds_s2000w_read_config_tests.c
+++ b/tests/kds_s2000w_read_config_tests.c
@@ -1,4 +1,5 @@
-#include <check.h>
+#include <stdlib.h>
+#include "kds_s2000w_read_config_tests.h"
 #include "../src/kds_s2000w_config.h"
 
 START_TEST(kds_s2000w_config_read_parameter)
diff --git a/tests/kds_s2000w_read_config_tests.h b/tests/kds_s2000w_read_config_tests.h
new file mode 100644
index 0000000..45a88d9
--- /dev/null
+++ b/tests/kds_s2000w_read_config_tests.h
@@ -0,0 +1,7 @@
+#ifndef KDS_S2000W_READ_CONFIG_TESTS_H
+#define KDS_S2000W_READ_CONFIG_TESTS_H
+#include <check.h>
+
+Suite* config_read();
+
+#endif
\ No newline at end of file
diff --git a/tests/runtests.c b/tests/runtests.c
index dedd97d..935c55c 100644
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -1,8 +1,8 @@
 #include <check.h>
 #include <unistd.h>
-#include "kds_s2000w_net_read_tests.c"
-#include "kds_s2000w_net_tests.c"
-#include "kds_s2000w_read_config_tests.c"
+#include "kds_s2000w_net_read_tests.h"
+#include "kds_s2000w_net_tests.h"
+#include "kds_s2000w_read_config_tests.h"
 
 int main()
 {