consilitation of responses for start

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 175c7903cb136abebffb306a0484792e2cf860bb..d81bf2ef08dced650165dfb36a1778087605147a 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -519,11 +519,11 @@ void sane_kds_s2000w_net_start(void** state)
        resp_status->size = 205;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_status_session, 0);
-       will_return(mock_response, response_list[1]);
+       will_return(mock_response, response_list[0]);
        will_return(__wrap_kds_s2000w_client_get_image, 0);
-       will_return(mock_response, response_list[2]);
+       will_return(mock_response, response_list[1]);
        will_return(__wrap_kds_s2000w_client_get_metadata, 0);
-       will_return(mock_response, response_list[3]);
+       will_return(mock_response, response_list[0]);
        will_return(__wrap_kds_s2000w_client_delete_image, 0);
        handler* h = init_handler();
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";

diff --git a/tests/kds_s2000w_net_tests_run.c b/tests/kds_s2000w_net_tests_run.c
index b2d7b2792a6e7d1a8aaf91b316c75b54bc3198c5..9bab9a1d3095ac47e66aebda65b2f734c3bc9c00 100644 (file)
--- a/tests/kds_s2000w_net_tests_run.c
+++ b/tests/kds_s2000w_net_tests_run.c
@@ -59,13 +59,11 @@ int teardown_default_get_option(void** state)
 
 int setup_net_start(void** state)
 {
-       response** response_list = malloc(sizeof(response*) * 5);
+       response** response_list = malloc(sizeof(response*) * 3);
        response_list[0] = kds_s2000w_client_response_init();
        response_list[0]->code = 200;
        response_list[1] = kds_s2000w_client_response_init();
-       response_list[1]->code = 200;
-       response_list[2] = kds_s2000w_client_response_init();
-       response_list[2]->data = realloc(response_list[2]->data, 107);
+       response_list[1]->data = realloc(response_list[1]->data, 107);
        const char* metadata = "{\
                \"Metadata\": {\
                        \"BitDepth\": 8, \
@@ -74,12 +72,10 @@ int setup_net_start(void** state)
                        \"ImageHeight\": 1000, \
                }\
        }\0";
-       memcpy(response_list[2]->data, metadata, 107);
-       response_list[2]->code = 200;
-       response_list[2]->size = 107;
-       response_list[3] = kds_s2000w_client_response_init();
-       response_list[3]->code = 200;
-       response_list[4] = NULL;
+       memcpy(response_list[1]->data, metadata, 107);
+       response_list[1]->code = 200;
+       response_list[1]->size = 107;
+       response_list[2] = NULL;
        *state = response_list;
 
        return 0;