migrate open test

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 092c4644bae779808ec3b6b51a3530b31cb4f6da..3c372853e3bf89daf0db8b96ec7c7cd6905c8681 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,11 @@ else()
        -ftest-coverage \
        -Wall \
        -Xlinker \
-        --wrap=kds_s2000w_client_get_option \
-        --wrap=kds_s2000w_client_stop_scan" CACHE STRING "test coverage compiler flags")
+       --wrap=kds_s2000w_client_get_option \
+       -Xlinker \
+       --wrap=kds_s2000w_client_stop_scan \
+       -Xlinker \
+       --wrap=kds_s2000w_client_open_session" CACHE STRING "test coverage compiler flags")
 endif()
 
 message(STATUS "CMAKE_C_FLAGS " ${CMAKE_C_FLAGS})

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 8a152f98adefe6afd2ad67fcc997d7f08f59c347..72b50e4231d406403c23d77adb151b8958fb9bbe 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <sane/sane.h>
+#include <string.h>
 #include "kds_s2000w_net_tests.h"
 #include "../src/kds_s2000w_client.h"
 #include "../src/kds_s2000w_net.h"
@@ -57,7 +58,7 @@ int __wrap_kds_s2000w_client_stop_scan(int64_t sessionid, response* response)
        return mock_type(int);
 }
 
-int kds_s2000w_client_open_session(response* response)
+int __wrap_kds_s2000w_client_open_session(response* response)
 {
        response->data = realloc(response->data, 27);
        const char* responsedata = "{\"SessionId\":\"1251877821\"}\0";
@@ -67,7 +68,7 @@ int kds_s2000w_client_open_session(response* response)
        response->code = 200;
        response->size = sizeof(response->data);
 
-       return 0;
+       return mock_type(int);
 }
 
 void kds_s2000w_net_get_parameters_with_image_data()
@@ -519,6 +520,7 @@ void sane_kds_s2000w_net_get_parameter_cancel()
 
 void sane_kds_s2000w_net_cancel()
 {
+       will_return(__wrap_kds_s2000w_client_stop_scan, 0);
        handler* h = init_handler();
 
        _sane_kds_s2000w_net_cancel(h);
@@ -529,29 +531,19 @@ void sane_kds_s2000w_net_cancel()
        h = NULL;
 }
 
-START_TEST(sane_kds_s2000w_net_open)
+void sane_kds_s2000w_net_open()
 {
+       will_return(__wrap_kds_s2000w_client_open_session, 0);
        void** hlist = malloc(sizeof(void*));
 
        SANE_Status status = _sane_kds_s2000w_net_open("kds_s2000w_net", hlist);
        handler* h = (handler*) *hlist;
 
-       ck_assert_int_eq(h->sessionid, 1251877821);
-       ck_assert_int_eq(status, SANE_STATUS_GOOD);
+       assert_int_equal(h->sessionid, 1251877821);
+       assert_int_equal(status, SANE_STATUS_GOOD);
 
        free_handler(h);
        h = NULL;
        free(hlist);
        hlist = 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, sane_kds_s2000w_net_open);
-       suite_add_tcase(net_tests_suite, net_tests);
-       return net_tests_suite;
 }
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_tests.h b/tests/kds_s2000w_net_tests.h
index 9bae39a14e9905ce4c65ca63b0c8824494714b78..3f2334c98b33199f0438284e7956ac38b3025803 100644 (file)
--- a/tests/kds_s2000w_net_tests.h
+++ b/tests/kds_s2000w_net_tests.h
@@ -6,8 +6,6 @@
 #include <setjmp.h>
 #include <cmocka.h>
 
-#include <check.h>
-
 void kds_s2000w_net_get_parameters_with_image_data();
 void kds_s2000w_net_get_devices();
 void kds_s2000w_net_init();
@@ -38,6 +36,6 @@ void sane_kds_s2000w_net_control_get_option_twentytwo();
 void sane_kds_s2000w_net_start_cancel();
 void sane_kds_s2000w_net_get_parameter_cancel();
 void sane_kds_s2000w_net_cancel();
-Suite* net_tests();
+void sane_kds_s2000w_net_open();
 
 #endif
\ No newline at end of file

diff --git a/tests/runtests.c b/tests/runtests.c
index 0f1cb7f4bd322e2a562aff1bf833145ab2ee404d..bb7ad153ac1cb9df68bc0680095dda732cd9b759 100644 (file)
--- a/tests/runtests.c
+++ b/tests/runtests.c
@@ -3,28 +3,10 @@
 #include <stdint.h>
 #include <setjmp.h>
 #include <cmocka.h>
-
-#include <check.h>
-#include <unistd.h>
 #include "kds_s2000w_net_read_tests.h"
 #include "kds_s2000w_net_tests.h"
 #include "kds_s2000w_read_config_tests.h"
 
-int run_check_tests()
-{
-       int result = 0;
-       Suite* kds_s2000w_net = suite_create("kds_s2000w_net");
-       SRunner* runner = srunner_create(kds_s2000w_net);
-       srunner_add_suite(runner, net_tests());
-
-       srunner_run_all(runner, CK_NORMAL);
-       result = srunner_ntests_failed(runner);
-       srunner_free(runner);
-       runner = NULL;
-
-       return result;
-}
-
 int run_cmocka_tests()
 {
        int result = 0;
@@ -74,7 +56,8 @@ int run_cmocka_tests()
                cmocka_unit_test(sane_kds_s2000w_net_control_get_option_twentytwo),
                cmocka_unit_test(sane_kds_s2000w_net_start_cancel),
                cmocka_unit_test(sane_kds_s2000w_net_get_parameter_cancel),
-               cmocka_unit_test(sane_kds_s2000w_net_cancel)
+               cmocka_unit_test(sane_kds_s2000w_net_cancel),
+               cmocka_unit_test(sane_kds_s2000w_net_open)
        };
 
        result = cmocka_run_group_tests(net_read_tests, NULL, NULL);
@@ -86,10 +69,5 @@ int run_cmocka_tests()
 
 int main()
 {
-       int result = 0;
-
-       result = run_check_tests();
-       result |= run_cmocka_tests();
-
-       return result == 0 ? 0 : 1;
+       return run_cmocka_tests();
 }
\ No newline at end of file