change read test order

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index 863059022ad17ad64ad5a9d92930265bb782c4be..1e2d492217a00bc33f1a552e276810dc3138d686 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -6,68 +6,68 @@
 #include "../src/kds_s2000w_handler.h"
 #include "../src/kds_s2000w_net.h"
 
-void sane_kds_s2000w_net_read_without_data_test()
+void sane_kds_s2000w_net_read_test()
 {
-       int length = 0;
        handler* h = kds_s2000w_handler_init();
-       char* dataptr = malloc(sizeof(char));
+       h->image->size = 65536;
+       h->image->data = malloc(sizeof(char) * 65536);
+       char* imagedata = (char*) h->image->data;
+       for (int i = 0; i < 65536; i++) {
+               imagedata[i] = 0xff;
+       }
 
-       SANE_Status status = sane_kds_s2000w_net_read(h, (void*) dataptr, 65536, &length);
+       SANE_Int maxlen = 65536;
+       char* dataptr = malloc(sizeof(char) * maxlen);
+       SANE_Int* length = malloc(sizeof(SANE_Int));
 
-       assert_int_equal(status, SANE_STATUS_EOF);
+       sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length);
+
+       assert_int_equal(*length, 65536);
+       assert_memory_equal(dataptr, h->image->data, 65536);
+       assert_int_equal(h->read_info->read_size, 65536);
 
        free(dataptr);
        dataptr = NULL;
+       free(length);
+       length = NULL;
+       free(h->image->data);
+       h->image->data = NULL;
        kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_read_empty_image_test()
+void sane_kds_s2000w_net_read_without_data_test()
 {
        int length = 0;
        handler* h = kds_s2000w_handler_init();
-       h->image->data = malloc(sizeof(char));
-       h->image->size = 0;
        char* dataptr = malloc(sizeof(char));
 
        SANE_Status status = sane_kds_s2000w_net_read(h, (void*) dataptr, 65536, &length);
 
        assert_int_equal(status, SANE_STATUS_EOF);
 
-       free(h->image->data);
-       h->image->data = NULL;
        free(dataptr);
        dataptr = NULL;
        kds_s2000w_handler_free(h);
        h = NULL;
 }
 
-void sane_kds_s2000w_net_read_test()
+void sane_kds_s2000w_net_read_empty_image_test()
 {
+       int length = 0;
        handler* h = kds_s2000w_handler_init();
-       h->image->size = 65536;
-       h->image->data = malloc(sizeof(char) * 65536);
-       char* imagedata = (char*) h->image->data;
-       for (int i = 0; i < 65536; i++) {
-               imagedata[i] = 0xff;
-       }
-
-       SANE_Int maxlen = 65536;
-       char* dataptr = malloc(sizeof(char) * maxlen);
-       SANE_Int* length = malloc(sizeof(SANE_Int));
+       h->image->data = malloc(sizeof(char));
+       h->image->size = 0;
+       char* dataptr = malloc(sizeof(char));
 
-       sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length);
+       SANE_Status status = sane_kds_s2000w_net_read(h, (void*) dataptr, 65536, &length);
 
-       assert_int_equal(*length, 65536);
-       assert_memory_equal(dataptr, h->image->data, 65536);
-       assert_int_equal(h->read_info->read_size, 65536);
+       assert_int_equal(status, SANE_STATUS_EOF);
 
-       free(dataptr);
-       dataptr = NULL;
-       free(length);
-       length = NULL;
        free(h->image->data);
        h->image->data = NULL;
+       free(dataptr);
+       dataptr = NULL;
        kds_s2000w_handler_free(h);
        h = NULL;
 }

diff --git a/tests/kds_s2000w_net_read_tests.h b/tests/kds_s2000w_net_read_tests.h
index 92b88d05f738e16acc21c93cd182d283cf5f3fe7..665ba42c14190a3c4a7d8fc87e80e9df96f5dc0d 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.h
+++ b/tests/kds_s2000w_net_read_tests.h
@@ -6,9 +6,9 @@
 #include <setjmp.h>
 #include <cmocka.h>
 
+void sane_kds_s2000w_net_read_test();
 void sane_kds_s2000w_net_read_without_data_test();
 void sane_kds_s2000w_net_read_empty_image_test();
-void sane_kds_s2000w_net_read_test();
 void sane_kds_s2000w_net_read_bytes_per_line_bigger_test();
 
 #endif
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_read_tests_run.c b/tests/kds_s2000w_net_read_tests_run.c
index 2cf98c1d89456f3ae87522c3ede7e8bfbb63a004..b5e1d1e62b83e72f9c3b83c1fde42b2a5874c6d7 100644 (file)
--- a/tests/kds_s2000w_net_read_tests_run.c
+++ b/tests/kds_s2000w_net_read_tests_run.c
@@ -3,9 +3,9 @@
 int main()
 {
        const struct CMUnitTest net_read_tests[] = {
+               cmocka_unit_test(sane_kds_s2000w_net_read_test),
                cmocka_unit_test(sane_kds_s2000w_net_read_without_data_test),
                cmocka_unit_test(sane_kds_s2000w_net_read_empty_image_test),
-               cmocka_unit_test(sane_kds_s2000w_net_read_test),
                cmocka_unit_test(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
        };