From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 17 Mar 2024 11:18:36 +0000 (+0100)
Subject: migrate read config tests
X-Git-Tag: v1.0.0^2~73^2~13
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=27bf06c17fbdf815ac09a154343d9de006ac44cb;p=sane-kds-s2000w-net.git

migrate read config tests
---

diff --git a/tests/kds_s2000w_read_config_tests.c b/tests/kds_s2000w_read_config_tests.c
index 1598864..bda7a37 100644
--- a/tests/kds_s2000w_read_config_tests.c
+++ b/tests/kds_s2000w_read_config_tests.c
@@ -2,14 +2,14 @@
 #include "kds_s2000w_read_config_tests.h"
 #include "../src/kds_s2000w_config.h"
 
-START_TEST(kds_s2000w_config_read_parameter)
+void kds_s2000w_config_read_parameter()
 {
 	const char* input_stream = "   scanner_url   =   http://scanner.example.com    \n";
 
 	program_config* config = malloc(sizeof(program_config));
 	load_config(config, input_stream);
 
-	ck_assert_str_eq(config->scanner_url, "http://scanner.example.com");
+	assert_string_equal(config->scanner_url, "http://scanner.example.com");
 
 	free(config->scanner_url);
 	config->scanner_url = NULL;
@@ -18,16 +18,15 @@ START_TEST(kds_s2000w_config_read_parameter)
 	free(config);
 	config = NULL;
 }
-END_TEST
 
-START_TEST(kds_s2000w_config_read_parameters_without_trim)
+void kds_s2000w_config_read_parameters_without_trim()
 {
 	const char* input_stream = "scanner_url=http://scanner.example.com\n";
 
 	program_config* config = malloc(sizeof(program_config));
 	load_config(config, input_stream);
 
-	ck_assert_str_eq(config->scanner_url, "http://scanner.example.com");
+	assert_string_equal(config->scanner_url, "http://scanner.example.com");
 
 	free(config->scanner_url);
 	config->scanner_url = NULL;
@@ -36,17 +35,16 @@ START_TEST(kds_s2000w_config_read_parameters_without_trim)
 	free(config);
 	config = NULL;
 }
-END_TEST
 
-START_TEST(kds_s2000w_config_multiple_parameters)
+void kds_s2000w_config_multiple_parameters()
 {
 	const char* input_stream = "scanner_url=http://scanner.example.com\nusername=Mustermann\n";
 
 	program_config* config = malloc(sizeof(program_config));
 	load_config(config, input_stream);
 
-	ck_assert_str_eq(config->scanner_url, "http://scanner.example.com");
-	ck_assert_str_eq(config->username, "Mustermann");
+	assert_string_equal(config->scanner_url, "http://scanner.example.com");
+	assert_string_equal(config->username, "Mustermann");
 
 	free(config->scanner_url);
 	config->scanner_url = NULL;
@@ -55,32 +53,16 @@ START_TEST(kds_s2000w_config_multiple_parameters)
 	free(config);
 	config = NULL;
 }
-END_TEST
 
-START_TEST(kds_s2000w_config_read_empty_config)
+void kds_s2000w_config_read_empty_config()
 {
 	const char* input_stream = "";
 
 	program_config* config = malloc(sizeof(program_config));
 	load_config(config, input_stream);
 
-	ck_assert_ptr_null(config->scanner_url);
+	assert_null(config->scanner_url);
 
 	free(config);
 	config = NULL;
-}
-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/kds_s2000w_read_config_tests.h b/tests/kds_s2000w_read_config_tests.h
index 45a88d9..68d91a7 100644
--- a/tests/kds_s2000w_read_config_tests.h
+++ b/tests/kds_s2000w_read_config_tests.h
@@ -1,7 +1,14 @@
 #ifndef KDS_S2000W_READ_CONFIG_TESTS_H
 #define KDS_S2000W_READ_CONFIG_TESTS_H
-#include <check.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <setjmp.h>
+#include <cmocka.h>
 
-Suite* config_read();
+void kds_s2000w_config_read_parameter();
+void kds_s2000w_config_read_parameters_without_trim();
+void kds_s2000w_config_multiple_parameters();
+void kds_s2000w_config_read_empty_config();
 
 #endif
\ No newline at end of file
diff --git a/tests/runtests.c b/tests/runtests.c
index 0656887..ad722e5 100644
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -16,7 +16,6 @@ int run_check_tests()
 	Suite* kds_s2000w_net = suite_create("kds_s2000w_net");
 	SRunner* runner = srunner_create(kds_s2000w_net);
 	srunner_add_suite(runner, net_tests());
-	srunner_add_suite(runner, config_read());
 
 	srunner_run_all(runner, CK_NORMAL);
 	result = srunner_ntests_failed(runner);
@@ -28,6 +27,8 @@ int run_check_tests()
 
 int run_cmocka_tests()
 {
+	int result = 0;
+
 	const struct CMUnitTest net_read_tests[] = {
 		cmocka_unit_test(sane_kds_s2000w_net_read_cancel_test),
 		cmocka_unit_test(sane_kds_s2000w_net_read_without_data),
@@ -36,7 +37,17 @@ int run_cmocka_tests()
 		cmocka_unit_test(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
 	};
 
-	return cmocka_run_group_tests(net_read_tests, NULL, NULL);
+	const struct CMUnitTest read_config[] = {
+		cmocka_unit_test(kds_s2000w_config_read_parameter),
+		cmocka_unit_test(kds_s2000w_config_read_parameters_without_trim),
+		cmocka_unit_test(kds_s2000w_config_multiple_parameters),
+		cmocka_unit_test(kds_s2000w_config_read_empty_config)
+	};
+
+	result = cmocka_run_group_tests(net_read_tests, NULL, NULL);
+	result |= cmocka_run_group_tests(read_config, NULL, NULL);
+
+	return result;
 }
 
 int main()
@@ -44,7 +55,7 @@ int main()
 	int result = 0;
 
 	result = run_check_tests();
-	result = run_cmocka_tests();
+	result |= run_cmocka_tests();
 
 	return result == 0 ? 0 : 1;
 }
\ No newline at end of file