Have tests print all of status.repr

This commit is contained in:
Nigel Tao committed 2020-01-05 12:56:48 +11:00
1 parent 7f1572ca16
commit 0319777cce
5 files changed
+30 -48

No files matched your search

+4 -7
View File
@@ -181,7 +181,7 @@ const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
(status.repr == wuffs_base__suspension__short_read))) {
continue;
}
return wuffs_base__status__message(&status);
return status.repr;
}
}
@@ -217,9 +217,7 @@ const char* test_wuffs_deflate_decode_deflate_distance_code_31() {
const char* got = do_test_io_buffers(wuffs_deflate_decode,
&deflate_deflate_distance_code_31_gt,
UINT64_MAX, UINT64_MAX);
// The +1 caters for wuffs_deflate_decode calling
// wuffs_base__status__message.
if (got != (wuffs_deflate__error__bad_huffman_code + 1)) {
if (got != wuffs_deflate__error__bad_huffman_code) {
RETURN_FAIL("got \"%s\", want \"%s\"", got,
wuffs_deflate__error__bad_huffman_code);
}
@@ -357,13 +355,12 @@ const char* test_wuffs_deflate_decode_split_src() {
&dec, &got, &src, global_work_slice);
if (z0.repr != wuffs_base__suspension__short_read) {
RETURN_FAIL("i=%d: z0: got \"%s\", want \"%s\"", i,
wuffs_base__status__message(&z0),
RETURN_FAIL("i=%d: z0: got \"%s\", want \"%s\"", i, z0.repr,
wuffs_base__suspension__short_read);
}
if (z1.repr) {
RETURN_FAIL("i=%d: z1: got \"%s\"", i, wuffs_base__status__message(&z1));
RETURN_FAIL("i=%d: z1: got \"%s\"", i, z1.repr);
}
char prefix[64];
+18 -33
View File
@@ -596,8 +596,7 @@ const char* do_test_wuffs_gif_decode_animated(
wuffs_base__status status =
wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("decode_frame_config #%" PRIu32 ": got \"%s\"", i,
wuffs_base__status__message(&status));
RETURN_FAIL("decode_frame_config #%" PRIu32 ": \"%s\"", i, status.repr);
}
if (want_frame_config_bounds) {
@@ -616,8 +615,7 @@ const char* do_test_wuffs_gif_decode_animated(
status = wuffs_gif__decoder__decode_frame(&dec, &pb, &src,
global_work_slice, NULL);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("decode_frame #%" PRIu32 ": got \"%s\"", i,
wuffs_base__status__message(&status));
RETURN_FAIL("decode_frame #%" PRIu32 ": \"%s\"", i, status.repr);
}
wuffs_base__rect_ie_u32 frame_rect = wuffs_base__frame_config__bounds(&fc);
@@ -749,16 +747,14 @@ const char* test_wuffs_gif_decode_empty_palette() {
wuffs_base__status status =
wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("q=%d: decode_image_config: \"%s\"", q,
wuffs_base__status__message(&status));
RETURN_FAIL("q=%d: decode_image_config: \"%s\"", q, status.repr);
}
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
status = wuffs_base__pixel_buffer__set_from_slice(&pb, &ic.pixcfg,
global_pixel_slice);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("q=%d: set_from_slice: \"%s\"", q,
wuffs_base__status__message(&status));
RETURN_FAIL("q=%d: set_from_slice: \"%s\"", q, status.repr);
}
int i;
@@ -773,8 +769,7 @@ const char* test_wuffs_gif_decode_empty_palette() {
break;
}
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("q=%d: i=%d: decode_frame: \"%s\"", q, i,
wuffs_base__status__message(&status));
RETURN_FAIL("q=%d: i=%d: decode_frame: \"%s\"", q, i, status.repr);
}
wuffs_base__slice_u8 pal = wuffs_base__pixel_buffer__palette(&pb);
@@ -819,8 +814,7 @@ const char* test_wuffs_gif_decode_background_color() {
wuffs_base__status status =
wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("q=%d: decode_frame_config: \"%s\"", q,
wuffs_base__status__message(&status));
RETURN_FAIL("q=%d: decode_frame_config: \"%s\"", q, status.repr);
}
wuffs_base__color_u32_argb_premul got =
@@ -857,8 +851,7 @@ const char* test_wuffs_gif_decode_first_frame_is_opaque() {
wuffs_base__status status =
wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("q=%d: decode_image_config: \"%s\"", q,
wuffs_base__status__message(&status));
RETURN_FAIL("q=%d: decode_image_config: \"%s\"", q, status.repr);
}
bool got = wuffs_base__image_config__first_frame_is_opaque(&ic);
@@ -895,8 +888,7 @@ const char* test_wuffs_gif_decode_frame_out_of_bounds() {
wuffs_base__status status =
wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("q=%d: decode_image_config: \"%s\"", q,
wuffs_base__status__message(&status));
RETURN_FAIL("q=%d: decode_image_config: \"%s\"", q, status.repr);
}
// The nominal width and height for the overall image is 2×2, but its first
@@ -924,8 +916,7 @@ const char* test_wuffs_gif_decode_frame_out_of_bounds() {
status = wuffs_base__pixel_buffer__set_from_slice(&pb, &five_by_five,
global_pixel_slice);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("q=%d: set_from_slice: \"%s\"", q,
wuffs_base__status__message(&status));
RETURN_FAIL("q=%d: set_from_slice: \"%s\"", q, status.repr);
}
// See test/data/artificial/gif-frame-out-of-bounds.gif.make-artificial.txt
@@ -960,7 +951,7 @@ const char* test_wuffs_gif_decode_frame_out_of_bounds() {
}
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("q=%d: decode_frame_config #%" PRIu32 ": \"%s\"", q, i,
wuffs_base__status__message(&status));
status.repr);
}
wuffs_base__rect_ie_u32 got = wuffs_base__frame_config__bounds(&fc);
@@ -994,7 +985,7 @@ const char* test_wuffs_gif_decode_frame_out_of_bounds() {
global_work_slice, NULL);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("q=%d: decode_frame #%" PRIu32 ": \"%s\"", q, i,
wuffs_base__status__message(&status));
status.repr);
}
for (y = 0; y < 5; y++) {
@@ -1080,16 +1071,14 @@ const char* test_wuffs_gif_decode_zero_width_frame() {
wuffs_base__status status =
wuffs_gif__decoder__decode_image_config(&dec, &ic, &src);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("q=%d: decode_image_config: \"%s\"", q,
wuffs_base__status__message(&status));
RETURN_FAIL("q=%d: decode_image_config: \"%s\"", q, status.repr);
}
wuffs_base__pixel_buffer pb = ((wuffs_base__pixel_buffer){});
status = wuffs_base__pixel_buffer__set_from_slice(&pb, &ic.pixcfg,
global_pixel_slice);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("q=%d: set_from_slice: \"%s\"", q,
wuffs_base__status__message(&status));
RETURN_FAIL("q=%d: set_from_slice: \"%s\"", q, status.repr);
}
wuffs_base__status got = wuffs_gif__decoder__decode_frame(
@@ -1396,7 +1385,7 @@ const char* do_test_wuffs_gif_decode_metadata(bool full) {
wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("decode_frame_config (iccp=%d, xmp=%d): %s", iccp, xmp,
wuffs_base__status__message(&status));
status.repr);
}
uint32_t got = wuffs_base__frame_config__width(&fc);
uint32_t want = 1;
@@ -1504,8 +1493,7 @@ const char* test_wuffs_gif_decode_multiple_loop_counts() {
break;
}
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("decode_frame_config #%" PRIu32 ": got \"%s\"", i,
wuffs_base__status__message(&status));
RETURN_FAIL("decode_frame_config #%" PRIu32 ": \"%s\"", i, status.repr);
}
}
@@ -1756,8 +1744,7 @@ const char* do_test_wuffs_gif_io_position(bool chunked) {
wuffs_base__status status =
wuffs_gif__decoder__decode_frame_config(&dec, &fcs[i], &src);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("decode_frame_config #%d: \"%s\"", i,
wuffs_base__status__message(&status));
RETURN_FAIL("decode_frame_config #%d: \"%s\"", i, status.repr);
}
uint64_t index_got = wuffs_base__frame_config__index(&fcs[i]);
@@ -1820,8 +1807,7 @@ const char* do_test_wuffs_gif_io_position(bool chunked) {
status = wuffs_gif__decoder__restart_frame(
&dec, i, wuffs_base__frame_config__io_position(&fcs[i]));
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("restart_frame #%d: \"%s\"", i,
wuffs_base__status__message(&status));
RETURN_FAIL("restart_frame #%d: \"%s\"", i, status.repr);
}
int j;
@@ -1829,8 +1815,7 @@ const char* do_test_wuffs_gif_io_position(bool chunked) {
wuffs_base__frame_config fc = ((wuffs_base__frame_config){});
status = wuffs_gif__decoder__decode_frame_config(&dec, &fc, &src);
if (!wuffs_base__status__is_ok(&status)) {
RETURN_FAIL("decode_frame_config #%d, #%d: \"%s\"", i, j,
wuffs_base__status__message(&status));
RETURN_FAIL("decode_frame_config #%d, #%d: \"%s\"", i, j, status.repr);
}
uint64_t index_got = wuffs_base__frame_config__index(&fc);
+1 -1
View File
@@ -109,7 +109,7 @@ const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
(status.repr == wuffs_base__suspension__short_read))) {
continue;
}
return wuffs_base__status__message(&status);
return status.repr;
}
}
+1 -1
View File
@@ -120,7 +120,7 @@ const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
(status.repr == wuffs_base__suspension__short_read))) {
continue;
}
return wuffs_base__status__message(&status);
return status.repr;
}
}
+6 -6
View File
@@ -65,12 +65,12 @@ char fail_msg[65536] = {0};
#define INCR_FAIL(msg, ...) \
msg += snprintf(msg, sizeof(fail_msg) - (msg - fail_msg), ##__VA_ARGS__)
#define CHECK_STATUS(prefix, status) \
{ \
wuffs_base__status z = status; \
if (!wuffs_base__status__is_ok(&z)) { \
RETURN_FAIL("%s: \"%s\"", prefix, wuffs_base__status__message(&z)); \
} \
#define CHECK_STATUS(prefix, status) \
{ \
wuffs_base__status z = status; \
if (z.repr) { \
RETURN_FAIL("%s: \"%s\"", prefix, z.repr); \
} \
}
#define CHECK_STRING(string) \