From 3642d73714cd50e9fb92382436f68057a0a26470 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 16 Nov 2021 15:37:57 +1100 Subject: [PATCH] Factor test/data/artificial into many directories --- test/c/std/deflate.c | 40 +++++++++--------- test/c/std/gif.c | 34 +++++++-------- test/data/README.md | 6 +-- .../backref-crosses-blocks.deflate} | Bin ...ref-crosses-blocks.deflate.commentary.txt} | 4 +- ...ckref-crosses-blocks.deflate.decompressed} | 0 ...rosses-blocks.deflate.make-artificial.txt} | 0 .../degenerate-huffman-unused.deflate} | Bin ...ate-huffman-unused.deflate.commentary.txt} | 4 +- ...erate-huffman-unused.deflate.decompressed} | 0 ...uffman-unused.deflate.make-artificial.txt} | 0 .../distance-32768.deflate} | Bin .../distance-32768.deflate.commentary.txt} | 2 +- .../distance-32768.deflate.decompressed} | 0 ...istance-32768.deflate.make-artificial.txt} | 0 .../distance-code-31.deflate} | 0 .../distance-code-31.deflate.commentary.txt} | 4 +- .../distance-code-31.deflate.decompressed} | 0 ...tance-code-31.deflate.make-artificial.txt} | 0 .../huffman-primlen-9.deflate} | 0 .../huffman-primlen-9.deflate.commentary.txt} | 4 +- .../huffman-primlen-9.deflate.decompressed} | 0 ...man-primlen-9.deflate.make-artificial.txt} | 0 .../background-color.gif} | Bin .../background-color.gif.make-artificial.txt} | 0 .../empty-palette.gif} | Bin .../empty-palette.gif.make-artificial.txt} | 0 .../frame-out-of-bounds.gif} | Bin ...ame-out-of-bounds.gif.make-artificial.txt} | 0 .../metadata-empty.gif} | Bin .../metadata-empty.gif.make-artificial.txt} | 0 .../metadata-full.gif} | Bin .../metadata-full.gif.make-artificial.txt} | 0 .../multiple-graphic-controls.gif} | Bin ...-graphic-controls.gif.make-artificial.txt} | 0 .../multiple-loop-counts.gif} | Bin ...tiple-loop-counts.gif.make-artificial.txt} | 0 .../no-frames.gif} | Bin .../no-frames.gif.make-artificial.txt} | 0 .../pixel-data-none.gif} | Bin .../pixel-data-none.gif.make-artificial.txt} | 0 .../pixel-data-not-enough.gif} | Bin ...l-data-not-enough.gif.make-artificial.txt} | 0 .../pixel-data-too-much.gif} | Bin ...xel-data-too-much.gif.make-artificial.txt} | 0 .../small-frame-interlaced.gif} | Bin ...-frame-interlaced.gif.make-artificial.txt} | 0 .../transparent-index.gif} | Bin ...transparent-index.gif.make-artificial.txt} | 0 .../zero-width-frame.gif} | Bin .../zero-width-frame.gif.make-artificial.txt} | 0 .../apng-skip-idat.png} | Bin .../apng-skip-idat.png.make-artificial.txt} | 0 53 files changed, 49 insertions(+), 49 deletions(-) rename test/data/{artificial/deflate-backref-crosses-blocks.deflate => artificial-deflate/backref-crosses-blocks.deflate} (100%) rename test/data/{artificial/deflate-backref-crosses-blocks.deflate.commentary.txt => artificial-deflate/backref-crosses-blocks.deflate.commentary.txt} (93%) rename test/data/{artificial/deflate-backref-crosses-blocks.deflate.decompressed => artificial-deflate/backref-crosses-blocks.deflate.decompressed} (100%) rename test/data/{artificial/deflate-backref-crosses-blocks.deflate.make-artificial.txt => artificial-deflate/backref-crosses-blocks.deflate.make-artificial.txt} (100%) rename test/data/{artificial/deflate-degenerate-huffman-unused.deflate => artificial-deflate/degenerate-huffman-unused.deflate} (100%) rename test/data/{artificial/deflate-degenerate-huffman-unused.deflate.commentary.txt => artificial-deflate/degenerate-huffman-unused.deflate.commentary.txt} (96%) rename test/data/{artificial/deflate-degenerate-huffman-unused.deflate.decompressed => artificial-deflate/degenerate-huffman-unused.deflate.decompressed} (100%) rename test/data/{artificial/deflate-degenerate-huffman-unused.deflate.make-artificial.txt => artificial-deflate/degenerate-huffman-unused.deflate.make-artificial.txt} (100%) rename test/data/{artificial/deflate-distance-32768.deflate => artificial-deflate/distance-32768.deflate} (100%) rename test/data/{artificial/deflate-distance-32768.deflate.commentary.txt => artificial-deflate/distance-32768.deflate.commentary.txt} (97%) rename test/data/{artificial/deflate-distance-32768.deflate.decompressed => artificial-deflate/distance-32768.deflate.decompressed} (100%) rename test/data/{artificial/deflate-distance-32768.deflate.make-artificial.txt => artificial-deflate/distance-32768.deflate.make-artificial.txt} (100%) rename test/data/{artificial/deflate-distance-code-31.deflate => artificial-deflate/distance-code-31.deflate} (100%) rename test/data/{artificial/deflate-distance-code-31.deflate.commentary.txt => artificial-deflate/distance-code-31.deflate.commentary.txt} (77%) rename test/data/{artificial/deflate-distance-code-31.deflate.decompressed => artificial-deflate/distance-code-31.deflate.decompressed} (100%) rename test/data/{artificial/deflate-distance-code-31.deflate.make-artificial.txt => artificial-deflate/distance-code-31.deflate.make-artificial.txt} (100%) rename test/data/{artificial/deflate-huffman-primlen-9.deflate => artificial-deflate/huffman-primlen-9.deflate} (100%) rename test/data/{artificial/deflate-huffman-primlen-9.deflate.commentary.txt => artificial-deflate/huffman-primlen-9.deflate.commentary.txt} (98%) rename test/data/{artificial/deflate-huffman-primlen-9.deflate.decompressed => artificial-deflate/huffman-primlen-9.deflate.decompressed} (100%) rename test/data/{artificial/deflate-huffman-primlen-9.deflate.make-artificial.txt => artificial-deflate/huffman-primlen-9.deflate.make-artificial.txt} (100%) rename test/data/{artificial/gif-background-color.gif => artificial-gif/background-color.gif} (100%) rename test/data/{artificial/gif-background-color.gif.make-artificial.txt => artificial-gif/background-color.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-empty-palette.gif => artificial-gif/empty-palette.gif} (100%) rename test/data/{artificial/gif-empty-palette.gif.make-artificial.txt => artificial-gif/empty-palette.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-frame-out-of-bounds.gif => artificial-gif/frame-out-of-bounds.gif} (100%) rename test/data/{artificial/gif-frame-out-of-bounds.gif.make-artificial.txt => artificial-gif/frame-out-of-bounds.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-metadata-empty.gif => artificial-gif/metadata-empty.gif} (100%) rename test/data/{artificial/gif-metadata-empty.gif.make-artificial.txt => artificial-gif/metadata-empty.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-metadata-full.gif => artificial-gif/metadata-full.gif} (100%) rename test/data/{artificial/gif-metadata-full.gif.make-artificial.txt => artificial-gif/metadata-full.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-multiple-graphic-controls.gif => artificial-gif/multiple-graphic-controls.gif} (100%) rename test/data/{artificial/gif-multiple-graphic-controls.gif.make-artificial.txt => artificial-gif/multiple-graphic-controls.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-multiple-loop-counts.gif => artificial-gif/multiple-loop-counts.gif} (100%) rename test/data/{artificial/gif-multiple-loop-counts.gif.make-artificial.txt => artificial-gif/multiple-loop-counts.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-no-frames.gif => artificial-gif/no-frames.gif} (100%) rename test/data/{artificial/gif-no-frames.gif.make-artificial.txt => artificial-gif/no-frames.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-pixel-data-none.gif => artificial-gif/pixel-data-none.gif} (100%) rename test/data/{artificial/gif-pixel-data-none.gif.make-artificial.txt => artificial-gif/pixel-data-none.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-pixel-data-not-enough.gif => artificial-gif/pixel-data-not-enough.gif} (100%) rename test/data/{artificial/gif-pixel-data-not-enough.gif.make-artificial.txt => artificial-gif/pixel-data-not-enough.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-pixel-data-too-much.gif => artificial-gif/pixel-data-too-much.gif} (100%) rename test/data/{artificial/gif-pixel-data-too-much.gif.make-artificial.txt => artificial-gif/pixel-data-too-much.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-small-frame-interlaced.gif => artificial-gif/small-frame-interlaced.gif} (100%) rename test/data/{artificial/gif-small-frame-interlaced.gif.make-artificial.txt => artificial-gif/small-frame-interlaced.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-transparent-index.gif => artificial-gif/transparent-index.gif} (100%) rename test/data/{artificial/gif-transparent-index.gif.make-artificial.txt => artificial-gif/transparent-index.gif.make-artificial.txt} (100%) rename test/data/{artificial/gif-zero-width-frame.gif => artificial-gif/zero-width-frame.gif} (100%) rename test/data/{artificial/gif-zero-width-frame.gif.make-artificial.txt => artificial-gif/zero-width-frame.gif.make-artificial.txt} (100%) rename test/data/{artificial/png-apng-skip-idat.png => artificial-png/apng-skip-idat.png} (100%) rename test/data/{artificial/png-apng-skip-idat.png.make-artificial.txt => artificial-png/apng-skip-idat.png.make-artificial.txt} (100%) diff --git a/test/c/std/deflate.c b/test/c/std/deflate.c index 6dffe6b2..c41b7da3 100644 --- a/test/c/std/deflate.c +++ b/test/c/std/deflate.c @@ -82,47 +82,47 @@ golden_test g_deflate_256_bytes_gt = { golden_test g_deflate_deflate_backref_crosses_blocks_gt = { .want_filename = - "test/data/artificial/" - "deflate-backref-crosses-blocks.deflate.decompressed", + "test/data/artificial-deflate/" + "backref-crosses-blocks.deflate.decompressed", .src_filename = - "test/data/artificial/" - "deflate-backref-crosses-blocks.deflate", + "test/data/artificial-deflate/" + "backref-crosses-blocks.deflate", }; golden_test g_deflate_deflate_degenerate_huffman_unused_gt = { .want_filename = - "test/data/artificial/" - "deflate-degenerate-huffman-unused.deflate.decompressed", + "test/data/artificial-deflate/" + "degenerate-huffman-unused.deflate.decompressed", .src_filename = - "test/data/artificial/" - "deflate-degenerate-huffman-unused.deflate", + "test/data/artificial-deflate/" + "degenerate-huffman-unused.deflate", }; golden_test g_deflate_deflate_distance_32768_gt = { .want_filename = - "test/data/artificial/" - "deflate-distance-32768.deflate.decompressed", + "test/data/artificial-deflate/" + "distance-32768.deflate.decompressed", .src_filename = - "test/data/artificial/" - "deflate-distance-32768.deflate", + "test/data/artificial-deflate/" + "distance-32768.deflate", }; golden_test g_deflate_deflate_distance_code_31_gt = { .want_filename = - "test/data/artificial/" - "qdeflate-distance-code-31.deflate.decompressed", + "test/data/artificial-deflate/" + "qdistance-code-31.deflate.decompressed", .src_filename = - "test/data/artificial/" - "deflate-distance-code-31.deflate", + "test/data/artificial-deflate/" + "distance-code-31.deflate", }; golden_test g_deflate_deflate_huffman_primlen_9_gt = { .want_filename = - "test/data/artificial/" - "deflate-huffman-primlen-9.deflate.decompressed", + "test/data/artificial-deflate/" + "huffman-primlen-9.deflate.decompressed", .src_filename = - "test/data/artificial/" - "deflate-huffman-primlen-9.deflate", + "test/data/artificial-deflate/" + "huffman-primlen-9.deflate", }; golden_test g_deflate_midsummer_gt = { diff --git a/test/c/std/gif.c b/test/c/std/gif.c index de263127..d3cbbc90 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -714,7 +714,7 @@ test_wuffs_gif_decode_empty_palette() { wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ .data = g_src_slice_u8, }); - CHECK_STRING(read_file(&src, "test/data/artificial/gif-empty-palette.gif")); + CHECK_STRING(read_file(&src, "test/data/artificial-gif/empty-palette.gif")); for (int q = 0; q < 2; q++) { src.meta.ri = 0; @@ -780,7 +780,7 @@ test_wuffs_gif_decode_background_color() { .data = g_src_slice_u8, }); CHECK_STRING( - read_file(&src, "test/data/artificial/gif-background-color.gif")); + read_file(&src, "test/data/artificial-gif/background-color.gif")); for (int q = 0; q < 2; q++) { src.meta.ri = 0; @@ -818,7 +818,7 @@ test_wuffs_gif_decode_first_frame_is_opaque() { .data = g_src_slice_u8, }); CHECK_STRING( - read_file(&src, "test/data/artificial/gif-frame-out-of-bounds.gif")); + read_file(&src, "test/data/artificial-gif/frame-out-of-bounds.gif")); for (int q = 0; q < 2; q++) { src.meta.ri = 0; @@ -855,7 +855,7 @@ test_wuffs_gif_decode_frame_out_of_bounds() { .data = g_src_slice_u8, }); CHECK_STRING( - read_file(&src, "test/data/artificial/gif-frame-out-of-bounds.gif")); + read_file(&src, "test/data/artificial-gif/frame-out-of-bounds.gif")); for (int q = 0; q < 2; q++) { src.meta.ri = 0; @@ -876,7 +876,7 @@ test_wuffs_gif_decode_frame_out_of_bounds() { // The nominal width and height for the overall image is 2×2, but its first // frame extends those bounds to 4×2. See - // test/data/artificial/gif-frame-out-of-bounds.gif.make-artificial.txt for + // test/data/artificial-gif/frame-out-of-bounds.gif.make-artificial.txt for // more discussion. const uint32_t width = q ? 2 : 4; @@ -902,7 +902,7 @@ test_wuffs_gif_decode_frame_out_of_bounds() { RETURN_FAIL("q=%d: set_from_slice: \"%s\"", q, status.repr); } - // See test/data/artificial/gif-frame-out-of-bounds.gif.make-artificial.txt + // See test/data/artificial-gif/frame-out-of-bounds.gif.make-artificial.txt // for the want_frame_config_bounds and want_pixel_indexes source. wuffs_base__rect_ie_u32 want_frame_config_bounds[4] = { @@ -1022,7 +1022,7 @@ test_wuffs_gif_decode_zero_width_frame() { .data = g_src_slice_u8, }); CHECK_STRING( - read_file(&src, "test/data/artificial/gif-zero-width-frame.gif")); + read_file(&src, "test/data/artificial-gif/zero-width-frame.gif")); for (int q = 0; q < 3; q++) { src.meta.ri = 0; @@ -1259,8 +1259,8 @@ do_test_wuffs_gif_decode_metadata(bool full) { .data = g_src_slice_u8, }); CHECK_STRING( - read_file(&src, full ? "test/data/artificial/gif-metadata-full.gif" - : "test/data/artificial/gif-metadata-empty.gif")); + read_file(&src, full ? "test/data/artificial-gif/metadata-full.gif" + : "test/data/artificial-gif/metadata-empty.gif")); int iccp; for (iccp = 0; iccp < 2; iccp++) { @@ -1467,7 +1467,7 @@ test_wuffs_gif_decode_multiple_graphic_controls() { .data = g_src_slice_u8, }); CHECK_STRING(read_file( - &src, "test/data/artificial/gif-multiple-graphic-controls.gif")); + &src, "test/data/artificial-gif/multiple-graphic-controls.gif")); wuffs_gif__decoder dec; CHECK_STATUS("initialize", @@ -1494,7 +1494,7 @@ test_wuffs_gif_decode_multiple_loop_counts() { .data = g_src_slice_u8, }); CHECK_STRING( - read_file(&src, "test/data/artificial/gif-multiple-loop-counts.gif")); + read_file(&src, "test/data/artificial-gif/multiple-loop-counts.gif")); wuffs_gif__decoder dec; CHECK_STATUS("initialize", @@ -1505,7 +1505,7 @@ test_wuffs_gif_decode_multiple_loop_counts() { CHECK_STATUS("decode_image_config", wuffs_gif__decoder__decode_image_config(&dec, &ic, &src)); - // See test/data/artificial/gif-multiple-loop-counts.gif.make-artificial.txt + // See test/data/artificial-gif/multiple-loop-counts.gif.make-artificial.txt // for the want_num_animation_loops source. Note that the GIF wire format's // loop counts are the number of animation loops *after* the first play // through, and Wuffs' are the number *including* the first play through. @@ -1573,7 +1573,7 @@ test_wuffs_gif_decode_pixel_data_none() { wuffs_base__io_buffer src = ((wuffs_base__io_buffer){ .data = g_src_slice_u8, }); - CHECK_STRING(read_file(&src, "test/data/artificial/gif-pixel-data-none.gif")); + CHECK_STRING(read_file(&src, "test/data/artificial-gif/pixel-data-none.gif")); return do_test_wuffs_gif_decode_expecting( src, 0, wuffs_base__error__not_enough_data, true); @@ -1586,7 +1586,7 @@ test_wuffs_gif_decode_pixel_data_not_enough() { .data = g_src_slice_u8, }); CHECK_STRING( - read_file(&src, "test/data/artificial/gif-pixel-data-not-enough.gif")); + read_file(&src, "test/data/artificial-gif/pixel-data-not-enough.gif")); return do_test_wuffs_gif_decode_expecting( src, 0, wuffs_base__error__not_enough_data, false); @@ -1599,7 +1599,7 @@ test_wuffs_gif_decode_pixel_data_too_much_sans_quirk() { .data = g_src_slice_u8, }); CHECK_STRING( - read_file(&src, "test/data/artificial/gif-pixel-data-too-much.gif")); + read_file(&src, "test/data/artificial-gif/pixel-data-too-much.gif")); return do_test_wuffs_gif_decode_expecting( src, 0, wuffs_base__error__too_much_data, false); @@ -1612,7 +1612,7 @@ test_wuffs_gif_decode_pixel_data_too_much_with_quirk() { .data = g_src_slice_u8, }); CHECK_STRING( - read_file(&src, "test/data/artificial/gif-pixel-data-too-much.gif")); + read_file(&src, "test/data/artificial-gif/pixel-data-too-much.gif")); return do_test_wuffs_gif_decode_expecting( src, WUFFS_GIF__QUIRK_IGNORE_TOO_MUCH_PIXEL_DATA, NULL, false); @@ -1923,7 +1923,7 @@ test_wuffs_gif_small_frame_interlaced() { .data = g_src_slice_u8, }); CHECK_STRING( - read_file(&src, "test/data/artificial/gif-small-frame-interlaced.gif")); + read_file(&src, "test/data/artificial-gif/small-frame-interlaced.gif")); wuffs_gif__decoder dec; CHECK_STATUS("initialize", diff --git a/test/data/README.md b/test/data/README.md index 47ed586c..f805af2c 100644 --- a/test/data/README.md +++ b/test/data/README.md @@ -19,14 +19,14 @@ and APNG/WEBP have different semantics but `gif2apng` does not cater for that. --- -The artificial directory holds artificially generated test data, often to +The `artificial-*` directories hold artificially generated test data, often to explicitly test corner cases of various file formats. The files there usually come in families whose names have a common prefix, such as three files `foo.bar`, `foo.bar.qux`, `foo.bar.commentary.txt` all prefixed by `foo.bar`. The file whose name is that prefix is usually the canonical (typically hand-crafted) file, and the other files are then derived from that. Outside of -the artificial directory, the other files in this directory are typically real -world examples of various file formats, or deriviations of them. +the `artificial-*` directories, the other files in this directory are typically +real world examples of various file formats, or deriviations of them. --- diff --git a/test/data/artificial/deflate-backref-crosses-blocks.deflate b/test/data/artificial-deflate/backref-crosses-blocks.deflate similarity index 100% rename from test/data/artificial/deflate-backref-crosses-blocks.deflate rename to test/data/artificial-deflate/backref-crosses-blocks.deflate diff --git a/test/data/artificial/deflate-backref-crosses-blocks.deflate.commentary.txt b/test/data/artificial-deflate/backref-crosses-blocks.deflate.commentary.txt similarity index 93% rename from test/data/artificial/deflate-backref-crosses-blocks.deflate.commentary.txt rename to test/data/artificial-deflate/backref-crosses-blocks.deflate.commentary.txt index 9aa9ca60..b96e844d 100644 --- a/test/data/artificial/deflate-backref-crosses-blocks.deflate.commentary.txt +++ b/test/data/artificial-deflate/backref-crosses-blocks.deflate.commentary.txt @@ -1,5 +1,5 @@ -Running deflate-backref-crosses-blocks.deflate through script/print-bits.go and -adding commentary: +Running backref-crosses-blocks.deflate through script/print-bits.go and adding +commentary: offset xoffset ASCII hex binary 000000 0x0000 . 0x00 0b_...._.000 Uncompressed block, non-final diff --git a/test/data/artificial/deflate-backref-crosses-blocks.deflate.decompressed b/test/data/artificial-deflate/backref-crosses-blocks.deflate.decompressed similarity index 100% rename from test/data/artificial/deflate-backref-crosses-blocks.deflate.decompressed rename to test/data/artificial-deflate/backref-crosses-blocks.deflate.decompressed diff --git a/test/data/artificial/deflate-backref-crosses-blocks.deflate.make-artificial.txt b/test/data/artificial-deflate/backref-crosses-blocks.deflate.make-artificial.txt similarity index 100% rename from test/data/artificial/deflate-backref-crosses-blocks.deflate.make-artificial.txt rename to test/data/artificial-deflate/backref-crosses-blocks.deflate.make-artificial.txt diff --git a/test/data/artificial/deflate-degenerate-huffman-unused.deflate b/test/data/artificial-deflate/degenerate-huffman-unused.deflate similarity index 100% rename from test/data/artificial/deflate-degenerate-huffman-unused.deflate rename to test/data/artificial-deflate/degenerate-huffman-unused.deflate diff --git a/test/data/artificial/deflate-degenerate-huffman-unused.deflate.commentary.txt b/test/data/artificial-deflate/degenerate-huffman-unused.deflate.commentary.txt similarity index 96% rename from test/data/artificial/deflate-degenerate-huffman-unused.deflate.commentary.txt rename to test/data/artificial-deflate/degenerate-huffman-unused.deflate.commentary.txt index 8a03a867..5804323d 100644 --- a/test/data/artificial/deflate-degenerate-huffman-unused.deflate.commentary.txt +++ b/test/data/artificial-deflate/degenerate-huffman-unused.deflate.commentary.txt @@ -1,5 +1,5 @@ -Running deflate-degenerate-huffman-unused.deflate through script/print-bits.go -and adding commentary: +Running degenerate-huffman-unused.deflate through script/print-bits.go and +adding commentary: offset xoffset ASCII hex binary 000000 0x0000 . 0x05 0b_...._.101 Dynamic Huffman block, final diff --git a/test/data/artificial/deflate-degenerate-huffman-unused.deflate.decompressed b/test/data/artificial-deflate/degenerate-huffman-unused.deflate.decompressed similarity index 100% rename from test/data/artificial/deflate-degenerate-huffman-unused.deflate.decompressed rename to test/data/artificial-deflate/degenerate-huffman-unused.deflate.decompressed diff --git a/test/data/artificial/deflate-degenerate-huffman-unused.deflate.make-artificial.txt b/test/data/artificial-deflate/degenerate-huffman-unused.deflate.make-artificial.txt similarity index 100% rename from test/data/artificial/deflate-degenerate-huffman-unused.deflate.make-artificial.txt rename to test/data/artificial-deflate/degenerate-huffman-unused.deflate.make-artificial.txt diff --git a/test/data/artificial/deflate-distance-32768.deflate b/test/data/artificial-deflate/distance-32768.deflate similarity index 100% rename from test/data/artificial/deflate-distance-32768.deflate rename to test/data/artificial-deflate/distance-32768.deflate diff --git a/test/data/artificial/deflate-distance-32768.deflate.commentary.txt b/test/data/artificial-deflate/distance-32768.deflate.commentary.txt similarity index 97% rename from test/data/artificial/deflate-distance-32768.deflate.commentary.txt rename to test/data/artificial-deflate/distance-32768.deflate.commentary.txt index fb5d94ea..ab30847f 100644 --- a/test/data/artificial/deflate-distance-32768.deflate.commentary.txt +++ b/test/data/artificial-deflate/distance-32768.deflate.commentary.txt @@ -1,4 +1,4 @@ -Running deflate-distance-32768.deflate through script/print-bits.go and adding +Running distance-32768.deflate through script/print-bits.go and adding commentary: offset xoffset ASCII hex binary diff --git a/test/data/artificial/deflate-distance-32768.deflate.decompressed b/test/data/artificial-deflate/distance-32768.deflate.decompressed similarity index 100% rename from test/data/artificial/deflate-distance-32768.deflate.decompressed rename to test/data/artificial-deflate/distance-32768.deflate.decompressed diff --git a/test/data/artificial/deflate-distance-32768.deflate.make-artificial.txt b/test/data/artificial-deflate/distance-32768.deflate.make-artificial.txt similarity index 100% rename from test/data/artificial/deflate-distance-32768.deflate.make-artificial.txt rename to test/data/artificial-deflate/distance-32768.deflate.make-artificial.txt diff --git a/test/data/artificial/deflate-distance-code-31.deflate b/test/data/artificial-deflate/distance-code-31.deflate similarity index 100% rename from test/data/artificial/deflate-distance-code-31.deflate rename to test/data/artificial-deflate/distance-code-31.deflate diff --git a/test/data/artificial/deflate-distance-code-31.deflate.commentary.txt b/test/data/artificial-deflate/distance-code-31.deflate.commentary.txt similarity index 77% rename from test/data/artificial/deflate-distance-code-31.deflate.commentary.txt rename to test/data/artificial-deflate/distance-code-31.deflate.commentary.txt index f8cf33e2..2e621c62 100644 --- a/test/data/artificial/deflate-distance-code-31.deflate.commentary.txt +++ b/test/data/artificial-deflate/distance-code-31.deflate.commentary.txt @@ -1,5 +1,5 @@ -Running deflate-distance-code-31.deflate through script/print-bits.go and -adding commentary: +Running distance-code-31.deflate through script/print-bits.go and adding +commentary: offset xoffset ASCII hex binary 000000 0x0000 . 0x03 0b_...._.011 Fixed Huffman block, final diff --git a/test/data/artificial/deflate-distance-code-31.deflate.decompressed b/test/data/artificial-deflate/distance-code-31.deflate.decompressed similarity index 100% rename from test/data/artificial/deflate-distance-code-31.deflate.decompressed rename to test/data/artificial-deflate/distance-code-31.deflate.decompressed diff --git a/test/data/artificial/deflate-distance-code-31.deflate.make-artificial.txt b/test/data/artificial-deflate/distance-code-31.deflate.make-artificial.txt similarity index 100% rename from test/data/artificial/deflate-distance-code-31.deflate.make-artificial.txt rename to test/data/artificial-deflate/distance-code-31.deflate.make-artificial.txt diff --git a/test/data/artificial/deflate-huffman-primlen-9.deflate b/test/data/artificial-deflate/huffman-primlen-9.deflate similarity index 100% rename from test/data/artificial/deflate-huffman-primlen-9.deflate rename to test/data/artificial-deflate/huffman-primlen-9.deflate diff --git a/test/data/artificial/deflate-huffman-primlen-9.deflate.commentary.txt b/test/data/artificial-deflate/huffman-primlen-9.deflate.commentary.txt similarity index 98% rename from test/data/artificial/deflate-huffman-primlen-9.deflate.commentary.txt rename to test/data/artificial-deflate/huffman-primlen-9.deflate.commentary.txt index 88db6aec..5540d398 100644 --- a/test/data/artificial/deflate-huffman-primlen-9.deflate.commentary.txt +++ b/test/data/artificial-deflate/huffman-primlen-9.deflate.commentary.txt @@ -1,5 +1,5 @@ -Running deflate-huffman-primlen-9.deflate through script/print-bits.go and -adding commentary: +Running huffman-primlen-9.deflate through script/print-bits.go and adding +commentary: offset xoffset ASCII hex binary 000000 0x0000 . 0xED 0b_...._.101 Dynamic Huffman block, final diff --git a/test/data/artificial/deflate-huffman-primlen-9.deflate.decompressed b/test/data/artificial-deflate/huffman-primlen-9.deflate.decompressed similarity index 100% rename from test/data/artificial/deflate-huffman-primlen-9.deflate.decompressed rename to test/data/artificial-deflate/huffman-primlen-9.deflate.decompressed diff --git a/test/data/artificial/deflate-huffman-primlen-9.deflate.make-artificial.txt b/test/data/artificial-deflate/huffman-primlen-9.deflate.make-artificial.txt similarity index 100% rename from test/data/artificial/deflate-huffman-primlen-9.deflate.make-artificial.txt rename to test/data/artificial-deflate/huffman-primlen-9.deflate.make-artificial.txt diff --git a/test/data/artificial/gif-background-color.gif b/test/data/artificial-gif/background-color.gif similarity index 100% rename from test/data/artificial/gif-background-color.gif rename to test/data/artificial-gif/background-color.gif diff --git a/test/data/artificial/gif-background-color.gif.make-artificial.txt b/test/data/artificial-gif/background-color.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-background-color.gif.make-artificial.txt rename to test/data/artificial-gif/background-color.gif.make-artificial.txt diff --git a/test/data/artificial/gif-empty-palette.gif b/test/data/artificial-gif/empty-palette.gif similarity index 100% rename from test/data/artificial/gif-empty-palette.gif rename to test/data/artificial-gif/empty-palette.gif diff --git a/test/data/artificial/gif-empty-palette.gif.make-artificial.txt b/test/data/artificial-gif/empty-palette.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-empty-palette.gif.make-artificial.txt rename to test/data/artificial-gif/empty-palette.gif.make-artificial.txt diff --git a/test/data/artificial/gif-frame-out-of-bounds.gif b/test/data/artificial-gif/frame-out-of-bounds.gif similarity index 100% rename from test/data/artificial/gif-frame-out-of-bounds.gif rename to test/data/artificial-gif/frame-out-of-bounds.gif diff --git a/test/data/artificial/gif-frame-out-of-bounds.gif.make-artificial.txt b/test/data/artificial-gif/frame-out-of-bounds.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-frame-out-of-bounds.gif.make-artificial.txt rename to test/data/artificial-gif/frame-out-of-bounds.gif.make-artificial.txt diff --git a/test/data/artificial/gif-metadata-empty.gif b/test/data/artificial-gif/metadata-empty.gif similarity index 100% rename from test/data/artificial/gif-metadata-empty.gif rename to test/data/artificial-gif/metadata-empty.gif diff --git a/test/data/artificial/gif-metadata-empty.gif.make-artificial.txt b/test/data/artificial-gif/metadata-empty.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-metadata-empty.gif.make-artificial.txt rename to test/data/artificial-gif/metadata-empty.gif.make-artificial.txt diff --git a/test/data/artificial/gif-metadata-full.gif b/test/data/artificial-gif/metadata-full.gif similarity index 100% rename from test/data/artificial/gif-metadata-full.gif rename to test/data/artificial-gif/metadata-full.gif diff --git a/test/data/artificial/gif-metadata-full.gif.make-artificial.txt b/test/data/artificial-gif/metadata-full.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-metadata-full.gif.make-artificial.txt rename to test/data/artificial-gif/metadata-full.gif.make-artificial.txt diff --git a/test/data/artificial/gif-multiple-graphic-controls.gif b/test/data/artificial-gif/multiple-graphic-controls.gif similarity index 100% rename from test/data/artificial/gif-multiple-graphic-controls.gif rename to test/data/artificial-gif/multiple-graphic-controls.gif diff --git a/test/data/artificial/gif-multiple-graphic-controls.gif.make-artificial.txt b/test/data/artificial-gif/multiple-graphic-controls.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-multiple-graphic-controls.gif.make-artificial.txt rename to test/data/artificial-gif/multiple-graphic-controls.gif.make-artificial.txt diff --git a/test/data/artificial/gif-multiple-loop-counts.gif b/test/data/artificial-gif/multiple-loop-counts.gif similarity index 100% rename from test/data/artificial/gif-multiple-loop-counts.gif rename to test/data/artificial-gif/multiple-loop-counts.gif diff --git a/test/data/artificial/gif-multiple-loop-counts.gif.make-artificial.txt b/test/data/artificial-gif/multiple-loop-counts.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-multiple-loop-counts.gif.make-artificial.txt rename to test/data/artificial-gif/multiple-loop-counts.gif.make-artificial.txt diff --git a/test/data/artificial/gif-no-frames.gif b/test/data/artificial-gif/no-frames.gif similarity index 100% rename from test/data/artificial/gif-no-frames.gif rename to test/data/artificial-gif/no-frames.gif diff --git a/test/data/artificial/gif-no-frames.gif.make-artificial.txt b/test/data/artificial-gif/no-frames.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-no-frames.gif.make-artificial.txt rename to test/data/artificial-gif/no-frames.gif.make-artificial.txt diff --git a/test/data/artificial/gif-pixel-data-none.gif b/test/data/artificial-gif/pixel-data-none.gif similarity index 100% rename from test/data/artificial/gif-pixel-data-none.gif rename to test/data/artificial-gif/pixel-data-none.gif diff --git a/test/data/artificial/gif-pixel-data-none.gif.make-artificial.txt b/test/data/artificial-gif/pixel-data-none.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-pixel-data-none.gif.make-artificial.txt rename to test/data/artificial-gif/pixel-data-none.gif.make-artificial.txt diff --git a/test/data/artificial/gif-pixel-data-not-enough.gif b/test/data/artificial-gif/pixel-data-not-enough.gif similarity index 100% rename from test/data/artificial/gif-pixel-data-not-enough.gif rename to test/data/artificial-gif/pixel-data-not-enough.gif diff --git a/test/data/artificial/gif-pixel-data-not-enough.gif.make-artificial.txt b/test/data/artificial-gif/pixel-data-not-enough.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-pixel-data-not-enough.gif.make-artificial.txt rename to test/data/artificial-gif/pixel-data-not-enough.gif.make-artificial.txt diff --git a/test/data/artificial/gif-pixel-data-too-much.gif b/test/data/artificial-gif/pixel-data-too-much.gif similarity index 100% rename from test/data/artificial/gif-pixel-data-too-much.gif rename to test/data/artificial-gif/pixel-data-too-much.gif diff --git a/test/data/artificial/gif-pixel-data-too-much.gif.make-artificial.txt b/test/data/artificial-gif/pixel-data-too-much.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-pixel-data-too-much.gif.make-artificial.txt rename to test/data/artificial-gif/pixel-data-too-much.gif.make-artificial.txt diff --git a/test/data/artificial/gif-small-frame-interlaced.gif b/test/data/artificial-gif/small-frame-interlaced.gif similarity index 100% rename from test/data/artificial/gif-small-frame-interlaced.gif rename to test/data/artificial-gif/small-frame-interlaced.gif diff --git a/test/data/artificial/gif-small-frame-interlaced.gif.make-artificial.txt b/test/data/artificial-gif/small-frame-interlaced.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-small-frame-interlaced.gif.make-artificial.txt rename to test/data/artificial-gif/small-frame-interlaced.gif.make-artificial.txt diff --git a/test/data/artificial/gif-transparent-index.gif b/test/data/artificial-gif/transparent-index.gif similarity index 100% rename from test/data/artificial/gif-transparent-index.gif rename to test/data/artificial-gif/transparent-index.gif diff --git a/test/data/artificial/gif-transparent-index.gif.make-artificial.txt b/test/data/artificial-gif/transparent-index.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-transparent-index.gif.make-artificial.txt rename to test/data/artificial-gif/transparent-index.gif.make-artificial.txt diff --git a/test/data/artificial/gif-zero-width-frame.gif b/test/data/artificial-gif/zero-width-frame.gif similarity index 100% rename from test/data/artificial/gif-zero-width-frame.gif rename to test/data/artificial-gif/zero-width-frame.gif diff --git a/test/data/artificial/gif-zero-width-frame.gif.make-artificial.txt b/test/data/artificial-gif/zero-width-frame.gif.make-artificial.txt similarity index 100% rename from test/data/artificial/gif-zero-width-frame.gif.make-artificial.txt rename to test/data/artificial-gif/zero-width-frame.gif.make-artificial.txt diff --git a/test/data/artificial/png-apng-skip-idat.png b/test/data/artificial-png/apng-skip-idat.png similarity index 100% rename from test/data/artificial/png-apng-skip-idat.png rename to test/data/artificial-png/apng-skip-idat.png diff --git a/test/data/artificial/png-apng-skip-idat.png.make-artificial.txt b/test/data/artificial-png/apng-skip-idat.png.make-artificial.txt similarity index 100% rename from test/data/artificial/png-apng-skip-idat.png.make-artificial.txt rename to test/data/artificial-png/apng-skip-idat.png.make-artificial.txt