From 685075e6918189d53e928fa85a561377eaabdf04 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 25 Jan 2025 19:08:09 +0100 Subject: [PATCH] change read test order --- tests/kds_s2000w_net_read_tests.c | 58 +++++++++++++-------------- tests/kds_s2000w_net_read_tests.h | 2 +- tests/kds_s2000w_net_read_tests_run.c | 2 +- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c index 8630590..1e2d492 100644 --- 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 92b88d0..665ba42 100644 --- a/tests/kds_s2000w_net_read_tests.h +++ b/tests/kds_s2000w_net_read_tests.h @@ -6,9 +6,9 @@ #include #include +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 2cf98c1..b5e1d1e 100644 --- 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) }; -- 2.39.5