From: Bastian Dehn <hhaalo@arcor.de>
Date: Tue, 7 Oct 2025 09:52:45 +0000 (+0200)
Subject: change image type check test single file
X-Git-Tag: v1.1.9^2~2^2~5
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=dd7518ec93785e3bc34c6903f6d923efdb3625ce;p=sane-kds-s2000w-net.git

change image type check test single file
---

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8df3949..7b672e2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -57,11 +57,10 @@ TARGET_LINK_LIBRARIES("kds_s2000w_option_descriptor_tests_run"
 	${CMOCKA_LIBRARY}
 	sane-kds_s2000w_net-static)
 
-ADD_EXECUTABLE("kds_s2000w_image_type_check_tests_run"
-	"kds_s2000w_image_type_check_tests_run.c"
+ADD_EXECUTABLE("kds_s2000w_image_type_check_tests"
 	"kds_s2000w_image_type_check_tests.c")
-ADD_DEPENDENCIES("kds_s2000w_image_type_check_tests_run" sane-kds_s2000w_net-static)
-TARGET_LINK_LIBRARIES("kds_s2000w_image_type_check_tests_run"
+ADD_DEPENDENCIES("kds_s2000w_image_type_check_tests" sane-kds_s2000w_net-static)
+TARGET_LINK_LIBRARIES("kds_s2000w_image_type_check_tests"
 	${CMOCKA_LIBRARY}
 	sane-kds_s2000w_net-static)
 
@@ -71,7 +70,7 @@ ADD_CUSTOM_TARGET("runningtests"
 	COMMAND ./kds_s2000w_net_get_opt_tests_run
 	COMMAND ./kds_s2000w_net_tests_run
 	COMMAND ./kds_s2000w_net_read_tests_run
-	COMMAND ./kds_s2000w_image_type_check_tests_run
+	COMMAND ./kds_s2000w_image_type_check_tests
 	COMMAND ./kds_s2000w_image_converter_tests
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 	DEPENDS "kds_s2000w_read_config_tests_run"
@@ -79,7 +78,7 @@ ADD_CUSTOM_TARGET("runningtests"
 	"kds_s2000w_net_get_opt_tests_run"
 	"kds_s2000w_net_tests_run"
 	"kds_s2000w_net_read_tests_run"
-	"kds_s2000w_image_type_check_tests_run"
+	"kds_s2000w_image_type_check_tests"
 	"kds_s2000w_image_converter_tests")
 
 ADD_CUSTOM_TARGET("generate_gcov_coverage"
diff --git a/tests/kds_s2000w_image_type_check_tests.c b/tests/kds_s2000w_image_type_check_tests.c
index 8f07c62..aae635e 100644
--- a/tests/kds_s2000w_image_type_check_tests.c
+++ b/tests/kds_s2000w_image_type_check_tests.c
@@ -1,5 +1,9 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <setjmp.h>
+#include <cmocka.h>
 #include <stdlib.h>
-#include "kds_s2000w_image_type_check_tests.h"
 #include "../src/kds_s2000w_image_type_check.h"
 
 void kds_s2000w_image_type_check_is_tiff_true_test()
@@ -98,4 +102,18 @@ void kds_s2000w_image_type_check_is_jpeg_false_test()
 
 	free(image);
 	image = NULL;
+}
+
+int main()
+{
+	const struct CMUnitTest type_check_tests[] = {
+		cmocka_unit_test(kds_s2000w_image_type_check_is_tiff_true_test),
+		cmocka_unit_test(kds_s2000w_image_type_check_is_tiff_false_test),
+		cmocka_unit_test(kds_s2000w_image_type_check_is_pnm_true_test),
+		cmocka_unit_test(kds_s2000w_image_type_check_is_pnm_false_test),
+		cmocka_unit_test(kds_s2000w_image_type_check_is_jpeg_true_test),
+		cmocka_unit_test(kds_s2000w_image_type_check_is_jpeg_false_test),
+	};
+
+	return cmocka_run_group_tests(type_check_tests, NULL, NULL);
 }
\ No newline at end of file
diff --git a/tests/kds_s2000w_image_type_check_tests.h b/tests/kds_s2000w_image_type_check_tests.h
deleted file mode 100644
index 342280b..0000000
--- a/tests/kds_s2000w_image_type_check_tests.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef KDS_S2000W_IMAGE_TYPE_CHECK_TESTS
-#define KDS_S2000W_IMAGE_TYPE_CHECK_TESTS
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <setjmp.h>
-#include <cmocka.h>
-
-void kds_s2000w_image_type_check_is_tiff_true_test();
-void kds_s2000w_image_type_check_is_tiff_false_test();
-void kds_s2000w_image_type_check_is_pnm_true_test();
-void kds_s2000w_image_type_check_is_pnm_false_test();
-void kds_s2000w_image_type_check_is_jpeg_true_test();
-void kds_s2000w_image_type_check_is_jpeg_false_test();
-
-#endif
\ No newline at end of file
diff --git a/tests/kds_s2000w_image_type_check_tests_run.c b/tests/kds_s2000w_image_type_check_tests_run.c
deleted file mode 100644
index a646c1a..0000000
--- a/tests/kds_s2000w_image_type_check_tests_run.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "kds_s2000w_image_type_check_tests.h"
-
-int main()
-{
-	const struct CMUnitTest type_check_tests[] = {
-		cmocka_unit_test(kds_s2000w_image_type_check_is_tiff_true_test),
-		cmocka_unit_test(kds_s2000w_image_type_check_is_tiff_false_test),
-		cmocka_unit_test(kds_s2000w_image_type_check_is_pnm_true_test),
-		cmocka_unit_test(kds_s2000w_image_type_check_is_pnm_false_test),
-		cmocka_unit_test(kds_s2000w_image_type_check_is_jpeg_true_test),
-		cmocka_unit_test(kds_s2000w_image_type_check_is_jpeg_false_test),
-	};
-
-	return cmocka_run_group_tests(type_check_tests, NULL, NULL);
-}
\ No newline at end of file