dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-28 05:51:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: compression: use ut_assert for errors

Browse Source 
Use the ut_assert macros for more useful error messages.

Signed-off-by: Brandon Maier <brandon.maier@collins.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Brandon Maier
2022-12-28 16:53:52 -06:00
committed by Tom Rini
parent 43b059884a
commit bde4c49c17
1 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
test/compression.c
View File

@@ -321,51 +321,48 @@ static int run_test_internal(struct unit_test_state *uts, char *name,
/* Compress works as expected. */ /* Compress works as expected. */
printf("\torig_size:%lu\n", buf->orig_size); printf("\torig_size:%lu\n", buf->orig_size);
memset(buf->compressed_buf, 'A', TEST_BUFFER_SIZE); memset(buf->compressed_buf, 'A', TEST_BUFFER_SIZE);
errcheck(compress(uts, buf->orig_buf, buf->orig_size, ut_assertok(compress(uts, buf->orig_buf, buf->orig_size,
buf->compressed_buf, buf->compressed_size, buf->compressed_buf, buf->compressed_size,
&buf->compressed_size) == 0); &buf->compressed_size));
printf("\tcompressed_size:%lu\n", buf->compressed_size); printf("\tcompressed_size:%lu\n", buf->compressed_size);
errcheck(buf->compressed_size > 0); ut_assert(buf->compressed_size > 0);
errcheck(buf->compressed_size < buf->orig_size); ut_assert(buf->compressed_size < buf->orig_size);
errcheck(((char *)buf->compressed_buf)[buf->compressed_size - 1] != ut_assert(((char *)buf->compressed_buf)[buf->compressed_size - 1]
'A'); != 'A');
errcheck(((char *)buf->compressed_buf)[buf->compressed_size] == 'A'); ut_asserteq(((char *)buf->compressed_buf)[buf->compressed_size], 'A');
/* Uncompresses with space remaining. */ /* Uncompresses with space remaining. */
errcheck(uncompress(uts, buf->compressed_buf, buf->compressed_size, ut_assertok(uncompress(uts, buf->compressed_buf, buf->compressed_size,
buf->uncompressed_buf, buf->uncompressed_size, buf->uncompressed_buf, buf->uncompressed_size,
&buf->uncompressed_size) == 0); &buf->uncompressed_size));
printf("\tuncompressed_size:%lu\n", buf->uncompressed_size); printf("\tuncompressed_size:%lu\n", buf->uncompressed_size);
errcheck(buf->uncompressed_size == buf->orig_size); ut_asserteq(buf->uncompressed_size, buf->orig_size);
errcheck(memcmp(buf->orig_buf, buf->uncompressed_buf, ut_asserteq_mem(buf->orig_buf, buf->uncompressed_buf, buf->orig_size);
buf->orig_size) == 0);
/* Uncompresses with exactly the right size output buffer. */ /* Uncompresses with exactly the right size output buffer. */
memset(buf->uncompressed_buf, 'A', TEST_BUFFER_SIZE); memset(buf->uncompressed_buf, 'A', TEST_BUFFER_SIZE);
errcheck(uncompress(uts, buf->compressed_buf, buf->compressed_size, ut_assertok(uncompress(uts, buf->compressed_buf, buf->compressed_size,
buf->uncompressed_buf, buf->orig_size, buf->uncompressed_buf, buf->orig_size,
&buf->uncompressed_size) == 0); &buf->uncompressed_size));
errcheck(buf->uncompressed_size == buf->orig_size); ut_asserteq(buf->uncompressed_size, buf->orig_size);
errcheck(memcmp(buf->orig_buf, buf->uncompressed_buf, ut_asserteq_mem(buf->orig_buf, buf->uncompressed_buf, buf->orig_size);
buf->orig_size) == 0); ut_asserteq(((char *)buf->uncompressed_buf)[buf->orig_size], 'A');
errcheck(((char *)buf->uncompressed_buf)[buf->orig_size] == 'A');
/* Uncompresses with trailing garbage in input buffer. */ /* Uncompresses with trailing garbage in input buffer. */
memset(buf->uncompressed_buf, 'A', TEST_BUFFER_SIZE); memset(buf->uncompressed_buf, 'A', TEST_BUFFER_SIZE);
errcheck(uncompress(uts, buf->compressed_buf, buf->compressed_size + 4, ut_assertok(uncompress(uts, buf->compressed_buf, buf->compressed_size + 4,
buf->uncompressed_buf, buf->uncompressed_size, buf->uncompressed_buf, buf->uncompressed_size,
&buf->uncompressed_size) == 0); &buf->uncompressed_size));
errcheck(buf->uncompressed_size == buf->orig_size); ut_asserteq(buf->uncompressed_size, buf->orig_size);
errcheck(memcmp(buf->orig_buf, buf->uncompressed_buf, ut_asserteq_mem(buf->orig_buf, buf->uncompressed_buf, buf->orig_size);
buf->orig_size) == 0);
/* Make sure compression does not over-run. */ /* Make sure compression does not over-run. */
memset(buf->compare_buf, 'A', TEST_BUFFER_SIZE); memset(buf->compare_buf, 'A', TEST_BUFFER_SIZE);
ret = compress(uts, buf->orig_buf, buf->orig_size, ret = compress(uts, buf->orig_buf, buf->orig_size,
buf->compare_buf, buf->compressed_size - 1, buf->compare_buf, buf->compressed_size - 1,
NULL); NULL);
errcheck(((char *)buf->compare_buf)[buf->compressed_size] == 'A'); ut_asserteq(((char *)buf->compare_buf)[buf->compressed_size], 'A');
errcheck(ret != 0); ut_assert(ret != 0);
printf("\tcompress does not overrun\n"); printf("\tcompress does not overrun\n");
/* Make sure decompression does not over-run. */ /* Make sure decompression does not over-run. */
@@ -373,15 +370,12 @@ static int run_test_internal(struct unit_test_state *uts, char *name,
ret = uncompress(uts, buf->compressed_buf, buf->compressed_size, ret = uncompress(uts, buf->compressed_buf, buf->compressed_size,
buf->compare_buf, buf->uncompressed_size - 1, buf->compare_buf, buf->uncompressed_size - 1,
NULL); NULL);
errcheck(((char *)buf->compare_buf)[buf->uncompressed_size - 1] == 'A'); ut_asserteq(((char *)buf->compare_buf)[buf->uncompressed_size - 1], 'A');
errcheck(ret != 0); ut_assert(ret != 0);
printf("\tuncompress does not overrun\n"); printf("\tuncompress does not overrun\n");
/* Got here, everything is fine. */ /* Got here, everything is fine. */
ret = 0; return 0;
out:
return ret;
} }
static int run_test(struct unit_test_state *uts, char *name, static int run_test(struct unit_test_state *uts, char *name,