From d1399fac1965716f2ff4dae0970d79689191f71f Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 16 Mar 2018 10:48:33 +1100 Subject: [PATCH] Rename test/testdata to test/data --- doc/benchmarks.md | 6 +- example/gifplayer/gifplayer.c | 2 +- example/peterface/peterface.c | 2 +- fuzz/c/std/gif_fuzzer.cc | 2 +- fuzz/c/std/zlib_fuzzer.cc | 2 +- script/bench-go-gif/main.go | 2 +- script/bench-rust-gif-dot-rs/src/main.rs | 2 +- script/bench-rust-gif/src/main.rs | 2 +- script/inline-c-relative-includes.go | 2 +- std/deflate/README.md | 12 +-- std/gif/README.md | 20 ++-- test/c/std/deflate.c | 54 +++++------ test/c/std/gif.c | 88 +++++++++--------- test/c/std/zlib.c | 26 +++--- test/{testdata => data}/README.md | 2 +- test/{testdata => data}/animated-red-blue.gif | Bin test/{testdata => data}/artificial/256.bytes | Bin .../artificial/256.bytes.gz | Bin .../deflate-backref-crosses-blocks.deflate | Bin ...kref-crosses-blocks.deflate.commentary.txt | 0 ...ackref-crosses-blocks.deflate.decompressed | 0 test/{testdata => data}/bricks-color.bmp | Bin test/{testdata => data}/bricks-color.jpeg | Bin .../bricks-color.lossless.webp | Bin .../bricks-color.lossy.webp | Bin test/{testdata => data}/bricks-color.png | Bin test/{testdata => data}/bricks-color.tiff | Bin test/{testdata => data}/bricks-dither.bmp | Bin test/{testdata => data}/bricks-dither.gif | Bin test/{testdata => data}/bricks-dither.indexes | Bin .../bricks-dither.indexes.giflzw | Bin .../bricks-dither.lossless.webp | Bin test/{testdata => data}/bricks-dither.palette | Bin test/{testdata => data}/bricks-dither.png | Bin test/{testdata => data}/bricks-gray.bmp | Bin test/{testdata => data}/bricks-gray.gif | Bin test/{testdata => data}/bricks-gray.indexes | Bin .../bricks-gray.indexes.giflzw | Bin test/{testdata => data}/bricks-gray.jpeg | Bin .../bricks-gray.lossless.webp | Bin .../{testdata => data}/bricks-gray.lossy.webp | Bin test/{testdata => data}/bricks-gray.png | Bin test/{testdata => data}/bricks-gray.tiff | Bin test/{testdata => data}/bricks-nodither.bmp | Bin test/{testdata => data}/bricks-nodither.gif | Bin .../bricks-nodither.indexes | Bin .../bricks-nodither.indexes.giflzw | Bin .../bricks-nodither.lossless.webp | Bin .../bricks-nodither.palette | Bin test/{testdata => data}/bricks-nodither.png | Bin .../gifplayer-muybridge.gif | Bin test/{testdata => data}/harvesters.bmp | Bin test/{testdata => data}/harvesters.gif | Bin test/{testdata => data}/harvesters.jpeg | Bin .../harvesters.lossless.webp | Bin test/{testdata => data}/harvesters.lossy.webp | Bin test/{testdata => data}/harvesters.png | Bin test/{testdata => data}/harvesters.tiff | Bin test/{testdata => data}/hat.bmp | Bin test/{testdata => data}/hat.gif | Bin test/{testdata => data}/hat.jpeg | Bin test/{testdata => data}/hat.lossless.webp | Bin test/{testdata => data}/hat.lossy.webp | Bin test/{testdata => data}/hat.png | Bin test/{testdata => data}/hat.tiff | Bin test/{testdata => data}/hibiscus.bmp | Bin test/{testdata => data}/hibiscus.gif | Bin test/{testdata => data}/hibiscus.jpeg | Bin .../{testdata => data}/hibiscus.lossless.webp | Bin test/{testdata => data}/hibiscus.lossy.webp | Bin test/{testdata => data}/hibiscus.png | Bin test/{testdata => data}/hibiscus.tiff | Bin test/{testdata => data}/midsummer.txt | 0 test/{testdata => data}/midsummer.txt.gz | Bin test/{testdata => data}/midsummer.txt.zlib | Bin .../muybridge-frame-000.indexes | 0 .../muybridge-frame-001.indexes | 0 .../muybridge-frame-002.indexes | 0 .../muybridge-frame-003.indexes | 0 .../muybridge-frame-004.indexes | 0 .../muybridge-frame-005.indexes | 0 .../muybridge-frame-006.indexes | 0 .../muybridge-frame-007.indexes | 0 .../muybridge-frame-008.indexes | 0 .../muybridge-frame-009.indexes | 0 .../muybridge-frame-010.indexes | 0 .../muybridge-frame-011.indexes | 0 .../muybridge-frame-012.indexes | 0 .../muybridge-frame-013.indexes | 0 .../muybridge-frame-014.indexes | 0 test/{testdata => data}/muybridge.gif | Bin test/{testdata => data}/pi.txt | 0 test/{testdata => data}/pi.txt.giflzw | Bin test/{testdata => data}/pi.txt.gz | Bin test/{testdata => data}/pi.txt.zlib | Bin test/{testdata => data}/pjw-thumbnail.bmp | Bin test/{testdata => data}/pjw-thumbnail.gif | Bin test/{testdata => data}/pjw-thumbnail.jpeg | Bin .../pjw-thumbnail.lossless.webp | Bin .../pjw-thumbnail.lossy.webp | Bin test/{testdata => data}/pjw-thumbnail.png | Bin test/{testdata => data}/pjw-thumbnail.tiff | Bin test/{testdata => data}/romeo.txt | 0 test/{testdata => data}/romeo.txt.deflate | Bin .../romeo.txt.fixed-huff.deflate | Bin test/{testdata => data}/romeo.txt.gz | Bin test/{testdata => data}/romeo.txt.zlib | Bin 107 files changed, 110 insertions(+), 114 deletions(-) rename test/{testdata => data}/README.md (99%) rename test/{testdata => data}/animated-red-blue.gif (100%) rename test/{testdata => data}/artificial/256.bytes (100%) rename test/{testdata => data}/artificial/256.bytes.gz (100%) rename test/{testdata => data}/artificial/deflate-backref-crosses-blocks.deflate (100%) rename test/{testdata => data}/artificial/deflate-backref-crosses-blocks.deflate.commentary.txt (100%) rename test/{testdata => data}/artificial/deflate-backref-crosses-blocks.deflate.decompressed (100%) rename test/{testdata => data}/bricks-color.bmp (100%) rename test/{testdata => data}/bricks-color.jpeg (100%) rename test/{testdata => data}/bricks-color.lossless.webp (100%) rename test/{testdata => data}/bricks-color.lossy.webp (100%) rename test/{testdata => data}/bricks-color.png (100%) rename test/{testdata => data}/bricks-color.tiff (100%) rename test/{testdata => data}/bricks-dither.bmp (100%) rename test/{testdata => data}/bricks-dither.gif (100%) rename test/{testdata => data}/bricks-dither.indexes (100%) rename test/{testdata => data}/bricks-dither.indexes.giflzw (100%) rename test/{testdata => data}/bricks-dither.lossless.webp (100%) rename test/{testdata => data}/bricks-dither.palette (100%) rename test/{testdata => data}/bricks-dither.png (100%) rename test/{testdata => data}/bricks-gray.bmp (100%) rename test/{testdata => data}/bricks-gray.gif (100%) rename test/{testdata => data}/bricks-gray.indexes (100%) rename test/{testdata => data}/bricks-gray.indexes.giflzw (100%) rename test/{testdata => data}/bricks-gray.jpeg (100%) rename test/{testdata => data}/bricks-gray.lossless.webp (100%) rename test/{testdata => data}/bricks-gray.lossy.webp (100%) rename test/{testdata => data}/bricks-gray.png (100%) rename test/{testdata => data}/bricks-gray.tiff (100%) rename test/{testdata => data}/bricks-nodither.bmp (100%) rename test/{testdata => data}/bricks-nodither.gif (100%) rename test/{testdata => data}/bricks-nodither.indexes (100%) rename test/{testdata => data}/bricks-nodither.indexes.giflzw (100%) rename test/{testdata => data}/bricks-nodither.lossless.webp (100%) rename test/{testdata => data}/bricks-nodither.palette (100%) rename test/{testdata => data}/bricks-nodither.png (100%) rename test/{testdata => data}/gifplayer-muybridge.gif (100%) rename test/{testdata => data}/harvesters.bmp (100%) rename test/{testdata => data}/harvesters.gif (100%) rename test/{testdata => data}/harvesters.jpeg (100%) rename test/{testdata => data}/harvesters.lossless.webp (100%) rename test/{testdata => data}/harvesters.lossy.webp (100%) rename test/{testdata => data}/harvesters.png (100%) rename test/{testdata => data}/harvesters.tiff (100%) rename test/{testdata => data}/hat.bmp (100%) rename test/{testdata => data}/hat.gif (100%) rename test/{testdata => data}/hat.jpeg (100%) rename test/{testdata => data}/hat.lossless.webp (100%) rename test/{testdata => data}/hat.lossy.webp (100%) rename test/{testdata => data}/hat.png (100%) rename test/{testdata => data}/hat.tiff (100%) rename test/{testdata => data}/hibiscus.bmp (100%) rename test/{testdata => data}/hibiscus.gif (100%) rename test/{testdata => data}/hibiscus.jpeg (100%) rename test/{testdata => data}/hibiscus.lossless.webp (100%) rename test/{testdata => data}/hibiscus.lossy.webp (100%) rename test/{testdata => data}/hibiscus.png (100%) rename test/{testdata => data}/hibiscus.tiff (100%) rename test/{testdata => data}/midsummer.txt (100%) rename test/{testdata => data}/midsummer.txt.gz (100%) rename test/{testdata => data}/midsummer.txt.zlib (100%) rename test/{testdata => data}/muybridge-frame-000.indexes (100%) rename test/{testdata => data}/muybridge-frame-001.indexes (100%) rename test/{testdata => data}/muybridge-frame-002.indexes (100%) rename test/{testdata => data}/muybridge-frame-003.indexes (100%) rename test/{testdata => data}/muybridge-frame-004.indexes (100%) rename test/{testdata => data}/muybridge-frame-005.indexes (100%) rename test/{testdata => data}/muybridge-frame-006.indexes (100%) rename test/{testdata => data}/muybridge-frame-007.indexes (100%) rename test/{testdata => data}/muybridge-frame-008.indexes (100%) rename test/{testdata => data}/muybridge-frame-009.indexes (100%) rename test/{testdata => data}/muybridge-frame-010.indexes (100%) rename test/{testdata => data}/muybridge-frame-011.indexes (100%) rename test/{testdata => data}/muybridge-frame-012.indexes (100%) rename test/{testdata => data}/muybridge-frame-013.indexes (100%) rename test/{testdata => data}/muybridge-frame-014.indexes (100%) rename test/{testdata => data}/muybridge.gif (100%) rename test/{testdata => data}/pi.txt (100%) rename test/{testdata => data}/pi.txt.giflzw (100%) rename test/{testdata => data}/pi.txt.gz (100%) rename test/{testdata => data}/pi.txt.zlib (100%) rename test/{testdata => data}/pjw-thumbnail.bmp (100%) rename test/{testdata => data}/pjw-thumbnail.gif (100%) rename test/{testdata => data}/pjw-thumbnail.jpeg (100%) rename test/{testdata => data}/pjw-thumbnail.lossless.webp (100%) rename test/{testdata => data}/pjw-thumbnail.lossy.webp (100%) rename test/{testdata => data}/pjw-thumbnail.png (100%) rename test/{testdata => data}/pjw-thumbnail.tiff (100%) rename test/{testdata => data}/romeo.txt (100%) rename test/{testdata => data}/romeo.txt.deflate (100%) rename test/{testdata => data}/romeo.txt.fixed-huff.deflate (100%) rename test/{testdata => data}/romeo.txt.gz (100%) rename test/{testdata => data}/romeo.txt.zlib (100%) diff --git a/doc/benchmarks.md b/doc/benchmarks.md index 743be819..091c3563 100644 --- a/doc/benchmarks.md +++ b/doc/benchmarks.md @@ -110,9 +110,9 @@ output. # GIF The 1k, 10k, etc. numbers are approximately how many bytes of pixel data there -are in the decoded image. For example, the `test/testdata/harvesters.*` images -are 1165 × 859 (approximately 1000k pixels) and a GIF image (a paletted image) -is 1 byte per pixel. +are in the decoded image. For example, the `test/data/harvesters.*` images are +1165 × 859 (approximately 1000k pixels) and a GIF image (a paletted image) is 1 +byte per pixel. name speed diff --git a/example/gifplayer/gifplayer.c b/example/gifplayer/gifplayer.c index b6a50cf1..e86a2795 100644 --- a/example/gifplayer/gifplayer.c +++ b/example/gifplayer/gifplayer.c @@ -16,7 +16,7 @@ gifplayer prints an ASCII representation of the GIF image read from stdin. To play Eadweard Muybridge's iconic galloping horse animation, run: -$cc gifplayer.c && ./a.out < ../../test/testdata/muybridge.gif; rm -f a.out +$cc gifplayer.c && ./a.out < ../../test/data/muybridge.gif; rm -f a.out for a C compiler $cc, such as clang or gcc. */ diff --git a/example/peterface/peterface.c b/example/peterface/peterface.c index 4bbe6f31..bf884d26 100644 --- a/example/peterface/peterface.c +++ b/example/peterface/peterface.c @@ -118,7 +118,7 @@ int main(int argc, char** argv) { /* The remainder of this C program was generated from running this Go program via: -go run x.go < ../../test/testdata/pjw-thumbnail.gif +go run x.go < ../../test/data/pjw-thumbnail.gif ---- package main diff --git a/fuzz/c/std/gif_fuzzer.cc b/fuzz/c/std/gif_fuzzer.cc index b9dae6df..284225b3 100644 --- a/fuzz/c/std/gif_fuzzer.cc +++ b/fuzz/c/std/gif_fuzzer.cc @@ -24,7 +24,7 @@ When working on the fuzz implementation, or as a sanity check, defining WUFFS_CONFIG__FUZZLIB_MAIN will let you manually run fuzz over a set of files: g++ -DWUFFS_CONFIG__FUZZLIB_MAIN gif_fuzzer.cc -./a.out ../../../test/testdata/*.gif +./a.out ../../../test/data/*.gif rm -f ./a.out It should print "PASS", amongst other information, and exit(0). diff --git a/fuzz/c/std/zlib_fuzzer.cc b/fuzz/c/std/zlib_fuzzer.cc index 3ab1ed92..c6841415 100644 --- a/fuzz/c/std/zlib_fuzzer.cc +++ b/fuzz/c/std/zlib_fuzzer.cc @@ -24,7 +24,7 @@ When working on the fuzz implementation, or as a sanity check, defining WUFFS_CONFIG__FUZZLIB_MAIN will let you manually run fuzz over a set of files: g++ -DWUFFS_CONFIG__FUZZLIB_MAIN zlib_fuzzer.cc -./a.out ../../../test/testdata/*.zlib +./a.out ../../../test/data/*.zlib rm -f ./a.out It should print "PASS", amongst other information, and exit(0). diff --git a/script/bench-go-gif/main.go b/script/bench-go-gif/main.go index ae0ef96e..66efb5ba 100644 --- a/script/bench-go-gif/main.go +++ b/script/bench-go-gif/main.go @@ -57,7 +57,7 @@ func main() { } func main1() error { - src, err := ioutil.ReadFile("../../test/testdata/harvesters.gif") + src, err := ioutil.ReadFile("../../test/data/harvesters.gif") if err != nil { return err } diff --git a/script/bench-rust-gif-dot-rs/src/main.rs b/script/bench-rust-gif-dot-rs/src/main.rs index 4bdf7f4d..cb56c817 100644 --- a/script/bench-rust-gif-dot-rs/src/main.rs +++ b/script/bench-rust-gif-dot-rs/src/main.rs @@ -62,7 +62,7 @@ const LAST_PIXEL: u8 = 3; // Bottom right pixel's blue component is 0x03. fn main() { let mut dst = [0; NUM_BYTES]; - let src = include_bytes!("../../../test/testdata/harvesters.gif"); + let src = include_bytes!("../../../test/data/harvesters.gif"); let start = Instant::now(); diff --git a/script/bench-rust-gif/src/main.rs b/script/bench-rust-gif/src/main.rs index 47d7d596..b49e4c00 100644 --- a/script/bench-rust-gif/src/main.rs +++ b/script/bench-rust-gif/src/main.rs @@ -50,7 +50,7 @@ const LAST_PIXEL: u8 = 1; // Bottom right pixel's palette index is 0x01. fn main() { let mut dst = [0; NUM_BYTES]; - let src = include_bytes!("../../../test/testdata/harvesters.gif"); + let src = include_bytes!("../../../test/data/harvesters.gif"); let start = Instant::now(); diff --git a/script/inline-c-relative-includes.go b/script/inline-c-relative-includes.go index ca9fc661..3477e94d 100644 --- a/script/inline-c-relative-includes.go +++ b/script/inline-c-relative-includes.go @@ -20,7 +20,7 @@ package main // #include lines that uses "quoted files" (but not ). // // The output should be a stand-alone C file that other people can easily -// compile and run with no further dependencies, other than testdata files. +// compile and run with no further dependencies, other than test/data files. // // Usage: go run inline-c-relative-includes.go path/to/foo.c diff --git a/std/deflate/README.md b/std/deflate/README.md index 502d5bfe..f781f603 100644 --- a/std/deflate/README.md +++ b/std/deflate/README.md @@ -21,9 +21,9 @@ Wrangling those formats that build on deflate (gzip, zip and zlib) is not provided by this package. For zlib, look at the `std/zlib` package instead. The other formats are TODO. -For example, look at `test/testdata/romeo.txt*`. First, the uncompressed text: +For example, look at `test/data/romeo.txt*`. First, the uncompressed text: - $ xxd test/testdata/romeo.txt + $ xxd test/data/romeo.txt 00000000: 526f 6d65 6f20 616e 6420 4a75 6c69 6574 Romeo and Juliet 00000010: 0a45 7863 6572 7074 2066 726f 6d20 4163 .Excerpt from Ac etc @@ -32,7 +32,7 @@ For example, look at `test/testdata/romeo.txt*`. First, the uncompressed text: The raw deflate encoding: - $ xxd test/testdata/romeo.txt.deflate + $ xxd test/data/romeo.txt.deflate 00000000: 4d53 c16e db30 0cbd f32b d853 2e46 0e3d MS.n.0...+.S.F.= 00000010: 2e87 20ed 0234 c5ba 0049 861e 861d 149b .. ..4...I...... etc @@ -45,7 +45,7 @@ C string name of the original, uncompressed file, "romeo.txt", amongst other data. The footer contains a 4 byte CRC32 checksum and a 4 byte length of the uncompressed file (0x3ae = 942 bytes). - $ xxd test/testdata/romeo.txt.gz + $ xxd test/data/romeo.txt.gz 00000000: 1f8b 0808 26d8 5d59 0003 726f 6d65 6f2e ....&.]Y..romeo. 00000010: 7478 7400 4d53 c16e db30 0cbd f32b d853 txt.MS.n.0...+.S etc @@ -56,7 +56,7 @@ The zlib format wraps a 2 byte header and 4 byte footer around the raw deflate data. The footer contains a 4 byte Adler32 checksum. TODO: move this to std/zlib/README.md. - $ xxd test/testdata/romeo.txt.zlib + $ xxd test/data/romeo.txt.zlib 00000000: 789c 4d53 c16e db30 0cbd f32b d853 2e46 x.MS.n.0...+.S.F 00000010: 0e3d 2e87 20ed 0234 c5ba 0049 861e 861d .=.. ..4...I.... etc @@ -66,7 +66,7 @@ std/zlib/README.md. # Wire Format Worked Example -Consider `test/testdata/romeo.txt.deflate`. The relevant spec is RFC 1951. +Consider `test/data/romeo.txt.deflate`. The relevant spec is RFC 1951. offset xoffset ASCII hex binary 000000 0x0000 M 0x4D 0b_0100_1101 diff --git a/std/gif/README.md b/std/gif/README.md index dab9c761..90f9bcf0 100644 --- a/std/gif/README.md +++ b/std/gif/README.md @@ -7,7 +7,7 @@ specification](https://www.w3.org/Graphics/GIF/spec-gif89a.txt). # Wire Format Worked Example -Consider `test/testdata/bricks-nodither.gif`. +Consider `test/data/bricks-nodither.gif`. offset xoffset ASCII hex binary 000000 0x0000 G 0x47 0b_0100_0111 @@ -206,10 +206,10 @@ Significant Bits) and MSB (Most Significant Bits) first. The GIF format uses LSB first. The PDF and TIFF formats use MSB first, but are not discussed here. It is not an official format, but the -`test/testdata/bricks-nodither.indexes.giflzw` file contains the extracted -"Pixel Data" payload from `test/testdata/bricks-nodither.gif`, preceded by the -one byte `log2(literal_width)`. Deriving a separate file, as a separate, -contiguous stream, makes it easier to discuss the LZW compression format. +`test/data/bricks-nodither.indexes.giflzw` file contains the extracted "Pixel +Data" payload from `test/data/bricks-nodither.gif`, preceded by the one byte +`log2(literal_width)`. Deriving a separate file, as a separate, contiguous +stream, makes it easier to discuss the LZW compression format. offset xoffset ASCII hex binary 000000 0x0000 . 0x08 0b_0000_1000 @@ -284,8 +284,8 @@ depending on `max`. For example, if `max` is in the range [256, 511] then the next code takes 9 bits, if `max` is in the range [512, 1023] then `width == 10`, and so on. For GIF, when a code spans multiple bytes, codes are formed Least Significant Bits first. For the -`test/testdata/bricks-nodither.indexes.giflzw` example, `l2lw == 8` and so -`width` starts at 9 bits. Printing the bits on byte boundaries give: +`test/data/bricks-nodither.indexes.giflzw` example, `l2lw == 8` and so `width` +starts at 9 bits. Printing the bits on byte boundaries give: offset xoffset ASCII hex binary 000001 0x0001 . 0x00 0b_0000_0000 @@ -452,8 +452,8 @@ bytes and then an 0xD9. ## Actual Pixel Indexes It is also not an official format, but for reference, the -`test/testdata/bricks-nodither.indexes` contains the decoded -`test/testdata/bricks-nodither.indexes.giflzw` data: +`test/data/bricks-nodither.indexes` contains the decoded +`test/data/bricks-nodither.indexes.giflzw` data: offset xoffset ASCII hex binary 000000 0x0000 . 0xDC 0b_1101_1100 @@ -486,6 +486,6 @@ We have 19200 = 160 × 120 pixels. The top row starts with five pixels with RGB values indexed by 0xDC (or 220 in decimal, and recall that the GCT maps color 220 to {0x0F, 0xA7, 0xF6}), the bottom row ends with index 0x4F. -Indeed, opening `test/testdata/bricks-nodither.gif` in an image editor should +Indeed, opening `test/data/bricks-nodither.gif` in an image editor should verify that the top left pixel's RGB is {0x0F, 0xA7, 0xF6}, and likewise the bottom right pixel's RGB is {0x01, 0x24, 0x63}. diff --git a/test/c/std/deflate.c b/test/c/std/deflate.c index 7b7f18ac..06d6d6fd 100644 --- a/test/c/std/deflate.c +++ b/test/c/std/deflate.c @@ -50,68 +50,68 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the // The src_offset0 and src_offset1 magic numbers come from: // -// go run script/extract-flate-offsets.go test/testdata/*.gz +// go run script/extract-flate-offsets.go test/data/*.gz // // The empty comments forces clang-format to place one element per line. golden_test crc32_midsummer_gt = { - .src_filename = "../../testdata/midsummer.txt", // + .src_filename = "../../data/midsummer.txt", // }; golden_test crc32_pi_gt = { - .src_filename = "../../testdata/pi.txt", // + .src_filename = "../../data/pi.txt", // }; golden_test deflate_256_bytes_gt = { - .want_filename = "../../testdata/artificial/256.bytes", // - .src_filename = "../../testdata/artificial/256.bytes.gz", // - .src_offset0 = 20, // - .src_offset1 = 281, // + .want_filename = "../../data/artificial/256.bytes", // + .src_filename = "../../data/artificial/256.bytes.gz", // + .src_offset0 = 20, // + .src_offset1 = 281, // }; golden_test deflate_deflate_backref_crosses_blocks_gt = { .want_filename = - "../../testdata/artificial/" + "../../data/artificial/" "deflate-backref-crosses-blocks.deflate.decompressed", .src_filename = - "../../testdata/artificial/" + "../../data/artificial/" "deflate-backref-crosses-blocks.deflate", }; golden_test deflate_midsummer_gt = { - .want_filename = "../../testdata/midsummer.txt", // - .src_filename = "../../testdata/midsummer.txt.gz", // - .src_offset0 = 24, // - .src_offset1 = 5166, // + .want_filename = "../../data/midsummer.txt", // + .src_filename = "../../data/midsummer.txt.gz", // + .src_offset0 = 24, // + .src_offset1 = 5166, // }; golden_test deflate_pi_gt = { - .want_filename = "../../testdata/pi.txt", // - .src_filename = "../../testdata/pi.txt.gz", // - .src_offset0 = 17, // - .src_offset1 = 48335, // + .want_filename = "../../data/pi.txt", // + .src_filename = "../../data/pi.txt.gz", // + .src_offset0 = 17, // + .src_offset1 = 48335, // }; golden_test deflate_romeo_gt = { - .want_filename = "../../testdata/romeo.txt", // - .src_filename = "../../testdata/romeo.txt.gz", // - .src_offset0 = 20, // - .src_offset1 = 550, // + .want_filename = "../../data/romeo.txt", // + .src_filename = "../../data/romeo.txt.gz", // + .src_offset0 = 20, // + .src_offset1 = 550, // }; golden_test deflate_romeo_fixed_gt = { - .want_filename = "../../testdata/romeo.txt", // - .src_filename = "../../testdata/romeo.txt.fixed-huff.deflate", // + .want_filename = "../../data/romeo.txt", // + .src_filename = "../../data/romeo.txt.fixed-huff.deflate", // }; golden_test gzip_midsummer_gt = { - .want_filename = "../../testdata/midsummer.txt", // - .src_filename = "../../testdata/midsummer.txt.gz", // + .want_filename = "../../data/midsummer.txt", // + .src_filename = "../../data/midsummer.txt.gz", // }; golden_test gzip_pi_gt = { - .want_filename = "../../testdata/pi.txt", // - .src_filename = "../../testdata/pi.txt.gz", // + .want_filename = "../../data/pi.txt", // + .src_filename = "../../data/pi.txt.gz", // }; // ---------------- Deflate Tests diff --git a/test/c/std/gif.c b/test/c/std/gif.c index dd27798a..b08098d5 100644 --- a/test/c/std/gif.c +++ b/test/c/std/gif.c @@ -277,34 +277,32 @@ bool do_test_wuffs_lzw_decode(const char* src_filename, void test_wuffs_lzw_decode_many_big_reads() { CHECK_FOCUS(__func__); - do_test_wuffs_lzw_decode("../../testdata/bricks-gray.indexes.giflzw", 14731, - "../../testdata/bricks-gray.indexes", 19200, 0, - 4096); + do_test_wuffs_lzw_decode("../../data/bricks-gray.indexes.giflzw", 14731, + "../../data/bricks-gray.indexes", 19200, 0, 4096); } void test_wuffs_lzw_decode_many_small_writes_reads() { CHECK_FOCUS(__func__); - do_test_wuffs_lzw_decode("../../testdata/bricks-gray.indexes.giflzw", 14731, - "../../testdata/bricks-gray.indexes", 19200, 41, 43); + do_test_wuffs_lzw_decode("../../data/bricks-gray.indexes.giflzw", 14731, + "../../data/bricks-gray.indexes", 19200, 41, 43); } void test_wuffs_lzw_decode_bricks_dither() { CHECK_FOCUS(__func__); - do_test_wuffs_lzw_decode("../../testdata/bricks-dither.indexes.giflzw", 14923, - "../../testdata/bricks-dither.indexes", 19200, 0, 0); + do_test_wuffs_lzw_decode("../../data/bricks-dither.indexes.giflzw", 14923, + "../../data/bricks-dither.indexes", 19200, 0, 0); } void test_wuffs_lzw_decode_bricks_nodither() { CHECK_FOCUS(__func__); - do_test_wuffs_lzw_decode("../../testdata/bricks-nodither.indexes.giflzw", - 13382, "../../testdata/bricks-nodither.indexes", - 19200, 0, 0); + do_test_wuffs_lzw_decode("../../data/bricks-nodither.indexes.giflzw", 13382, + "../../data/bricks-nodither.indexes", 19200, 0, 0); } void test_wuffs_lzw_decode_pi() { CHECK_FOCUS(__func__); - do_test_wuffs_lzw_decode("../../testdata/pi.txt.giflzw", 50550, - "../../testdata/pi.txt", 100003, 0, 0); + do_test_wuffs_lzw_decode("../../data/pi.txt.giflzw", 50550, + "../../data/pi.txt", 100003, 0, 0); } // ---------------- LZW Benches @@ -350,12 +348,12 @@ bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t reps) { void bench_wuffs_lzw_decode_20k() { CHECK_FOCUS(__func__); - do_bench_wuffs_lzw_decode("../../testdata/bricks-gray.indexes.giflzw", 5000); + do_bench_wuffs_lzw_decode("../../data/bricks-gray.indexes.giflzw", 5000); } void bench_wuffs_lzw_decode_100k() { CHECK_FOCUS(__func__); - do_bench_wuffs_lzw_decode("../../testdata/pi.txt.giflzw", 1000); + do_bench_wuffs_lzw_decode("../../data/pi.txt.giflzw", 1000); } // ---------------- GIF Tests @@ -532,7 +530,7 @@ void test_wuffs_gif_call_sequence() { wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE}; wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE}; - if (!read_file(&src, "../../testdata/bricks-dither.gif")) { + if (!read_file(&src, "../../data/bricks-dither.gif")) { return; } @@ -559,7 +557,7 @@ void test_wuffs_gif_decode_animated() { wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE}; wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE}; - if (!read_file(&src, "../../testdata/animated-red-blue.gif")) { + if (!read_file(&src, "../../data/animated-red-blue.gif")) { return; } @@ -618,23 +616,23 @@ void test_wuffs_gif_decode_animated() { void test_wuffs_gif_decode_input_is_a_gif() { CHECK_FOCUS(__func__); - do_test_wuffs_gif_decode("../../testdata/bricks-dither.gif", - "../../testdata/bricks-dither.palette", - "../../testdata/bricks-dither.indexes", 0, 0); + do_test_wuffs_gif_decode("../../data/bricks-dither.gif", + "../../data/bricks-dither.palette", + "../../data/bricks-dither.indexes", 0, 0); } void test_wuffs_gif_decode_input_is_a_gif_many_big_reads() { CHECK_FOCUS(__func__); - do_test_wuffs_gif_decode("../../testdata/bricks-dither.gif", - "../../testdata/bricks-dither.palette", - "../../testdata/bricks-dither.indexes", 0, 4096); + do_test_wuffs_gif_decode("../../data/bricks-dither.gif", + "../../data/bricks-dither.palette", + "../../data/bricks-dither.indexes", 0, 4096); } void test_wuffs_gif_decode_input_is_a_gif_many_medium_reads() { CHECK_FOCUS(__func__); - do_test_wuffs_gif_decode("../../testdata/bricks-dither.gif", - "../../testdata/bricks-dither.palette", - "../../testdata/bricks-dither.indexes", 0, 787); + do_test_wuffs_gif_decode("../../data/bricks-dither.gif", + "../../data/bricks-dither.palette", + "../../data/bricks-dither.indexes", 0, 787); // The magic 787 tickles being in the middle of a decode_extension skip32 // call. // @@ -643,9 +641,9 @@ void test_wuffs_gif_decode_input_is_a_gif_many_medium_reads() { void test_wuffs_gif_decode_input_is_a_gif_many_small_writes_reads() { CHECK_FOCUS(__func__); - do_test_wuffs_gif_decode("../../testdata/bricks-dither.gif", - "../../testdata/bricks-dither.palette", - "../../testdata/bricks-dither.indexes", 11, 13); + do_test_wuffs_gif_decode("../../data/bricks-dither.gif", + "../../data/bricks-dither.palette", + "../../data/bricks-dither.indexes", 11, 13); } void test_wuffs_gif_decode_input_is_a_png() { @@ -653,7 +651,7 @@ void test_wuffs_gif_decode_input_is_a_png() { wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE}; - if (!read_file(&src, "../../testdata/bricks-dither.png")) { + if (!read_file(&src, "../../data/bricks-dither.png")) { return; } @@ -709,37 +707,37 @@ bool do_test_mimic_gif_decode(const char* filename) { void test_mimic_gif_decode_bricks_dither() { CHECK_FOCUS(__func__); - do_test_mimic_gif_decode("../../testdata/bricks-dither.gif"); + do_test_mimic_gif_decode("../../data/bricks-dither.gif"); } void test_mimic_gif_decode_bricks_gray() { CHECK_FOCUS(__func__); - do_test_mimic_gif_decode("../../testdata/bricks-gray.gif"); + do_test_mimic_gif_decode("../../data/bricks-gray.gif"); } void test_mimic_gif_decode_bricks_nodither() { CHECK_FOCUS(__func__); - do_test_mimic_gif_decode("../../testdata/bricks-nodither.gif"); + do_test_mimic_gif_decode("../../data/bricks-nodither.gif"); } void test_mimic_gif_decode_harvesters() { CHECK_FOCUS(__func__); - do_test_mimic_gif_decode("../../testdata/harvesters.gif"); + do_test_mimic_gif_decode("../../data/harvesters.gif"); } void test_mimic_gif_decode_hat() { CHECK_FOCUS(__func__); - do_test_mimic_gif_decode("../../testdata/hat.gif"); + do_test_mimic_gif_decode("../../data/hat.gif"); } void test_mimic_gif_decode_hibiscus() { CHECK_FOCUS(__func__); - do_test_mimic_gif_decode("../../testdata/hibiscus.gif"); + do_test_mimic_gif_decode("../../data/hibiscus.gif"); } void test_mimic_gif_decode_pjw_thumbnail() { CHECK_FOCUS(__func__); - do_test_mimic_gif_decode("../../testdata/pjw-thumbnail.gif"); + do_test_mimic_gif_decode("../../data/pjw-thumbnail.gif"); } #endif // WUFFS_MIMIC @@ -776,23 +774,22 @@ bool do_bench_gif_decode(const char* (*decode_func)(wuffs_base__buf1*, void bench_wuffs_gif_decode_1k() { CHECK_FOCUS(__func__); - do_bench_gif_decode(wuffs_gif_decode, "../../testdata/pjw-thumbnail.gif", - 200000); + do_bench_gif_decode(wuffs_gif_decode, "../../data/pjw-thumbnail.gif", 200000); } void bench_wuffs_gif_decode_10k() { CHECK_FOCUS(__func__); - do_bench_gif_decode(wuffs_gif_decode, "../../testdata/hat.gif", 10000); + do_bench_gif_decode(wuffs_gif_decode, "../../data/hat.gif", 10000); } void bench_wuffs_gif_decode_100k() { CHECK_FOCUS(__func__); - do_bench_gif_decode(wuffs_gif_decode, "../../testdata/hibiscus.gif", 1000); + do_bench_gif_decode(wuffs_gif_decode, "../../data/hibiscus.gif", 1000); } void bench_wuffs_gif_decode_1000k() { CHECK_FOCUS(__func__); - do_bench_gif_decode(wuffs_gif_decode, "../../testdata/harvesters.gif", 100); + do_bench_gif_decode(wuffs_gif_decode, "../../data/harvesters.gif", 100); } // ---------------- Mimic Benches @@ -801,23 +798,22 @@ void bench_wuffs_gif_decode_1000k() { void bench_mimic_gif_decode_1k() { CHECK_FOCUS(__func__); - do_bench_gif_decode(mimic_gif_decode, "../../testdata/pjw-thumbnail.gif", - 200000); + do_bench_gif_decode(mimic_gif_decode, "../../data/pjw-thumbnail.gif", 200000); } void bench_mimic_gif_decode_10k() { CHECK_FOCUS(__func__); - do_bench_gif_decode(mimic_gif_decode, "../../testdata/hat.gif", 10000); + do_bench_gif_decode(mimic_gif_decode, "../../data/hat.gif", 10000); } void bench_mimic_gif_decode_100k() { CHECK_FOCUS(__func__); - do_bench_gif_decode(mimic_gif_decode, "../../testdata/hibiscus.gif", 1000); + do_bench_gif_decode(mimic_gif_decode, "../../data/hibiscus.gif", 1000); } void bench_mimic_gif_decode_1000k() { CHECK_FOCUS(__func__); - do_bench_gif_decode(mimic_gif_decode, "../../testdata/harvesters.gif", 100); + do_bench_gif_decode(mimic_gif_decode, "../../data/harvesters.gif", 100); } #endif // WUFFS_MIMIC diff --git a/test/c/std/zlib.c b/test/c/std/zlib.c index 8d2b4db1..f493d95b 100644 --- a/test/c/std/zlib.c +++ b/test/c/std/zlib.c @@ -50,21 +50,21 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the // ---------------- Golden Tests golden_test adler32_midsummer_gt = { - .src_filename = "../../testdata/midsummer.txt", // + .src_filename = "../../data/midsummer.txt", // }; golden_test adler32_pi_gt = { - .src_filename = "../../testdata/pi.txt", // + .src_filename = "../../data/pi.txt", // }; golden_test zlib_midsummer_gt = { - .want_filename = "../../testdata/midsummer.txt", // - .src_filename = "../../testdata/midsummer.txt.zlib", // + .want_filename = "../../data/midsummer.txt", // + .src_filename = "../../data/midsummer.txt.zlib", // }; golden_test zlib_pi_gt = { - .want_filename = "../../testdata/pi.txt", // - .src_filename = "../../testdata/pi.txt.zlib", // + .want_filename = "../../data/pi.txt", // + .src_filename = "../../data/pi.txt.zlib", // }; // ---------------- Basic Tests @@ -93,31 +93,31 @@ void test_wuffs_adler32() { uint32_t want; } test_cases[] = { { - .filename = "../../testdata/hat.bmp", + .filename = "../../data/hat.bmp", .want = 0x3D26D034, }, { - .filename = "../../testdata/hat.gif", + .filename = "../../data/hat.gif", .want = 0x2A5EB144, }, { - .filename = "../../testdata/hat.jpeg", + .filename = "../../data/hat.jpeg", .want = 0x3A503B1A, }, { - .filename = "../../testdata/hat.lossless.webp", + .filename = "../../data/hat.lossless.webp", .want = 0xD059D427, }, { - .filename = "../../testdata/hat.lossy.webp", + .filename = "../../data/hat.lossy.webp", .want = 0xF1BB258D, }, { - .filename = "../../testdata/hat.png", + .filename = "../../data/hat.png", .want = 0xDFC6C9C6, }, { - .filename = "../../testdata/hat.tiff", + .filename = "../../data/hat.tiff", .want = 0xBDC011E9, }, }; diff --git a/test/testdata/README.md b/test/data/README.md similarity index 99% rename from test/testdata/README.md rename to test/data/README.md index bbdd0975..34c59b27 100644 --- a/test/testdata/README.md +++ b/test/data/README.md @@ -4,7 +4,7 @@ script/extract-deflate-offsets.go. Similarly, the \*.giflzw files were generated by script/extract-giflzw.go and the \*.palette and \*.indexes files were generated by script/extract-palette-indexes.go -The \*.jpeg files are usually the canonical versions of the testdata images, +The \*.jpeg files are usually the canonical versions of the test/data images, and other versions (\*.bmp, \*.gif, \*.png, \*.tiff) were generated by ImageMagick's convert command line tool. The \*.webp versions were generated by the cwebp command line tool. diff --git a/test/testdata/animated-red-blue.gif b/test/data/animated-red-blue.gif similarity index 100% rename from test/testdata/animated-red-blue.gif rename to test/data/animated-red-blue.gif diff --git a/test/testdata/artificial/256.bytes b/test/data/artificial/256.bytes similarity index 100% rename from test/testdata/artificial/256.bytes rename to test/data/artificial/256.bytes diff --git a/test/testdata/artificial/256.bytes.gz b/test/data/artificial/256.bytes.gz similarity index 100% rename from test/testdata/artificial/256.bytes.gz rename to test/data/artificial/256.bytes.gz diff --git a/test/testdata/artificial/deflate-backref-crosses-blocks.deflate b/test/data/artificial/deflate-backref-crosses-blocks.deflate similarity index 100% rename from test/testdata/artificial/deflate-backref-crosses-blocks.deflate rename to test/data/artificial/deflate-backref-crosses-blocks.deflate diff --git a/test/testdata/artificial/deflate-backref-crosses-blocks.deflate.commentary.txt b/test/data/artificial/deflate-backref-crosses-blocks.deflate.commentary.txt similarity index 100% rename from test/testdata/artificial/deflate-backref-crosses-blocks.deflate.commentary.txt rename to test/data/artificial/deflate-backref-crosses-blocks.deflate.commentary.txt diff --git a/test/testdata/artificial/deflate-backref-crosses-blocks.deflate.decompressed b/test/data/artificial/deflate-backref-crosses-blocks.deflate.decompressed similarity index 100% rename from test/testdata/artificial/deflate-backref-crosses-blocks.deflate.decompressed rename to test/data/artificial/deflate-backref-crosses-blocks.deflate.decompressed diff --git a/test/testdata/bricks-color.bmp b/test/data/bricks-color.bmp similarity index 100% rename from test/testdata/bricks-color.bmp rename to test/data/bricks-color.bmp diff --git a/test/testdata/bricks-color.jpeg b/test/data/bricks-color.jpeg similarity index 100% rename from test/testdata/bricks-color.jpeg rename to test/data/bricks-color.jpeg diff --git a/test/testdata/bricks-color.lossless.webp b/test/data/bricks-color.lossless.webp similarity index 100% rename from test/testdata/bricks-color.lossless.webp rename to test/data/bricks-color.lossless.webp diff --git a/test/testdata/bricks-color.lossy.webp b/test/data/bricks-color.lossy.webp similarity index 100% rename from test/testdata/bricks-color.lossy.webp rename to test/data/bricks-color.lossy.webp diff --git a/test/testdata/bricks-color.png b/test/data/bricks-color.png similarity index 100% rename from test/testdata/bricks-color.png rename to test/data/bricks-color.png diff --git a/test/testdata/bricks-color.tiff b/test/data/bricks-color.tiff similarity index 100% rename from test/testdata/bricks-color.tiff rename to test/data/bricks-color.tiff diff --git a/test/testdata/bricks-dither.bmp b/test/data/bricks-dither.bmp similarity index 100% rename from test/testdata/bricks-dither.bmp rename to test/data/bricks-dither.bmp diff --git a/test/testdata/bricks-dither.gif b/test/data/bricks-dither.gif similarity index 100% rename from test/testdata/bricks-dither.gif rename to test/data/bricks-dither.gif diff --git a/test/testdata/bricks-dither.indexes b/test/data/bricks-dither.indexes similarity index 100% rename from test/testdata/bricks-dither.indexes rename to test/data/bricks-dither.indexes diff --git a/test/testdata/bricks-dither.indexes.giflzw b/test/data/bricks-dither.indexes.giflzw similarity index 100% rename from test/testdata/bricks-dither.indexes.giflzw rename to test/data/bricks-dither.indexes.giflzw diff --git a/test/testdata/bricks-dither.lossless.webp b/test/data/bricks-dither.lossless.webp similarity index 100% rename from test/testdata/bricks-dither.lossless.webp rename to test/data/bricks-dither.lossless.webp diff --git a/test/testdata/bricks-dither.palette b/test/data/bricks-dither.palette similarity index 100% rename from test/testdata/bricks-dither.palette rename to test/data/bricks-dither.palette diff --git a/test/testdata/bricks-dither.png b/test/data/bricks-dither.png similarity index 100% rename from test/testdata/bricks-dither.png rename to test/data/bricks-dither.png diff --git a/test/testdata/bricks-gray.bmp b/test/data/bricks-gray.bmp similarity index 100% rename from test/testdata/bricks-gray.bmp rename to test/data/bricks-gray.bmp diff --git a/test/testdata/bricks-gray.gif b/test/data/bricks-gray.gif similarity index 100% rename from test/testdata/bricks-gray.gif rename to test/data/bricks-gray.gif diff --git a/test/testdata/bricks-gray.indexes b/test/data/bricks-gray.indexes similarity index 100% rename from test/testdata/bricks-gray.indexes rename to test/data/bricks-gray.indexes diff --git a/test/testdata/bricks-gray.indexes.giflzw b/test/data/bricks-gray.indexes.giflzw similarity index 100% rename from test/testdata/bricks-gray.indexes.giflzw rename to test/data/bricks-gray.indexes.giflzw diff --git a/test/testdata/bricks-gray.jpeg b/test/data/bricks-gray.jpeg similarity index 100% rename from test/testdata/bricks-gray.jpeg rename to test/data/bricks-gray.jpeg diff --git a/test/testdata/bricks-gray.lossless.webp b/test/data/bricks-gray.lossless.webp similarity index 100% rename from test/testdata/bricks-gray.lossless.webp rename to test/data/bricks-gray.lossless.webp diff --git a/test/testdata/bricks-gray.lossy.webp b/test/data/bricks-gray.lossy.webp similarity index 100% rename from test/testdata/bricks-gray.lossy.webp rename to test/data/bricks-gray.lossy.webp diff --git a/test/testdata/bricks-gray.png b/test/data/bricks-gray.png similarity index 100% rename from test/testdata/bricks-gray.png rename to test/data/bricks-gray.png diff --git a/test/testdata/bricks-gray.tiff b/test/data/bricks-gray.tiff similarity index 100% rename from test/testdata/bricks-gray.tiff rename to test/data/bricks-gray.tiff diff --git a/test/testdata/bricks-nodither.bmp b/test/data/bricks-nodither.bmp similarity index 100% rename from test/testdata/bricks-nodither.bmp rename to test/data/bricks-nodither.bmp diff --git a/test/testdata/bricks-nodither.gif b/test/data/bricks-nodither.gif similarity index 100% rename from test/testdata/bricks-nodither.gif rename to test/data/bricks-nodither.gif diff --git a/test/testdata/bricks-nodither.indexes b/test/data/bricks-nodither.indexes similarity index 100% rename from test/testdata/bricks-nodither.indexes rename to test/data/bricks-nodither.indexes diff --git a/test/testdata/bricks-nodither.indexes.giflzw b/test/data/bricks-nodither.indexes.giflzw similarity index 100% rename from test/testdata/bricks-nodither.indexes.giflzw rename to test/data/bricks-nodither.indexes.giflzw diff --git a/test/testdata/bricks-nodither.lossless.webp b/test/data/bricks-nodither.lossless.webp similarity index 100% rename from test/testdata/bricks-nodither.lossless.webp rename to test/data/bricks-nodither.lossless.webp diff --git a/test/testdata/bricks-nodither.palette b/test/data/bricks-nodither.palette similarity index 100% rename from test/testdata/bricks-nodither.palette rename to test/data/bricks-nodither.palette diff --git a/test/testdata/bricks-nodither.png b/test/data/bricks-nodither.png similarity index 100% rename from test/testdata/bricks-nodither.png rename to test/data/bricks-nodither.png diff --git a/test/testdata/gifplayer-muybridge.gif b/test/data/gifplayer-muybridge.gif similarity index 100% rename from test/testdata/gifplayer-muybridge.gif rename to test/data/gifplayer-muybridge.gif diff --git a/test/testdata/harvesters.bmp b/test/data/harvesters.bmp similarity index 100% rename from test/testdata/harvesters.bmp rename to test/data/harvesters.bmp diff --git a/test/testdata/harvesters.gif b/test/data/harvesters.gif similarity index 100% rename from test/testdata/harvesters.gif rename to test/data/harvesters.gif diff --git a/test/testdata/harvesters.jpeg b/test/data/harvesters.jpeg similarity index 100% rename from test/testdata/harvesters.jpeg rename to test/data/harvesters.jpeg diff --git a/test/testdata/harvesters.lossless.webp b/test/data/harvesters.lossless.webp similarity index 100% rename from test/testdata/harvesters.lossless.webp rename to test/data/harvesters.lossless.webp diff --git a/test/testdata/harvesters.lossy.webp b/test/data/harvesters.lossy.webp similarity index 100% rename from test/testdata/harvesters.lossy.webp rename to test/data/harvesters.lossy.webp diff --git a/test/testdata/harvesters.png b/test/data/harvesters.png similarity index 100% rename from test/testdata/harvesters.png rename to test/data/harvesters.png diff --git a/test/testdata/harvesters.tiff b/test/data/harvesters.tiff similarity index 100% rename from test/testdata/harvesters.tiff rename to test/data/harvesters.tiff diff --git a/test/testdata/hat.bmp b/test/data/hat.bmp similarity index 100% rename from test/testdata/hat.bmp rename to test/data/hat.bmp diff --git a/test/testdata/hat.gif b/test/data/hat.gif similarity index 100% rename from test/testdata/hat.gif rename to test/data/hat.gif diff --git a/test/testdata/hat.jpeg b/test/data/hat.jpeg similarity index 100% rename from test/testdata/hat.jpeg rename to test/data/hat.jpeg diff --git a/test/testdata/hat.lossless.webp b/test/data/hat.lossless.webp similarity index 100% rename from test/testdata/hat.lossless.webp rename to test/data/hat.lossless.webp diff --git a/test/testdata/hat.lossy.webp b/test/data/hat.lossy.webp similarity index 100% rename from test/testdata/hat.lossy.webp rename to test/data/hat.lossy.webp diff --git a/test/testdata/hat.png b/test/data/hat.png similarity index 100% rename from test/testdata/hat.png rename to test/data/hat.png diff --git a/test/testdata/hat.tiff b/test/data/hat.tiff similarity index 100% rename from test/testdata/hat.tiff rename to test/data/hat.tiff diff --git a/test/testdata/hibiscus.bmp b/test/data/hibiscus.bmp similarity index 100% rename from test/testdata/hibiscus.bmp rename to test/data/hibiscus.bmp diff --git a/test/testdata/hibiscus.gif b/test/data/hibiscus.gif similarity index 100% rename from test/testdata/hibiscus.gif rename to test/data/hibiscus.gif diff --git a/test/testdata/hibiscus.jpeg b/test/data/hibiscus.jpeg similarity index 100% rename from test/testdata/hibiscus.jpeg rename to test/data/hibiscus.jpeg diff --git a/test/testdata/hibiscus.lossless.webp b/test/data/hibiscus.lossless.webp similarity index 100% rename from test/testdata/hibiscus.lossless.webp rename to test/data/hibiscus.lossless.webp diff --git a/test/testdata/hibiscus.lossy.webp b/test/data/hibiscus.lossy.webp similarity index 100% rename from test/testdata/hibiscus.lossy.webp rename to test/data/hibiscus.lossy.webp diff --git a/test/testdata/hibiscus.png b/test/data/hibiscus.png similarity index 100% rename from test/testdata/hibiscus.png rename to test/data/hibiscus.png diff --git a/test/testdata/hibiscus.tiff b/test/data/hibiscus.tiff similarity index 100% rename from test/testdata/hibiscus.tiff rename to test/data/hibiscus.tiff diff --git a/test/testdata/midsummer.txt b/test/data/midsummer.txt similarity index 100% rename from test/testdata/midsummer.txt rename to test/data/midsummer.txt diff --git a/test/testdata/midsummer.txt.gz b/test/data/midsummer.txt.gz similarity index 100% rename from test/testdata/midsummer.txt.gz rename to test/data/midsummer.txt.gz diff --git a/test/testdata/midsummer.txt.zlib b/test/data/midsummer.txt.zlib similarity index 100% rename from test/testdata/midsummer.txt.zlib rename to test/data/midsummer.txt.zlib diff --git a/test/testdata/muybridge-frame-000.indexes b/test/data/muybridge-frame-000.indexes similarity index 100% rename from test/testdata/muybridge-frame-000.indexes rename to test/data/muybridge-frame-000.indexes diff --git a/test/testdata/muybridge-frame-001.indexes b/test/data/muybridge-frame-001.indexes similarity index 100% rename from test/testdata/muybridge-frame-001.indexes rename to test/data/muybridge-frame-001.indexes diff --git a/test/testdata/muybridge-frame-002.indexes b/test/data/muybridge-frame-002.indexes similarity index 100% rename from test/testdata/muybridge-frame-002.indexes rename to test/data/muybridge-frame-002.indexes diff --git a/test/testdata/muybridge-frame-003.indexes b/test/data/muybridge-frame-003.indexes similarity index 100% rename from test/testdata/muybridge-frame-003.indexes rename to test/data/muybridge-frame-003.indexes diff --git a/test/testdata/muybridge-frame-004.indexes b/test/data/muybridge-frame-004.indexes similarity index 100% rename from test/testdata/muybridge-frame-004.indexes rename to test/data/muybridge-frame-004.indexes diff --git a/test/testdata/muybridge-frame-005.indexes b/test/data/muybridge-frame-005.indexes similarity index 100% rename from test/testdata/muybridge-frame-005.indexes rename to test/data/muybridge-frame-005.indexes diff --git a/test/testdata/muybridge-frame-006.indexes b/test/data/muybridge-frame-006.indexes similarity index 100% rename from test/testdata/muybridge-frame-006.indexes rename to test/data/muybridge-frame-006.indexes diff --git a/test/testdata/muybridge-frame-007.indexes b/test/data/muybridge-frame-007.indexes similarity index 100% rename from test/testdata/muybridge-frame-007.indexes rename to test/data/muybridge-frame-007.indexes diff --git a/test/testdata/muybridge-frame-008.indexes b/test/data/muybridge-frame-008.indexes similarity index 100% rename from test/testdata/muybridge-frame-008.indexes rename to test/data/muybridge-frame-008.indexes diff --git a/test/testdata/muybridge-frame-009.indexes b/test/data/muybridge-frame-009.indexes similarity index 100% rename from test/testdata/muybridge-frame-009.indexes rename to test/data/muybridge-frame-009.indexes diff --git a/test/testdata/muybridge-frame-010.indexes b/test/data/muybridge-frame-010.indexes similarity index 100% rename from test/testdata/muybridge-frame-010.indexes rename to test/data/muybridge-frame-010.indexes diff --git a/test/testdata/muybridge-frame-011.indexes b/test/data/muybridge-frame-011.indexes similarity index 100% rename from test/testdata/muybridge-frame-011.indexes rename to test/data/muybridge-frame-011.indexes diff --git a/test/testdata/muybridge-frame-012.indexes b/test/data/muybridge-frame-012.indexes similarity index 100% rename from test/testdata/muybridge-frame-012.indexes rename to test/data/muybridge-frame-012.indexes diff --git a/test/testdata/muybridge-frame-013.indexes b/test/data/muybridge-frame-013.indexes similarity index 100% rename from test/testdata/muybridge-frame-013.indexes rename to test/data/muybridge-frame-013.indexes diff --git a/test/testdata/muybridge-frame-014.indexes b/test/data/muybridge-frame-014.indexes similarity index 100% rename from test/testdata/muybridge-frame-014.indexes rename to test/data/muybridge-frame-014.indexes diff --git a/test/testdata/muybridge.gif b/test/data/muybridge.gif similarity index 100% rename from test/testdata/muybridge.gif rename to test/data/muybridge.gif diff --git a/test/testdata/pi.txt b/test/data/pi.txt similarity index 100% rename from test/testdata/pi.txt rename to test/data/pi.txt diff --git a/test/testdata/pi.txt.giflzw b/test/data/pi.txt.giflzw similarity index 100% rename from test/testdata/pi.txt.giflzw rename to test/data/pi.txt.giflzw diff --git a/test/testdata/pi.txt.gz b/test/data/pi.txt.gz similarity index 100% rename from test/testdata/pi.txt.gz rename to test/data/pi.txt.gz diff --git a/test/testdata/pi.txt.zlib b/test/data/pi.txt.zlib similarity index 100% rename from test/testdata/pi.txt.zlib rename to test/data/pi.txt.zlib diff --git a/test/testdata/pjw-thumbnail.bmp b/test/data/pjw-thumbnail.bmp similarity index 100% rename from test/testdata/pjw-thumbnail.bmp rename to test/data/pjw-thumbnail.bmp diff --git a/test/testdata/pjw-thumbnail.gif b/test/data/pjw-thumbnail.gif similarity index 100% rename from test/testdata/pjw-thumbnail.gif rename to test/data/pjw-thumbnail.gif diff --git a/test/testdata/pjw-thumbnail.jpeg b/test/data/pjw-thumbnail.jpeg similarity index 100% rename from test/testdata/pjw-thumbnail.jpeg rename to test/data/pjw-thumbnail.jpeg diff --git a/test/testdata/pjw-thumbnail.lossless.webp b/test/data/pjw-thumbnail.lossless.webp similarity index 100% rename from test/testdata/pjw-thumbnail.lossless.webp rename to test/data/pjw-thumbnail.lossless.webp diff --git a/test/testdata/pjw-thumbnail.lossy.webp b/test/data/pjw-thumbnail.lossy.webp similarity index 100% rename from test/testdata/pjw-thumbnail.lossy.webp rename to test/data/pjw-thumbnail.lossy.webp diff --git a/test/testdata/pjw-thumbnail.png b/test/data/pjw-thumbnail.png similarity index 100% rename from test/testdata/pjw-thumbnail.png rename to test/data/pjw-thumbnail.png diff --git a/test/testdata/pjw-thumbnail.tiff b/test/data/pjw-thumbnail.tiff similarity index 100% rename from test/testdata/pjw-thumbnail.tiff rename to test/data/pjw-thumbnail.tiff diff --git a/test/testdata/romeo.txt b/test/data/romeo.txt similarity index 100% rename from test/testdata/romeo.txt rename to test/data/romeo.txt diff --git a/test/testdata/romeo.txt.deflate b/test/data/romeo.txt.deflate similarity index 100% rename from test/testdata/romeo.txt.deflate rename to test/data/romeo.txt.deflate diff --git a/test/testdata/romeo.txt.fixed-huff.deflate b/test/data/romeo.txt.fixed-huff.deflate similarity index 100% rename from test/testdata/romeo.txt.fixed-huff.deflate rename to test/data/romeo.txt.fixed-huff.deflate diff --git a/test/testdata/romeo.txt.gz b/test/data/romeo.txt.gz similarity index 100% rename from test/testdata/romeo.txt.gz rename to test/data/romeo.txt.gz diff --git a/test/testdata/romeo.txt.zlib b/test/data/romeo.txt.zlib similarity index 100% rename from test/testdata/romeo.txt.zlib rename to test/data/romeo.txt.zlib