From e77c5d70015e5eb4b90deca475f240537c6a1b34 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 12 Jan 2020 11:21:57 +1100 Subject: [PATCH] Have hasher_u32 test take a filename arg --- test/c/std/adler32.c | 29 ++++++++++------------- test/c/std/crc32.c | 29 ++++++++++------------- test/c/testlib/testlib.c | 50 +++++++++++++++++++++++++++------------- 3 files changed, 58 insertions(+), 50 deletions(-) diff --git a/test/c/std/adler32.c b/test/c/std/adler32.c index afd9ca7e..fcfd5791 100644 --- a/test/c/std/adler32.c +++ b/test/c/std/adler32.c @@ -79,6 +79,18 @@ golden_test adler32_pi_gt = { // ---------------- Adler32 Tests +const char* test_wuffs_adler32_interface() { + CHECK_FOCUS(__func__); + wuffs_adler32__hasher h; + CHECK_STATUS("initialize", + wuffs_adler32__hasher__initialize( + &h, sizeof h, WUFFS_VERSION, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); + return do_test__wuffs_base__hasher_u32( + wuffs_adler32__hasher__upcast_as__wuffs_base__hasher_u32(&h), + "test/data/hat.lossy.webp", 0, SIZE_MAX, 0xF1BB258D); +} + const char* test_wuffs_adler32_golden() { CHECK_FOCUS(__func__); @@ -159,23 +171,6 @@ const char* test_wuffs_adler32_golden() { return NULL; } -const char* test_wuffs_adler32_interface() { - CHECK_FOCUS(__func__); - wuffs_adler32__hasher h; - CHECK_STATUS("initialize", - wuffs_adler32__hasher__initialize( - &h, sizeof h, WUFFS_VERSION, - WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); - const char* digits = "3.14"; - return do_test__wuffs_base__hasher_u32( - wuffs_adler32__hasher__upcast_as__wuffs_base__hasher_u32(&h), - ((wuffs_base__slice_u8){ - .ptr = (uint8_t*)(digits), - .len = (size_t)(strlen(digits)), - }), - 0x01F000C7); -} - const char* test_wuffs_adler32_pi() { CHECK_FOCUS(__func__); diff --git a/test/c/std/crc32.c b/test/c/std/crc32.c index ab670388..e88fe554 100644 --- a/test/c/std/crc32.c +++ b/test/c/std/crc32.c @@ -79,6 +79,18 @@ golden_test crc32_pi_gt = { // ---------------- CRC32 Tests +const char* test_wuffs_crc32_ieee_interface() { + CHECK_FOCUS(__func__); + wuffs_crc32__ieee_hasher h; + CHECK_STATUS("initialize", + wuffs_crc32__ieee_hasher__initialize( + &h, sizeof h, WUFFS_VERSION, + WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); + return do_test__wuffs_base__hasher_u32( + wuffs_crc32__ieee_hasher__upcast_as__wuffs_base__hasher_u32(&h), + "test/data/hat.lossy.webp", 0, SIZE_MAX, 0x89F53B4E); +} + const char* test_wuffs_crc32_ieee_golden() { CHECK_FOCUS(__func__); @@ -159,23 +171,6 @@ const char* test_wuffs_crc32_ieee_golden() { return NULL; } -const char* test_wuffs_crc32_ieee_interface() { - CHECK_FOCUS(__func__); - wuffs_crc32__ieee_hasher h; - CHECK_STATUS("initialize", - wuffs_crc32__ieee_hasher__initialize( - &h, sizeof h, WUFFS_VERSION, - WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED)); - const char* digits = "3.14"; - return do_test__wuffs_base__hasher_u32( - wuffs_crc32__ieee_hasher__upcast_as__wuffs_base__hasher_u32(&h), - ((wuffs_base__slice_u8){ - .ptr = (uint8_t*)(digits), - .len = (size_t)(strlen(digits)), - }), - 0x16E010BE); -} - const char* do_test_xxxxx_crc32_ieee_pi(bool mimic) { const char* digits = "3." diff --git a/test/c/testlib/testlib.c b/test/c/testlib/testlib.c index a2ac1e9b..ed00ac7f 100644 --- a/test/c/testlib/testlib.c +++ b/test/c/testlib/testlib.c @@ -540,6 +540,23 @@ const char* read_file(wuffs_base__io_buffer* dst, const char* path) { return NULL; } +const char* read_file_fragment(wuffs_base__io_buffer* dst, + const char* path, + size_t ri_min, + size_t wi_max) { + CHECK_STRING(read_file(dst, path)); + if (dst->meta.ri < ri_min) { + dst->meta.ri = ri_min; + } + if (dst->meta.wi > wi_max) { + dst->meta.wi = wi_max; + } + if (dst->meta.ri > dst->meta.wi) { + RETURN_FAIL("read_file_fragment(\"%s\"): ri > wi", path); + } + return NULL; +} + char* hex_dump(char* msg, wuffs_base__io_buffer* buf, size_t i) { if (!msg || !buf) { RETURN_FAIL("hex_dump: NULL argument"); @@ -747,17 +764,27 @@ const char* do_test_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*, // -------- -const char* do_test__wuffs_base__hasher_u32(wuffs_base__hasher_u32* h, - wuffs_base__slice_u8 data, +const char* do_test__wuffs_base__hasher_u32(wuffs_base__hasher_u32* b, + const char* src_filename, + size_t src_ri, + size_t src_wi, uint32_t want) { - uint32_t got = wuffs_base__hasher_u32__update_u32(h, data); + wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ + .data = global_src_slice, + }); + CHECK_STRING(read_file_fragment(&src, src_filename, src_ri, src_wi)); + uint32_t got = wuffs_base__hasher_u32__update_u32( + b, ((wuffs_base__slice_u8){ + .ptr = (uint8_t*)(src.data.ptr + src.meta.ri), + .len = (size_t)(src.meta.wi - src.meta.ri), + })); if (got != want) { RETURN_FAIL("got 0x%08" PRIX32 ", want 0x%08" PRIX32, got, want); } return NULL; } -const char* do_test__wuffs_base__io_transformer(wuffs_base__io_transformer* t, +const char* do_test__wuffs_base__io_transformer(wuffs_base__io_transformer* b, const char* src_filename, size_t src_ri, size_t src_wi, @@ -767,7 +794,7 @@ const char* do_test__wuffs_base__io_transformer(wuffs_base__io_transformer* t, return "want_wi is too large"; } wuffs_base__range_ii_u64 workbuf_len = - wuffs_base__io_transformer__workbuf_len(t); + wuffs_base__io_transformer__workbuf_len(b); if (workbuf_len.min_incl > workbuf_len.max_incl) { return "inconsistent workbuf_len"; } @@ -781,18 +808,9 @@ const char* do_test__wuffs_base__io_transformer(wuffs_base__io_transformer* t, wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ .data = global_src_slice, }); - CHECK_STRING(read_file(&src, src_filename)); - if (src.meta.ri < src_ri) { - src.meta.ri = src_ri; - } - if (src.meta.wi > src_wi) { - src.meta.wi = src_wi; - } - if (src.meta.ri > src.meta.wi) { - return "inconsistent src_ri and src_wi"; - } + CHECK_STRING(read_file_fragment(&src, src_filename, src_ri, src_wi)); CHECK_STATUS("transform_io", wuffs_base__io_transformer__transform_io( - t, &got, &src, global_work_slice)); + b, &got, &src, global_work_slice)); if (got.meta.wi != want_wi) { RETURN_FAIL("dst wi: got %zu, want %zu", got.meta.wi, want_wi); }