From d961bdb8eb6d0a860ef771e05b6788a68db4633d Mon Sep 17 00:00:00 2001
From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 17 Mar 2024 12:03:08 +0100
Subject: [PATCH] migrate read cancel test to cmocka

---
 tests/kds_s2000w_net_read_tests.c | 10 ++++------
 tests/kds_s2000w_net_read_tests.h |  7 +++++++
 tests/runtests.c                  | 28 ++++++++++++++++++++++++----
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index e011f4e..1a7b949 100644
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -4,7 +4,7 @@
 #include "../src/kds_s2000w_handler.h"
 #include "../src/kds_s2000w_net.h"
 
-START_TEST(sane_kds_s2000w_net_read_cancel_test)
+void sane_kds_s2000w_net_read_cancel_test()
 {
 	handler* h = init_handler();
 	h->read_info->scan_started = 1;
@@ -14,16 +14,15 @@ START_TEST(sane_kds_s2000w_net_read_cancel_test)
 
 	SANE_Status status = _sane_kds_s2000w_net_read(h, NULL, 0, length);
 
-	ck_assert_int_eq(h->read_info->cancel, 0);
-	ck_assert_int_eq(h->read_info->scan_started, 0);
-	ck_assert_int_eq(status, SANE_STATUS_CANCELLED);
+	assert_int_equal(h->read_info->cancel, 0);
+	assert_int_equal(h->read_info->scan_started, 0);
+	assert_int_equal(status, SANE_STATUS_CANCELLED);
 
 	free(length);
 	length = NULL;
 	free_handler(h);
 	h = NULL;
 }
-END_TEST
 
 START_TEST(sane_kds_s2000w_net_read_without_data)
 {
@@ -131,7 +130,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_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);
diff --git a/tests/kds_s2000w_net_read_tests.h b/tests/kds_s2000w_net_read_tests.h
index 03b4194..41a2b42 100644
--- a/tests/kds_s2000w_net_read_tests.h
+++ b/tests/kds_s2000w_net_read_tests.h
@@ -1,7 +1,14 @@
 #ifndef KDS_S2000W_NET_READ_TESTS_H
 #define KDS_S2000W_NET_READ_TESTS_H
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
 #include <check.h>
 
+void sane_kds_s2000w_net_read_cancel_test();
 Suite* net_read();
 
 #endif
\ No newline at end of file
diff --git a/tests/runtests.c b/tests/runtests.c
index 40ad115..a7271ec 100644
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -10,9 +10,9 @@
 #include "kds_s2000w_net_tests.h"
 #include "kds_s2000w_read_config_tests.h"
 
-int main()
+int run_check_tests()
 {
-	int failed = 0;
+	int result = 0;
 	Suite* kds_s2000w_net = suite_create("kds_s2000w_net");
 	SRunner* runner = srunner_create(kds_s2000w_net);
 	srunner_add_suite(runner, net_read());
@@ -20,9 +20,29 @@ int main()
 	srunner_add_suite(runner, config_read());
 
 	srunner_run_all(runner, CK_NORMAL);
-	failed = srunner_ntests_failed(runner);
+	result = srunner_ntests_failed(runner);
 	srunner_free(runner);
 	runner = NULL;
 
-	return failed == 0 ? 0 : 1;
+	return result;
+}
+
+int run_cmocka_tests()
+{
+	const struct CMUnitTest net_read_tests[] = {
+		cmocka_unit_test(sane_kds_s2000w_net_read_cancel_test)
+	};
+
+
+	return cmocka_run_group_tests(net_read_tests, NULL, NULL);
+}
+
+int main()
+{
+	int result = 0;
+
+	result = run_check_tests();
+	result = run_cmocka_tests();
+
+	return result == 0 ? 0 : 1;
 }
\ No newline at end of file
-- 
2.39.5