From 3ab749be0d400f64f71a6d354e07525cbae946ad Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 26 Apr 2018 13:06:30 +1000 Subject: [PATCH] Test checksumming fragmented input --- test/c/std/crc32.c | 40 +++++++++++++++++++++++++++++----------- test/c/std/zlib.c | 40 +++++++++++++++++++++++++++++----------- 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/test/c/std/crc32.c b/test/c/std/crc32.c index c33ab688..fcacf5fa 100644 --- a/test/c/std/crc32.c +++ b/test/c/std/crc32.c @@ -102,17 +102,35 @@ void test_wuffs_crc32_ieee_golden() { if (!read_file(&src, test_cases[i].filename)) { return; } - wuffs_crc32__ieee checksum; - wuffs_crc32__ieee__initialize(&checksum, WUFFS_VERSION, 0); - uint32_t got = - wuffs_crc32__ieee__update(&checksum, ((wuffs_base__slice_u8){ - .ptr = src.ptr + src.ri, - .len = src.wi - src.ri, - })); - if (got != test_cases[i].want) { - FAIL("i=%d, filename=\"%s\": got 0x%08" PRIX32 ", want 0x%08" PRIX32 "\n", - i, test_cases[i].filename, got, test_cases[i].want); - return; + + int j; + for (j = 0; j < 2; j++) { + wuffs_crc32__ieee checksum; + wuffs_crc32__ieee__initialize(&checksum, WUFFS_VERSION, 0); + + uint32_t got; + size_t num_fragments = 0; + size_t num_bytes = 0; + do { + wuffs_base__slice_u8 data = ((wuffs_base__slice_u8){ + .ptr = src.ptr + num_bytes, + .len = src.wi - num_bytes, + }); + size_t limit = 101 + 103 * num_fragments; + if ((j > 0) && (data.len > limit)) { + data.len = limit; + } + got = wuffs_crc32__ieee__update(&checksum, data); + num_fragments++; + num_bytes += data.len; + } while (num_bytes < src.wi); + + if (got != test_cases[i].want) { + FAIL("i=%d, j=%d, filename=\"%s\": got 0x%08" PRIX32 + ", want 0x%08" PRIX32 "\n", + i, j, test_cases[i].filename, got, test_cases[i].want); + return; + } } } } diff --git a/test/c/std/zlib.c b/test/c/std/zlib.c index bb56668e..925774e1 100644 --- a/test/c/std/zlib.c +++ b/test/c/std/zlib.c @@ -128,17 +128,35 @@ void test_wuffs_adler32_golden() { if (!read_file(&src, test_cases[i].filename)) { return; } - wuffs_zlib__adler32 checksum; - wuffs_zlib__adler32__initialize(&checksum, WUFFS_VERSION, 0); - uint32_t got = - wuffs_zlib__adler32__update(&checksum, ((wuffs_base__slice_u8){ - .ptr = src.ptr + src.ri, - .len = src.wi - src.ri, - })); - if (got != test_cases[i].want) { - FAIL("i=%d, filename=\"%s\": got 0x%08" PRIX32 ", want 0x%08" PRIX32 "\n", - i, test_cases[i].filename, got, test_cases[i].want); - return; + + int j; + for (j = 0; j < 2; j++) { + wuffs_zlib__adler32 checksum; + wuffs_zlib__adler32__initialize(&checksum, WUFFS_VERSION, 0); + + uint32_t got; + size_t num_fragments = 0; + size_t num_bytes = 0; + do { + wuffs_base__slice_u8 data = ((wuffs_base__slice_u8){ + .ptr = src.ptr + num_bytes, + .len = src.wi - num_bytes, + }); + size_t limit = 101 + 103 * num_fragments; + if ((j > 0) && (data.len > limit)) { + data.len = limit; + } + got = wuffs_zlib__adler32__update(&checksum, data); + num_fragments++; + num_bytes += data.len; + } while (num_bytes < src.wi); + + if (got != test_cases[i].want) { + FAIL("i=%d, j=%d, filename=\"%s\": got 0x%08" PRIX32 + ", want 0x%08" PRIX32 "\n", + i, j, test_cases[i].filename, got, test_cases[i].want); + return; + } } } }