This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit 70ccf5dc2cd087473fccea7fa95f15f0041cdb32
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Nov 13 09:09:30 2023 -0500
Move test fixtures from src/test/data to src/test/resources
---
pom.xml | 18 +++++++++---------
.../apache/commons/imaging/ImagingTestConstants.java | 13 +++++--------
.../imaging/formats/png/PngMultipleRoundtripTest.java | 4 ++--
.../1/Oregon Scientific DS6639 - DSC_0307 - small.bmp | Bin
.../data/images/bmp/2/@broken/SanselanTest.bmp | Bin
.../data/images/bmp/3/V4-bitfields.bmp | Bin
src/test/{ => resources}/data/images/bmp/4/rle4.bmp | Bin
.../{ => resources}/data/images/bmp/4/rle4deltaXY.asm | 0
.../{ => resources}/data/images/bmp/4/rle4deltaXY.bmp | Bin
src/test/{ => resources}/data/images/bmp/4/rle8.asm | 0
src/test/{ => resources}/data/images/bmp/4/rle8.bmp | Bin
.../timeout-bd15dbfa26b4e88070de540c6603039e8a88626f | Bin
.../1/Oregon Scientific DS6639 - DSC_0307 - small.dcx | Bin
.../data/images/gif/animated/1/animated.gif | Bin
.../data/images/gif/animated/2/no_disposal.gif | Bin
.../1/Oregon Scientific DS6639 - DSC_0307 - small.gif | Bin
.../{ => resources}/data/images/gif/single/2/test.gif | Bin
.../data/images/icns/1/poedit16x16.icns | Bin
.../data/images/icns/1/poedit32x32.icns | Bin
.../data/images/icns/1/poedit48x48.icns | Bin
.../1/Oregon Scientific DS6639 - DSC_0307 - small.ico | Bin
src/test/{ => resources}/data/images/info.txt | 0
... DS6639 - DSC_0307 - iptc added with irfanview.jpg | Bin
... DS6639 - DSC_0307 - iptc added with photoshop.jpg | Bin
.../Canon Powershot SD750 - 2007.12.26.n.IMG_3704.JPG | Bin
.../jpg/1/Nikon D50 - 2007.12.19.n.DSC_3656.JPG | Bin
.../1/Oregon Scientific DS6639 - DSC_0307 - small.jpg | Bin
.../jpg/1/Oregon Scientific DS6639 - DSC_0307.JPG | Bin
...7-27+-+Photo+216+-+WE+a+l'etang+de+Blodelsheim.jpg | Bin
.../data/images/jpg/3/img_F028c_small.jpg | Bin
.../images/jpg/4/0x00-to-0xFF-between-segments.jpg | Bin
...00Z_01_BTRE6021PS000_RTROPTP_3_BUSINESS-US-TSE.JPG | Bin
src/test/{ => resources}/data/images/jpg/6/image.jpeg | Bin
.../{ => resources}/data/images/jpg/7/_DSC6099.jpg | Bin
.../{ => resources}/data/images/jpg/7/_DSC6099.webp | Bin
.../1/Oregon Scientific DS6639 - DSC_0307 - small.pbm | Bin
.../1/Oregon Scientific DS6639 - DSC_0307 - small.pgm | 0
.../1/Oregon Scientific DS6639 - DSC_0307 - small.ppm | Bin
.../data/images/pbm/2/5x5-bw-alpha.asm | 0
.../data/images/pbm/2/5x5-bw-alpha.pam | Bin
src/test/{ => resources}/data/images/pbm/2/5x5-bw.asm | 0
src/test/{ => resources}/data/images/pbm/2/5x5-bw.pam | Bin
.../data/images/pbm/2/5x5-grayscale-alpha.asm | 0
.../data/images/pbm/2/5x5-grayscale-alpha.pam | Bin
.../data/images/pbm/2/5x5-grayscale.asm | 0
.../data/images/pbm/2/5x5-grayscale.pam | Bin
.../data/images/pbm/2/5x5-rgb-alpha.asm | 0
.../data/images/pbm/2/5x5-rgb-alpha.pam | Bin
.../{ => resources}/data/images/pbm/2/5x5-rgb.asm | 0
.../{ => resources}/data/images/pbm/2/5x5-rgb.pam | Bin
.../data/images/pcx/1/1plane1bppCompressed.pcx | Bin
.../data/images/pcx/1/1plane1bppUncompressed.pcx | Bin
.../data/images/pcx/1/1plane24bppCompressed.pcx | Bin
.../data/images/pcx/1/1plane2bppCompressed.pcx | Bin
.../data/images/pcx/1/1plane32bppCompressed.pcx | Bin
.../data/images/pcx/1/1plane4bppCompressed.pcx | Bin
.../data/images/pcx/1/1plane8bppCompressed.pcx | Bin
.../data/images/pcx/1/1plane8bppUncompressed.pcx | Bin
.../data/images/pcx/1/2plane1bppCompressed.pcx | Bin
.../data/images/pcx/1/3plane1bppCompressed.pcx | Bin
.../data/images/pcx/1/3plane8bppCompressed.pcx | Bin
.../data/images/pcx/1/3plane8bppUncompressed.pcx | Bin
.../data/images/pcx/1/4plane1bppCompressed.pcx | Bin
.../1/Oregon Scientific DS6639 - DSC_0307 - small.pcx | Bin
.../1/Oregon Scientific DS6639 - DSC_0307 - small.png | Bin
src/test/{ => resources}/data/images/png/2/12118.png | Bin
.../{ => resources}/data/images/png/2/28569-4.png | Bin
.../{ => resources}/data/images/png/2/28569-8.png | Bin
src/test/{ => resources}/data/images/png/2/28569.png | Bin
.../{ => resources}/data/images/png/3/testImage.png | Bin
.../data/images/png/3/testImageNoAlpha.png | Bin
.../images/png/4/buttons_level_menu_down.ipad.png | Bin
.../{ => resources}/data/images/png/5/trns-gray.png | Bin
.../data/images/png/5/trns-palette8.png | Bin
.../{ => resources}/data/images/png/5/trns-rgb.png | Bin
.../1/Oregon Scientific DS6639 - DSC_0307 - small.psd | Bin
.../data/images/rgbe/1/body_wave_N_0001.hdr | Bin
.../1/Oregon Scientific DS6639 - DSC_0307 - small.tga | Bin
.../1/Oregon Scientific DS6639 - DSC_0307 - small.tif | Bin
.../{ => resources}/data/images/tiff/1/PICT2833.TIF | Bin
.../data/images/tiff/1/Ron at 2001 CWA convention.tif | Bin
.../{ => resources}/data/images/tiff/1/matthew2.tif | Bin
.../data/images/tiff/1/ron and andy.2.tif | Bin
.../data/images/tiff/1/ron and andy.tif | Bin
.../data/images/tiff/10/Imaging247.TIFF | Bin
.../data/images/tiff/10/Imaging258.tiff | Bin
.../data/images/tiff/10/Imaging265.tiff | Bin
.../{ => resources}/data/images/tiff/10/README.txt | 0
.../11/BlueMarble_GeoTIFF_LZW_NoPredictor_Tiled.tif | Bin
.../{ => resources}/data/images/tiff/12/README.txt | 0
.../tiff/12/TransparencyTestStripAssociated.tif | Bin
.../tiff/12/TransparencyTestStripUnassociated.tif | Bin
.../images/tiff/12/TransparencyTestTileAssociated.tif | Bin
.../tiff/12/TransparencyTestTileUnassociated.tif | Bin
.../{ => resources}/data/images/tiff/13/BigTIFF.tif | Bin
.../data/images/tiff/13/BigTIFFLong.tif | Bin
.../data/images/tiff/13/BigTIFFLong8.tif | Bin
.../data/images/tiff/13/BigTIFFLong8Tiles.tif | Bin
.../data/images/tiff/13/BigTIFFMotorola.tif | Bin
.../data/images/tiff/13/BigTIFFMotorolaLongStrips.tif | Bin
.../data/images/tiff/13/BigTIFFSubIFD4.tif | Bin
.../data/images/tiff/13/BigTIFFSubIFD8.tif | Bin
.../{ => resources}/data/images/tiff/13/Classic.tif | Bin
.../{ => resources}/data/images/tiff/13/README.txt | 0
.../data/images/tiff/2/bad-offsets-lengths.asm | 0
.../data/images/tiff/2/bad-offsets-lengths.tiff | Bin
.../{ => resources}/data/images/tiff/3/1pagefax.tif | Bin
...c DS6639 - DSC_0307 - small CCITT T.4 1D fill.tiff | Bin
...S6639 - DSC_0307 - small CCITT T.4 1D no fill.tiff | Bin
...c DS6639 - DSC_0307 - small CCITT T.4 2D fill.tiff | Bin
...S6639 - DSC_0307 - small CCITT T.4 2D no fill.tiff | Bin
...cientific DS6639 - DSC_0307 - small CCITT T.6.tiff | Bin
.../data/images/tiff/4/IndexColorPalette.tif | Bin
.../data/images/tiff/4/IndexColorPaletteTiled.tif | Bin
...tific DS6639 - DSC_0307 - small - LZW - strips.tif | Bin
...ntific DS6639 - DSC_0307 - small - LZW - tiled.tif | Bin
.../data/images/tiff/6/bad-interoperability.asm | 0
.../data/images/tiff/6/bad-interoperability.tiff | Bin
...n Scientific DS6639 - DSC_0307 - small - CMYK.tiff | Bin
.../data/images/tiff/8/no-compression-tag.tiff | Bin
.../{ => resources}/data/images/tiff/9/README.txt | 0
.../tiff/9/Sample64BitFloatingPointPix451x337.tiff | Bin
.../data/images/tiff/9/USGS_13_n38w077_dir5.tiff | Bin
src/test/{ => resources}/data/images/tiff/README.txt | 0
.../Oregon Scientific DS6639 - DSC_0307 - small.wbmp | Bin
...Scientific DS6639 - DSC_0307 - small lossless.webp | Bin
...on Scientific DS6639 - DSC_0307 - small lossy.webp | Bin
src/test/{ => resources}/data/images/webp/2/1.sm.webp | Bin
src/test/{ => resources}/data/images/webp/2/2.sm.webp | Bin
src/test/{ => resources}/data/images/webp/2/3.sm.webp | Bin
src/test/{ => resources}/data/images/webp/2/4.sm.webp | Bin
src/test/{ => resources}/data/images/webp/2/5.sm.webp | Bin
.../{ => resources}/data/images/webp/2/README.txt | 0
...regon Scientific DS6639 - DSC_0307 - small X10.xbm | 0
.../1/Oregon Scientific DS6639 - DSC_0307 - small.xbm | 0
.../1/Oregon Scientific DS6639 - DSC_0307 - small.xpm | 0
.../{ => resources}/data/images/xpm/1/symbolic.xpm | 0
137 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 364f96bf..79d0a8fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,15 +195,15 @@
<excludes>
<exclude>src/test/resources/images/**/*</exclude>
<exclude>src/test/resources/IMAGING-*/*</exclude>
- <exclude>src/test/data/**/*.xpm</exclude>
- <exclude>src/test/data/**/*.pam</exclude>
- <exclude>src/test/data/**/*.pbm</exclude>
- <exclude>src/test/data/**/*.pgm</exclude>
- <exclude>src/test/data/**/*.ppm</exclude>
- <exclude>src/test/data/**/*.xbm</exclude>
- <exclude>src/test/data/**/*.bmp</exclude>
- <exclude>src/test/data/**/*.tga</exclude>
- <exclude>src/test/data/**/*.hdr</exclude>
+ <exclude>src/test/**/*.xpm</exclude>
+ <exclude>src/test/**/*.pam</exclude>
+ <exclude>src/test/**/*.pbm</exclude>
+ <exclude>src/test/**/*.pgm</exclude>
+ <exclude>src/test/**/*.ppm</exclude>
+ <exclude>src/test/**/*.xbm</exclude>
+ <exclude>src/test/**/*.bmp</exclude>
+ <exclude>src/test/**/*.tga</exclude>
+ <exclude>src/test/**/*.hdr</exclude>
<exclude>src/main/resources/org/apache/commons/imaging/formats/xpm/rgb.txt</exclude>
<exclude>.asf.yaml</exclude>
</excludes>
diff --git a/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
b/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
index 7dc5fc8e..2af3a6b2 100644
--- a/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
+++ b/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
@@ -23,14 +23,11 @@ import org.apache.commons.io.FilenameUtils;
public class ImagingTestConstants {
- public static final File PHIL_HARVEY_TEST_IMAGE_FOLDER = new File(
- FilenameUtils.separatorsToSystem(
- "src\\test\\data\\images\\exif\\philHarvey\\"));
-
public static final File SOURCE_FOLDER = new File("src");
public static final File TEST_SOURCE_FOLDER = new File(SOURCE_FOLDER,
"test");
- public static final File TEST_DATA_SOURCE_FOLDER = new
File(TEST_SOURCE_FOLDER,
- "data");
- public static final File TEST_IMAGE_FOLDER = new
File(TEST_DATA_SOURCE_FOLDER,
- "images");
+ public static final File TEST_DATA_SOURCE_FOLDER = new
File(TEST_SOURCE_FOLDER, "resources/data");
+ public static final File TEST_IMAGE_FOLDER = new
File(TEST_DATA_SOURCE_FOLDER, "images");
+ public static final File PHIL_HARVEY_TEST_IMAGE_FOLDER = new File(
+ FilenameUtils.separatorsToSystem(new File(TEST_DATA_SOURCE_FOLDER,
"data/images/exif/philHarvey/").toString()));
+
}
diff --git
a/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
b/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
index 7c4032fd..56ad7fad 100644
---
a/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
+++
b/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
@@ -26,6 +26,7 @@ import java.nio.file.Files;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.ImagingTestConstants;
import org.apache.commons.imaging.internal.Debug;
import org.apache.commons.io.FilenameUtils;
import org.junit.jupiter.api.Test;
@@ -34,8 +35,7 @@ public class PngMultipleRoundtripTest extends AbstractPngTest
{
@Test
public void test() throws Exception {
- final String imagesFolderPath = FilenameUtils.separatorsToSystem(
- "src\\test\\data\\images\\png\\3");
+ final String imagesFolderPath =
FilenameUtils.separatorsToSystem(ImagingTestConstants.TEST_DATA_SOURCE_FOLDER +
"/images/png/3");
final File imagesFolder = new File(imagesFolderPath);
assertTrue(imagesFolder.exists() && imagesFolder.isDirectory());
diff --git a/src/test/data/images/bmp/1/Oregon Scientific DS6639 - DSC_0307 -
small.bmp b/src/test/resources/data/images/bmp/1/Oregon Scientific DS6639 -
DSC_0307 - small.bmp
similarity index 100%
rename from src/test/data/images/bmp/1/Oregon Scientific DS6639 - DSC_0307 -
small.bmp
rename to src/test/resources/data/images/bmp/1/Oregon Scientific DS6639 -
DSC_0307 - small.bmp
diff --git a/src/test/data/images/bmp/2/@broken/SanselanTest.bmp
b/src/test/resources/data/images/bmp/2/@broken/SanselanTest.bmp
similarity index 100%
rename from src/test/data/images/bmp/2/@broken/SanselanTest.bmp
rename to src/test/resources/data/images/bmp/2/@broken/SanselanTest.bmp
diff --git a/src/test/data/images/bmp/3/V4-bitfields.bmp
b/src/test/resources/data/images/bmp/3/V4-bitfields.bmp
similarity index 100%
rename from src/test/data/images/bmp/3/V4-bitfields.bmp
rename to src/test/resources/data/images/bmp/3/V4-bitfields.bmp
diff --git a/src/test/data/images/bmp/4/rle4.bmp
b/src/test/resources/data/images/bmp/4/rle4.bmp
similarity index 100%
rename from src/test/data/images/bmp/4/rle4.bmp
rename to src/test/resources/data/images/bmp/4/rle4.bmp
diff --git a/src/test/data/images/bmp/4/rle4deltaXY.asm
b/src/test/resources/data/images/bmp/4/rle4deltaXY.asm
similarity index 100%
rename from src/test/data/images/bmp/4/rle4deltaXY.asm
rename to src/test/resources/data/images/bmp/4/rle4deltaXY.asm
diff --git a/src/test/data/images/bmp/4/rle4deltaXY.bmp
b/src/test/resources/data/images/bmp/4/rle4deltaXY.bmp
similarity index 100%
rename from src/test/data/images/bmp/4/rle4deltaXY.bmp
rename to src/test/resources/data/images/bmp/4/rle4deltaXY.bmp
diff --git a/src/test/data/images/bmp/4/rle8.asm
b/src/test/resources/data/images/bmp/4/rle8.asm
similarity index 100%
rename from src/test/data/images/bmp/4/rle8.asm
rename to src/test/resources/data/images/bmp/4/rle8.asm
diff --git a/src/test/data/images/bmp/4/rle8.bmp
b/src/test/resources/data/images/bmp/4/rle8.bmp
similarity index 100%
rename from src/test/data/images/bmp/4/rle8.bmp
rename to src/test/resources/data/images/bmp/4/rle8.bmp
diff --git
a/src/test/data/images/bmp/5/@broken/timeout-bd15dbfa26b4e88070de540c6603039e8a88626f
b/src/test/resources/data/images/bmp/5/@broken/timeout-bd15dbfa26b4e88070de540c6603039e8a88626f
similarity index 100%
rename from
src/test/data/images/bmp/5/@broken/timeout-bd15dbfa26b4e88070de540c6603039e8a88626f
rename to
src/test/resources/data/images/bmp/5/@broken/timeout-bd15dbfa26b4e88070de540c6603039e8a88626f
diff --git a/src/test/data/images/dcx/1/Oregon Scientific DS6639 - DSC_0307 -
small.dcx b/src/test/resources/data/images/dcx/1/Oregon Scientific DS6639 -
DSC_0307 - small.dcx
similarity index 100%
rename from src/test/data/images/dcx/1/Oregon Scientific DS6639 - DSC_0307 -
small.dcx
rename to src/test/resources/data/images/dcx/1/Oregon Scientific DS6639 -
DSC_0307 - small.dcx
diff --git a/src/test/data/images/gif/animated/1/animated.gif
b/src/test/resources/data/images/gif/animated/1/animated.gif
similarity index 100%
rename from src/test/data/images/gif/animated/1/animated.gif
rename to src/test/resources/data/images/gif/animated/1/animated.gif
diff --git a/src/test/data/images/gif/animated/2/no_disposal.gif
b/src/test/resources/data/images/gif/animated/2/no_disposal.gif
similarity index 100%
rename from src/test/data/images/gif/animated/2/no_disposal.gif
rename to src/test/resources/data/images/gif/animated/2/no_disposal.gif
diff --git a/src/test/data/images/gif/single/1/Oregon Scientific DS6639 -
DSC_0307 - small.gif b/src/test/resources/data/images/gif/single/1/Oregon
Scientific DS6639 - DSC_0307 - small.gif
similarity index 100%
rename from src/test/data/images/gif/single/1/Oregon Scientific DS6639 -
DSC_0307 - small.gif
rename to src/test/resources/data/images/gif/single/1/Oregon Scientific DS6639
- DSC_0307 - small.gif
diff --git a/src/test/data/images/gif/single/2/test.gif
b/src/test/resources/data/images/gif/single/2/test.gif
similarity index 100%
rename from src/test/data/images/gif/single/2/test.gif
rename to src/test/resources/data/images/gif/single/2/test.gif
diff --git a/src/test/data/images/icns/1/poedit16x16.icns
b/src/test/resources/data/images/icns/1/poedit16x16.icns
similarity index 100%
rename from src/test/data/images/icns/1/poedit16x16.icns
rename to src/test/resources/data/images/icns/1/poedit16x16.icns
diff --git a/src/test/data/images/icns/1/poedit32x32.icns
b/src/test/resources/data/images/icns/1/poedit32x32.icns
similarity index 100%
rename from src/test/data/images/icns/1/poedit32x32.icns
rename to src/test/resources/data/images/icns/1/poedit32x32.icns
diff --git a/src/test/data/images/icns/1/poedit48x48.icns
b/src/test/resources/data/images/icns/1/poedit48x48.icns
similarity index 100%
rename from src/test/data/images/icns/1/poedit48x48.icns
rename to src/test/resources/data/images/icns/1/poedit48x48.icns
diff --git a/src/test/data/images/ico/1/Oregon Scientific DS6639 - DSC_0307 -
small.ico b/src/test/resources/data/images/ico/1/Oregon Scientific DS6639 -
DSC_0307 - small.ico
similarity index 100%
rename from src/test/data/images/ico/1/Oregon Scientific DS6639 - DSC_0307 -
small.ico
rename to src/test/resources/data/images/ico/1/Oregon Scientific DS6639 -
DSC_0307 - small.ico
diff --git a/src/test/data/images/info.txt
b/src/test/resources/data/images/info.txt
similarity index 100%
rename from src/test/data/images/info.txt
rename to src/test/resources/data/images/info.txt
diff --git a/src/test/data/images/iptc/1/Oregon Scientific DS6639 - DSC_0307 -
iptc added with irfanview.jpg b/src/test/resources/data/images/iptc/1/Oregon
Scientific DS6639 - DSC_0307 - iptc added with irfanview.jpg
similarity index 100%
rename from src/test/data/images/iptc/1/Oregon Scientific DS6639 - DSC_0307 -
iptc added with irfanview.jpg
rename to src/test/resources/data/images/iptc/1/Oregon Scientific DS6639 -
DSC_0307 - iptc added with irfanview.jpg
diff --git a/src/test/data/images/iptc/1/Oregon Scientific DS6639 - DSC_0307 -
iptc added with photoshop.jpg b/src/test/resources/data/images/iptc/1/Oregon
Scientific DS6639 - DSC_0307 - iptc added with photoshop.jpg
similarity index 100%
rename from src/test/data/images/iptc/1/Oregon Scientific DS6639 - DSC_0307 -
iptc added with photoshop.jpg
rename to src/test/resources/data/images/iptc/1/Oregon Scientific DS6639 -
DSC_0307 - iptc added with photoshop.jpg
diff --git a/src/test/data/images/jpg/1/Canon Powershot SD750 -
2007.12.26.n.IMG_3704.JPG b/src/test/resources/data/images/jpg/1/Canon
Powershot SD750 - 2007.12.26.n.IMG_3704.JPG
similarity index 100%
rename from src/test/data/images/jpg/1/Canon Powershot SD750 -
2007.12.26.n.IMG_3704.JPG
rename to src/test/resources/data/images/jpg/1/Canon Powershot SD750 -
2007.12.26.n.IMG_3704.JPG
diff --git a/src/test/data/images/jpg/1/Nikon D50 - 2007.12.19.n.DSC_3656.JPG
b/src/test/resources/data/images/jpg/1/Nikon D50 - 2007.12.19.n.DSC_3656.JPG
similarity index 100%
rename from src/test/data/images/jpg/1/Nikon D50 - 2007.12.19.n.DSC_3656.JPG
rename to src/test/resources/data/images/jpg/1/Nikon D50 -
2007.12.19.n.DSC_3656.JPG
diff --git a/src/test/data/images/jpg/1/Oregon Scientific DS6639 - DSC_0307 -
small.jpg b/src/test/resources/data/images/jpg/1/Oregon Scientific DS6639 -
DSC_0307 - small.jpg
similarity index 100%
rename from src/test/data/images/jpg/1/Oregon Scientific DS6639 - DSC_0307 -
small.jpg
rename to src/test/resources/data/images/jpg/1/Oregon Scientific DS6639 -
DSC_0307 - small.jpg
diff --git a/src/test/data/images/jpg/1/Oregon Scientific DS6639 - DSC_0307.JPG
b/src/test/resources/data/images/jpg/1/Oregon Scientific DS6639 - DSC_0307.JPG
similarity index 100%
rename from src/test/data/images/jpg/1/Oregon Scientific DS6639 - DSC_0307.JPG
rename to src/test/resources/data/images/jpg/1/Oregon Scientific DS6639 -
DSC_0307.JPG
diff --git
a/src/test/data/images/jpg/2/2008-07-27+-+Photo+216+-+WE+a+l'etang+de+Blodelsheim.jpg
b/src/test/resources/data/images/jpg/2/2008-07-27+-+Photo+216+-+WE+a+l'etang+de+Blodelsheim.jpg
similarity index 100%
rename from
src/test/data/images/jpg/2/2008-07-27+-+Photo+216+-+WE+a+l'etang+de+Blodelsheim.jpg
rename to
src/test/resources/data/images/jpg/2/2008-07-27+-+Photo+216+-+WE+a+l'etang+de+Blodelsheim.jpg
diff --git a/src/test/data/images/jpg/3/img_F028c_small.jpg
b/src/test/resources/data/images/jpg/3/img_F028c_small.jpg
similarity index 100%
rename from src/test/data/images/jpg/3/img_F028c_small.jpg
rename to src/test/resources/data/images/jpg/3/img_F028c_small.jpg
diff --git a/src/test/data/images/jpg/4/0x00-to-0xFF-between-segments.jpg
b/src/test/resources/data/images/jpg/4/0x00-to-0xFF-between-segments.jpg
similarity index 100%
rename from src/test/data/images/jpg/4/0x00-to-0xFF-between-segments.jpg
rename to src/test/resources/data/images/jpg/4/0x00-to-0xFF-between-segments.jpg
diff --git
a/src/test/data/images/jpg/5/2010-01-04T052300Z_01_BTRE6021PS000_RTROPTP_3_BUSINESS-US-TSE.JPG
b/src/test/resources/data/images/jpg/5/2010-01-04T052300Z_01_BTRE6021PS000_RTROPTP_3_BUSINESS-US-TSE.JPG
similarity index 100%
rename from
src/test/data/images/jpg/5/2010-01-04T052300Z_01_BTRE6021PS000_RTROPTP_3_BUSINESS-US-TSE.JPG
rename to
src/test/resources/data/images/jpg/5/2010-01-04T052300Z_01_BTRE6021PS000_RTROPTP_3_BUSINESS-US-TSE.JPG
diff --git a/src/test/data/images/jpg/6/image.jpeg
b/src/test/resources/data/images/jpg/6/image.jpeg
similarity index 100%
rename from src/test/data/images/jpg/6/image.jpeg
rename to src/test/resources/data/images/jpg/6/image.jpeg
diff --git a/src/test/data/images/jpg/7/_DSC6099.jpg
b/src/test/resources/data/images/jpg/7/_DSC6099.jpg
similarity index 100%
rename from src/test/data/images/jpg/7/_DSC6099.jpg
rename to src/test/resources/data/images/jpg/7/_DSC6099.jpg
diff --git a/src/test/data/images/jpg/7/_DSC6099.webp
b/src/test/resources/data/images/jpg/7/_DSC6099.webp
similarity index 100%
rename from src/test/data/images/jpg/7/_DSC6099.webp
rename to src/test/resources/data/images/jpg/7/_DSC6099.webp
diff --git a/src/test/data/images/pbm/1/Oregon Scientific DS6639 - DSC_0307 -
small.pbm b/src/test/resources/data/images/pbm/1/Oregon Scientific DS6639 -
DSC_0307 - small.pbm
similarity index 100%
rename from src/test/data/images/pbm/1/Oregon Scientific DS6639 - DSC_0307 -
small.pbm
rename to src/test/resources/data/images/pbm/1/Oregon Scientific DS6639 -
DSC_0307 - small.pbm
diff --git a/src/test/data/images/pbm/1/Oregon Scientific DS6639 - DSC_0307 -
small.pgm b/src/test/resources/data/images/pbm/1/Oregon Scientific DS6639 -
DSC_0307 - small.pgm
similarity index 100%
rename from src/test/data/images/pbm/1/Oregon Scientific DS6639 - DSC_0307 -
small.pgm
rename to src/test/resources/data/images/pbm/1/Oregon Scientific DS6639 -
DSC_0307 - small.pgm
diff --git a/src/test/data/images/pbm/1/Oregon Scientific DS6639 - DSC_0307 -
small.ppm b/src/test/resources/data/images/pbm/1/Oregon Scientific DS6639 -
DSC_0307 - small.ppm
similarity index 100%
rename from src/test/data/images/pbm/1/Oregon Scientific DS6639 - DSC_0307 -
small.ppm
rename to src/test/resources/data/images/pbm/1/Oregon Scientific DS6639 -
DSC_0307 - small.ppm
diff --git a/src/test/data/images/pbm/2/5x5-bw-alpha.asm
b/src/test/resources/data/images/pbm/2/5x5-bw-alpha.asm
similarity index 100%
rename from src/test/data/images/pbm/2/5x5-bw-alpha.asm
rename to src/test/resources/data/images/pbm/2/5x5-bw-alpha.asm
diff --git a/src/test/data/images/pbm/2/5x5-bw-alpha.pam
b/src/test/resources/data/images/pbm/2/5x5-bw-alpha.pam
similarity index 100%
rename from src/test/data/images/pbm/2/5x5-bw-alpha.pam
rename to src/test/resources/data/images/pbm/2/5x5-bw-alpha.pam
diff --git a/src/test/data/images/pbm/2/5x5-bw.asm
b/src/test/resources/data/images/pbm/2/5x5-bw.asm
similarity index 100%
rename from src/test/data/images/pbm/2/5x5-bw.asm
rename to src/test/resources/data/images/pbm/2/5x5-bw.asm
diff --git a/src/test/data/images/pbm/2/5x5-bw.pam
b/src/test/resources/data/images/pbm/2/5x5-bw.pam
similarity index 100%
rename from src/test/data/images/pbm/2/5x5-bw.pam
rename to src/test/resources/data/images/pbm/2/5x5-bw.pam
diff --git a/src/test/data/images/pbm/2/5x5-grayscale-alpha.asm
b/src/test/resources/data/images/pbm/2/5x5-grayscale-alpha.asm
similarity index 100%
rename from src/test/data/images/pbm/2/5x5-grayscale-alpha.asm
rename to src/test/resources/data/images/pbm/2/5x5-grayscale-alpha.asm
diff --git a/src/test/data/images/pbm/2/5x5-grayscale-alpha.pam
b/src/test/resources/data/images/pbm/2/5x5-grayscale-alpha.pam
similarity index 100%
rename from src/test/data/images/pbm/2/5x5-grayscale-alpha.pam
rename to src/test/resources/data/images/pbm/2/5x5-grayscale-alpha.pam
diff --git a/src/test/data/images/pbm/2/5x5-grayscale.asm
b/src/test/resources/data/images/pbm/2/5x5-grayscale.asm
similarity index 100%
rename from src/test/data/images/pbm/2/5x5-grayscale.asm
rename to src/test/resources/data/images/pbm/2/5x5-grayscale.asm
diff --git a/src/test/data/images/pbm/2/5x5-grayscale.pam
b/src/test/resources/data/images/pbm/2/5x5-grayscale.pam
similarity index 100%
rename from src/test/data/images/pbm/2/5x5-grayscale.pam
rename to src/test/resources/data/images/pbm/2/5x5-grayscale.pam
diff --git a/src/test/data/images/pbm/2/5x5-rgb-alpha.asm
b/src/test/resources/data/images/pbm/2/5x5-rgb-alpha.asm
similarity index 100%
rename from src/test/data/images/pbm/2/5x5-rgb-alpha.asm
rename to src/test/resources/data/images/pbm/2/5x5-rgb-alpha.asm
diff --git a/src/test/data/images/pbm/2/5x5-rgb-alpha.pam
b/src/test/resources/data/images/pbm/2/5x5-rgb-alpha.pam
similarity index 100%
rename from src/test/data/images/pbm/2/5x5-rgb-alpha.pam
rename to src/test/resources/data/images/pbm/2/5x5-rgb-alpha.pam
diff --git a/src/test/data/images/pbm/2/5x5-rgb.asm
b/src/test/resources/data/images/pbm/2/5x5-rgb.asm
similarity index 100%
rename from src/test/data/images/pbm/2/5x5-rgb.asm
rename to src/test/resources/data/images/pbm/2/5x5-rgb.asm
diff --git a/src/test/data/images/pbm/2/5x5-rgb.pam
b/src/test/resources/data/images/pbm/2/5x5-rgb.pam
similarity index 100%
rename from src/test/data/images/pbm/2/5x5-rgb.pam
rename to src/test/resources/data/images/pbm/2/5x5-rgb.pam
diff --git a/src/test/data/images/pcx/1/1plane1bppCompressed.pcx
b/src/test/resources/data/images/pcx/1/1plane1bppCompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/1plane1bppCompressed.pcx
rename to src/test/resources/data/images/pcx/1/1plane1bppCompressed.pcx
diff --git a/src/test/data/images/pcx/1/1plane1bppUncompressed.pcx
b/src/test/resources/data/images/pcx/1/1plane1bppUncompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/1plane1bppUncompressed.pcx
rename to src/test/resources/data/images/pcx/1/1plane1bppUncompressed.pcx
diff --git a/src/test/data/images/pcx/1/1plane24bppCompressed.pcx
b/src/test/resources/data/images/pcx/1/1plane24bppCompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/1plane24bppCompressed.pcx
rename to src/test/resources/data/images/pcx/1/1plane24bppCompressed.pcx
diff --git a/src/test/data/images/pcx/1/1plane2bppCompressed.pcx
b/src/test/resources/data/images/pcx/1/1plane2bppCompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/1plane2bppCompressed.pcx
rename to src/test/resources/data/images/pcx/1/1plane2bppCompressed.pcx
diff --git a/src/test/data/images/pcx/1/1plane32bppCompressed.pcx
b/src/test/resources/data/images/pcx/1/1plane32bppCompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/1plane32bppCompressed.pcx
rename to src/test/resources/data/images/pcx/1/1plane32bppCompressed.pcx
diff --git a/src/test/data/images/pcx/1/1plane4bppCompressed.pcx
b/src/test/resources/data/images/pcx/1/1plane4bppCompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/1plane4bppCompressed.pcx
rename to src/test/resources/data/images/pcx/1/1plane4bppCompressed.pcx
diff --git a/src/test/data/images/pcx/1/1plane8bppCompressed.pcx
b/src/test/resources/data/images/pcx/1/1plane8bppCompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/1plane8bppCompressed.pcx
rename to src/test/resources/data/images/pcx/1/1plane8bppCompressed.pcx
diff --git a/src/test/data/images/pcx/1/1plane8bppUncompressed.pcx
b/src/test/resources/data/images/pcx/1/1plane8bppUncompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/1plane8bppUncompressed.pcx
rename to src/test/resources/data/images/pcx/1/1plane8bppUncompressed.pcx
diff --git a/src/test/data/images/pcx/1/2plane1bppCompressed.pcx
b/src/test/resources/data/images/pcx/1/2plane1bppCompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/2plane1bppCompressed.pcx
rename to src/test/resources/data/images/pcx/1/2plane1bppCompressed.pcx
diff --git a/src/test/data/images/pcx/1/3plane1bppCompressed.pcx
b/src/test/resources/data/images/pcx/1/3plane1bppCompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/3plane1bppCompressed.pcx
rename to src/test/resources/data/images/pcx/1/3plane1bppCompressed.pcx
diff --git a/src/test/data/images/pcx/1/3plane8bppCompressed.pcx
b/src/test/resources/data/images/pcx/1/3plane8bppCompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/3plane8bppCompressed.pcx
rename to src/test/resources/data/images/pcx/1/3plane8bppCompressed.pcx
diff --git a/src/test/data/images/pcx/1/3plane8bppUncompressed.pcx
b/src/test/resources/data/images/pcx/1/3plane8bppUncompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/3plane8bppUncompressed.pcx
rename to src/test/resources/data/images/pcx/1/3plane8bppUncompressed.pcx
diff --git a/src/test/data/images/pcx/1/4plane1bppCompressed.pcx
b/src/test/resources/data/images/pcx/1/4plane1bppCompressed.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/4plane1bppCompressed.pcx
rename to src/test/resources/data/images/pcx/1/4plane1bppCompressed.pcx
diff --git a/src/test/data/images/pcx/1/Oregon Scientific DS6639 - DSC_0307 -
small.pcx b/src/test/resources/data/images/pcx/1/Oregon Scientific DS6639 -
DSC_0307 - small.pcx
similarity index 100%
rename from src/test/data/images/pcx/1/Oregon Scientific DS6639 - DSC_0307 -
small.pcx
rename to src/test/resources/data/images/pcx/1/Oregon Scientific DS6639 -
DSC_0307 - small.pcx
diff --git a/src/test/data/images/png/1/Oregon Scientific DS6639 - DSC_0307 -
small.png b/src/test/resources/data/images/png/1/Oregon Scientific DS6639 -
DSC_0307 - small.png
similarity index 100%
rename from src/test/data/images/png/1/Oregon Scientific DS6639 - DSC_0307 -
small.png
rename to src/test/resources/data/images/png/1/Oregon Scientific DS6639 -
DSC_0307 - small.png
diff --git a/src/test/data/images/png/2/12118.png
b/src/test/resources/data/images/png/2/12118.png
similarity index 100%
rename from src/test/data/images/png/2/12118.png
rename to src/test/resources/data/images/png/2/12118.png
diff --git a/src/test/data/images/png/2/28569-4.png
b/src/test/resources/data/images/png/2/28569-4.png
similarity index 100%
rename from src/test/data/images/png/2/28569-4.png
rename to src/test/resources/data/images/png/2/28569-4.png
diff --git a/src/test/data/images/png/2/28569-8.png
b/src/test/resources/data/images/png/2/28569-8.png
similarity index 100%
rename from src/test/data/images/png/2/28569-8.png
rename to src/test/resources/data/images/png/2/28569-8.png
diff --git a/src/test/data/images/png/2/28569.png
b/src/test/resources/data/images/png/2/28569.png
similarity index 100%
rename from src/test/data/images/png/2/28569.png
rename to src/test/resources/data/images/png/2/28569.png
diff --git a/src/test/data/images/png/3/testImage.png
b/src/test/resources/data/images/png/3/testImage.png
similarity index 100%
rename from src/test/data/images/png/3/testImage.png
rename to src/test/resources/data/images/png/3/testImage.png
diff --git a/src/test/data/images/png/3/testImageNoAlpha.png
b/src/test/resources/data/images/png/3/testImageNoAlpha.png
similarity index 100%
rename from src/test/data/images/png/3/testImageNoAlpha.png
rename to src/test/resources/data/images/png/3/testImageNoAlpha.png
diff --git a/src/test/data/images/png/4/buttons_level_menu_down.ipad.png
b/src/test/resources/data/images/png/4/buttons_level_menu_down.ipad.png
similarity index 100%
rename from src/test/data/images/png/4/buttons_level_menu_down.ipad.png
rename to src/test/resources/data/images/png/4/buttons_level_menu_down.ipad.png
diff --git a/src/test/data/images/png/5/trns-gray.png
b/src/test/resources/data/images/png/5/trns-gray.png
similarity index 100%
rename from src/test/data/images/png/5/trns-gray.png
rename to src/test/resources/data/images/png/5/trns-gray.png
diff --git a/src/test/data/images/png/5/trns-palette8.png
b/src/test/resources/data/images/png/5/trns-palette8.png
similarity index 100%
rename from src/test/data/images/png/5/trns-palette8.png
rename to src/test/resources/data/images/png/5/trns-palette8.png
diff --git a/src/test/data/images/png/5/trns-rgb.png
b/src/test/resources/data/images/png/5/trns-rgb.png
similarity index 100%
rename from src/test/data/images/png/5/trns-rgb.png
rename to src/test/resources/data/images/png/5/trns-rgb.png
diff --git a/src/test/data/images/psd/1/Oregon Scientific DS6639 - DSC_0307 -
small.psd b/src/test/resources/data/images/psd/1/Oregon Scientific DS6639 -
DSC_0307 - small.psd
similarity index 100%
rename from src/test/data/images/psd/1/Oregon Scientific DS6639 - DSC_0307 -
small.psd
rename to src/test/resources/data/images/psd/1/Oregon Scientific DS6639 -
DSC_0307 - small.psd
diff --git a/src/test/data/images/rgbe/1/body_wave_N_0001.hdr
b/src/test/resources/data/images/rgbe/1/body_wave_N_0001.hdr
similarity index 100%
rename from src/test/data/images/rgbe/1/body_wave_N_0001.hdr
rename to src/test/resources/data/images/rgbe/1/body_wave_N_0001.hdr
diff --git a/src/test/data/images/tga/1/Oregon Scientific DS6639 - DSC_0307 -
small.tga b/src/test/resources/data/images/tga/1/Oregon Scientific DS6639 -
DSC_0307 - small.tga
similarity index 100%
rename from src/test/data/images/tga/1/Oregon Scientific DS6639 - DSC_0307 -
small.tga
rename to src/test/resources/data/images/tga/1/Oregon Scientific DS6639 -
DSC_0307 - small.tga
diff --git a/src/test/data/images/tiff/1/Oregon Scientific DS6639 - DSC_0307 -
small.tif b/src/test/resources/data/images/tiff/1/Oregon Scientific DS6639 -
DSC_0307 - small.tif
similarity index 100%
rename from src/test/data/images/tiff/1/Oregon Scientific DS6639 - DSC_0307 -
small.tif
rename to src/test/resources/data/images/tiff/1/Oregon Scientific DS6639 -
DSC_0307 - small.tif
diff --git a/src/test/data/images/tiff/1/PICT2833.TIF
b/src/test/resources/data/images/tiff/1/PICT2833.TIF
similarity index 100%
rename from src/test/data/images/tiff/1/PICT2833.TIF
rename to src/test/resources/data/images/tiff/1/PICT2833.TIF
diff --git a/src/test/data/images/tiff/1/Ron at 2001 CWA convention.tif
b/src/test/resources/data/images/tiff/1/Ron at 2001 CWA convention.tif
similarity index 100%
rename from src/test/data/images/tiff/1/Ron at 2001 CWA convention.tif
rename to src/test/resources/data/images/tiff/1/Ron at 2001 CWA convention.tif
diff --git a/src/test/data/images/tiff/1/matthew2.tif
b/src/test/resources/data/images/tiff/1/matthew2.tif
similarity index 100%
rename from src/test/data/images/tiff/1/matthew2.tif
rename to src/test/resources/data/images/tiff/1/matthew2.tif
diff --git a/src/test/data/images/tiff/1/ron and andy.2.tif
b/src/test/resources/data/images/tiff/1/ron and andy.2.tif
similarity index 100%
rename from src/test/data/images/tiff/1/ron and andy.2.tif
rename to src/test/resources/data/images/tiff/1/ron and andy.2.tif
diff --git a/src/test/data/images/tiff/1/ron and andy.tif
b/src/test/resources/data/images/tiff/1/ron and andy.tif
similarity index 100%
rename from src/test/data/images/tiff/1/ron and andy.tif
rename to src/test/resources/data/images/tiff/1/ron and andy.tif
diff --git a/src/test/data/images/tiff/10/Imaging247.TIFF
b/src/test/resources/data/images/tiff/10/Imaging247.TIFF
similarity index 100%
rename from src/test/data/images/tiff/10/Imaging247.TIFF
rename to src/test/resources/data/images/tiff/10/Imaging247.TIFF
diff --git a/src/test/data/images/tiff/10/Imaging258.tiff
b/src/test/resources/data/images/tiff/10/Imaging258.tiff
similarity index 100%
rename from src/test/data/images/tiff/10/Imaging258.tiff
rename to src/test/resources/data/images/tiff/10/Imaging258.tiff
diff --git a/src/test/data/images/tiff/10/Imaging265.tiff
b/src/test/resources/data/images/tiff/10/Imaging265.tiff
similarity index 100%
rename from src/test/data/images/tiff/10/Imaging265.tiff
rename to src/test/resources/data/images/tiff/10/Imaging265.tiff
diff --git a/src/test/data/images/tiff/10/README.txt
b/src/test/resources/data/images/tiff/10/README.txt
similarity index 100%
rename from src/test/data/images/tiff/10/README.txt
rename to src/test/resources/data/images/tiff/10/README.txt
diff --git
a/src/test/data/images/tiff/11/BlueMarble_GeoTIFF_LZW_NoPredictor_Tiled.tif
b/src/test/resources/data/images/tiff/11/BlueMarble_GeoTIFF_LZW_NoPredictor_Tiled.tif
similarity index 100%
rename from
src/test/data/images/tiff/11/BlueMarble_GeoTIFF_LZW_NoPredictor_Tiled.tif
rename to
src/test/resources/data/images/tiff/11/BlueMarble_GeoTIFF_LZW_NoPredictor_Tiled.tif
diff --git a/src/test/data/images/tiff/12/README.txt
b/src/test/resources/data/images/tiff/12/README.txt
similarity index 100%
rename from src/test/data/images/tiff/12/README.txt
rename to src/test/resources/data/images/tiff/12/README.txt
diff --git a/src/test/data/images/tiff/12/TransparencyTestStripAssociated.tif
b/src/test/resources/data/images/tiff/12/TransparencyTestStripAssociated.tif
similarity index 100%
rename from src/test/data/images/tiff/12/TransparencyTestStripAssociated.tif
rename to
src/test/resources/data/images/tiff/12/TransparencyTestStripAssociated.tif
diff --git a/src/test/data/images/tiff/12/TransparencyTestStripUnassociated.tif
b/src/test/resources/data/images/tiff/12/TransparencyTestStripUnassociated.tif
similarity index 100%
rename from src/test/data/images/tiff/12/TransparencyTestStripUnassociated.tif
rename to
src/test/resources/data/images/tiff/12/TransparencyTestStripUnassociated.tif
diff --git a/src/test/data/images/tiff/12/TransparencyTestTileAssociated.tif
b/src/test/resources/data/images/tiff/12/TransparencyTestTileAssociated.tif
similarity index 100%
rename from src/test/data/images/tiff/12/TransparencyTestTileAssociated.tif
rename to
src/test/resources/data/images/tiff/12/TransparencyTestTileAssociated.tif
diff --git a/src/test/data/images/tiff/12/TransparencyTestTileUnassociated.tif
b/src/test/resources/data/images/tiff/12/TransparencyTestTileUnassociated.tif
similarity index 100%
rename from src/test/data/images/tiff/12/TransparencyTestTileUnassociated.tif
rename to
src/test/resources/data/images/tiff/12/TransparencyTestTileUnassociated.tif
diff --git a/src/test/data/images/tiff/13/BigTIFF.tif
b/src/test/resources/data/images/tiff/13/BigTIFF.tif
similarity index 100%
rename from src/test/data/images/tiff/13/BigTIFF.tif
rename to src/test/resources/data/images/tiff/13/BigTIFF.tif
diff --git a/src/test/data/images/tiff/13/BigTIFFLong.tif
b/src/test/resources/data/images/tiff/13/BigTIFFLong.tif
similarity index 100%
rename from src/test/data/images/tiff/13/BigTIFFLong.tif
rename to src/test/resources/data/images/tiff/13/BigTIFFLong.tif
diff --git a/src/test/data/images/tiff/13/BigTIFFLong8.tif
b/src/test/resources/data/images/tiff/13/BigTIFFLong8.tif
similarity index 100%
rename from src/test/data/images/tiff/13/BigTIFFLong8.tif
rename to src/test/resources/data/images/tiff/13/BigTIFFLong8.tif
diff --git a/src/test/data/images/tiff/13/BigTIFFLong8Tiles.tif
b/src/test/resources/data/images/tiff/13/BigTIFFLong8Tiles.tif
similarity index 100%
rename from src/test/data/images/tiff/13/BigTIFFLong8Tiles.tif
rename to src/test/resources/data/images/tiff/13/BigTIFFLong8Tiles.tif
diff --git a/src/test/data/images/tiff/13/BigTIFFMotorola.tif
b/src/test/resources/data/images/tiff/13/BigTIFFMotorola.tif
similarity index 100%
rename from src/test/data/images/tiff/13/BigTIFFMotorola.tif
rename to src/test/resources/data/images/tiff/13/BigTIFFMotorola.tif
diff --git a/src/test/data/images/tiff/13/BigTIFFMotorolaLongStrips.tif
b/src/test/resources/data/images/tiff/13/BigTIFFMotorolaLongStrips.tif
similarity index 100%
rename from src/test/data/images/tiff/13/BigTIFFMotorolaLongStrips.tif
rename to src/test/resources/data/images/tiff/13/BigTIFFMotorolaLongStrips.tif
diff --git a/src/test/data/images/tiff/13/BigTIFFSubIFD4.tif
b/src/test/resources/data/images/tiff/13/BigTIFFSubIFD4.tif
similarity index 100%
rename from src/test/data/images/tiff/13/BigTIFFSubIFD4.tif
rename to src/test/resources/data/images/tiff/13/BigTIFFSubIFD4.tif
diff --git a/src/test/data/images/tiff/13/BigTIFFSubIFD8.tif
b/src/test/resources/data/images/tiff/13/BigTIFFSubIFD8.tif
similarity index 100%
rename from src/test/data/images/tiff/13/BigTIFFSubIFD8.tif
rename to src/test/resources/data/images/tiff/13/BigTIFFSubIFD8.tif
diff --git a/src/test/data/images/tiff/13/Classic.tif
b/src/test/resources/data/images/tiff/13/Classic.tif
similarity index 100%
rename from src/test/data/images/tiff/13/Classic.tif
rename to src/test/resources/data/images/tiff/13/Classic.tif
diff --git a/src/test/data/images/tiff/13/README.txt
b/src/test/resources/data/images/tiff/13/README.txt
similarity index 100%
rename from src/test/data/images/tiff/13/README.txt
rename to src/test/resources/data/images/tiff/13/README.txt
diff --git a/src/test/data/images/tiff/2/bad-offsets-lengths.asm
b/src/test/resources/data/images/tiff/2/bad-offsets-lengths.asm
similarity index 100%
rename from src/test/data/images/tiff/2/bad-offsets-lengths.asm
rename to src/test/resources/data/images/tiff/2/bad-offsets-lengths.asm
diff --git a/src/test/data/images/tiff/2/bad-offsets-lengths.tiff
b/src/test/resources/data/images/tiff/2/bad-offsets-lengths.tiff
similarity index 100%
rename from src/test/data/images/tiff/2/bad-offsets-lengths.tiff
rename to src/test/resources/data/images/tiff/2/bad-offsets-lengths.tiff
diff --git a/src/test/data/images/tiff/3/1pagefax.tif
b/src/test/resources/data/images/tiff/3/1pagefax.tif
similarity index 100%
rename from src/test/data/images/tiff/3/1pagefax.tif
rename to src/test/resources/data/images/tiff/3/1pagefax.tif
diff --git a/src/test/data/images/tiff/3/Oregon Scientific DS6639 - DSC_0307 -
small CCITT T.4 1D fill.tiff b/src/test/resources/data/images/tiff/3/Oregon
Scientific DS6639 - DSC_0307 - small CCITT T.4 1D fill.tiff
similarity index 100%
rename from src/test/data/images/tiff/3/Oregon Scientific DS6639 - DSC_0307 -
small CCITT T.4 1D fill.tiff
rename to src/test/resources/data/images/tiff/3/Oregon Scientific DS6639 -
DSC_0307 - small CCITT T.4 1D fill.tiff
diff --git a/src/test/data/images/tiff/3/Oregon Scientific DS6639 - DSC_0307 -
small CCITT T.4 1D no fill.tiff b/src/test/resources/data/images/tiff/3/Oregon
Scientific DS6639 - DSC_0307 - small CCITT T.4 1D no fill.tiff
similarity index 100%
rename from src/test/data/images/tiff/3/Oregon Scientific DS6639 - DSC_0307 -
small CCITT T.4 1D no fill.tiff
rename to src/test/resources/data/images/tiff/3/Oregon Scientific DS6639 -
DSC_0307 - small CCITT T.4 1D no fill.tiff
diff --git a/src/test/data/images/tiff/3/Oregon Scientific DS6639 - DSC_0307 -
small CCITT T.4 2D fill.tiff b/src/test/resources/data/images/tiff/3/Oregon
Scientific DS6639 - DSC_0307 - small CCITT T.4 2D fill.tiff
similarity index 100%
rename from src/test/data/images/tiff/3/Oregon Scientific DS6639 - DSC_0307 -
small CCITT T.4 2D fill.tiff
rename to src/test/resources/data/images/tiff/3/Oregon Scientific DS6639 -
DSC_0307 - small CCITT T.4 2D fill.tiff
diff --git a/src/test/data/images/tiff/3/Oregon Scientific DS6639 - DSC_0307 -
small CCITT T.4 2D no fill.tiff b/src/test/resources/data/images/tiff/3/Oregon
Scientific DS6639 - DSC_0307 - small CCITT T.4 2D no fill.tiff
similarity index 100%
rename from src/test/data/images/tiff/3/Oregon Scientific DS6639 - DSC_0307 -
small CCITT T.4 2D no fill.tiff
rename to src/test/resources/data/images/tiff/3/Oregon Scientific DS6639 -
DSC_0307 - small CCITT T.4 2D no fill.tiff
diff --git a/src/test/data/images/tiff/3/Oregon Scientific DS6639 - DSC_0307 -
small CCITT T.6.tiff b/src/test/resources/data/images/tiff/3/Oregon Scientific
DS6639 - DSC_0307 - small CCITT T.6.tiff
similarity index 100%
rename from src/test/data/images/tiff/3/Oregon Scientific DS6639 - DSC_0307 -
small CCITT T.6.tiff
rename to src/test/resources/data/images/tiff/3/Oregon Scientific DS6639 -
DSC_0307 - small CCITT T.6.tiff
diff --git a/src/test/data/images/tiff/4/IndexColorPalette.tif
b/src/test/resources/data/images/tiff/4/IndexColorPalette.tif
similarity index 100%
rename from src/test/data/images/tiff/4/IndexColorPalette.tif
rename to src/test/resources/data/images/tiff/4/IndexColorPalette.tif
diff --git a/src/test/data/images/tiff/4/IndexColorPaletteTiled.tif
b/src/test/resources/data/images/tiff/4/IndexColorPaletteTiled.tif
similarity index 100%
rename from src/test/data/images/tiff/4/IndexColorPaletteTiled.tif
rename to src/test/resources/data/images/tiff/4/IndexColorPaletteTiled.tif
diff --git a/src/test/data/images/tiff/5/Oregon Scientific DS6639 - DSC_0307 -
small - LZW - strips.tif b/src/test/resources/data/images/tiff/5/Oregon
Scientific DS6639 - DSC_0307 - small - LZW - strips.tif
similarity index 100%
rename from src/test/data/images/tiff/5/Oregon Scientific DS6639 - DSC_0307 -
small - LZW - strips.tif
rename to src/test/resources/data/images/tiff/5/Oregon Scientific DS6639 -
DSC_0307 - small - LZW - strips.tif
diff --git a/src/test/data/images/tiff/5/Oregon Scientific DS6639 - DSC_0307 -
small - LZW - tiled.tif b/src/test/resources/data/images/tiff/5/Oregon
Scientific DS6639 - DSC_0307 - small - LZW - tiled.tif
similarity index 100%
rename from src/test/data/images/tiff/5/Oregon Scientific DS6639 - DSC_0307 -
small - LZW - tiled.tif
rename to src/test/resources/data/images/tiff/5/Oregon Scientific DS6639 -
DSC_0307 - small - LZW - tiled.tif
diff --git a/src/test/data/images/tiff/6/bad-interoperability.asm
b/src/test/resources/data/images/tiff/6/bad-interoperability.asm
similarity index 100%
rename from src/test/data/images/tiff/6/bad-interoperability.asm
rename to src/test/resources/data/images/tiff/6/bad-interoperability.asm
diff --git a/src/test/data/images/tiff/6/bad-interoperability.tiff
b/src/test/resources/data/images/tiff/6/bad-interoperability.tiff
similarity index 100%
rename from src/test/data/images/tiff/6/bad-interoperability.tiff
rename to src/test/resources/data/images/tiff/6/bad-interoperability.tiff
diff --git a/src/test/data/images/tiff/7/Oregon Scientific DS6639 - DSC_0307 -
small - CMYK.tiff b/src/test/resources/data/images/tiff/7/Oregon Scientific
DS6639 - DSC_0307 - small - CMYK.tiff
similarity index 100%
rename from src/test/data/images/tiff/7/Oregon Scientific DS6639 - DSC_0307 -
small - CMYK.tiff
rename to src/test/resources/data/images/tiff/7/Oregon Scientific DS6639 -
DSC_0307 - small - CMYK.tiff
diff --git a/src/test/data/images/tiff/8/no-compression-tag.tiff
b/src/test/resources/data/images/tiff/8/no-compression-tag.tiff
similarity index 100%
rename from src/test/data/images/tiff/8/no-compression-tag.tiff
rename to src/test/resources/data/images/tiff/8/no-compression-tag.tiff
diff --git a/src/test/data/images/tiff/9/README.txt
b/src/test/resources/data/images/tiff/9/README.txt
similarity index 100%
rename from src/test/data/images/tiff/9/README.txt
rename to src/test/resources/data/images/tiff/9/README.txt
diff --git
a/src/test/data/images/tiff/9/Sample64BitFloatingPointPix451x337.tiff
b/src/test/resources/data/images/tiff/9/Sample64BitFloatingPointPix451x337.tiff
similarity index 100%
rename from src/test/data/images/tiff/9/Sample64BitFloatingPointPix451x337.tiff
rename to
src/test/resources/data/images/tiff/9/Sample64BitFloatingPointPix451x337.tiff
diff --git a/src/test/data/images/tiff/9/USGS_13_n38w077_dir5.tiff
b/src/test/resources/data/images/tiff/9/USGS_13_n38w077_dir5.tiff
similarity index 100%
rename from src/test/data/images/tiff/9/USGS_13_n38w077_dir5.tiff
rename to src/test/resources/data/images/tiff/9/USGS_13_n38w077_dir5.tiff
diff --git a/src/test/data/images/tiff/README.txt
b/src/test/resources/data/images/tiff/README.txt
similarity index 100%
rename from src/test/data/images/tiff/README.txt
rename to src/test/resources/data/images/tiff/README.txt
diff --git a/src/test/data/images/wbmp/1/Oregon Scientific DS6639 - DSC_0307 -
small.wbmp b/src/test/resources/data/images/wbmp/1/Oregon Scientific DS6639 -
DSC_0307 - small.wbmp
similarity index 100%
rename from src/test/data/images/wbmp/1/Oregon Scientific DS6639 - DSC_0307 -
small.wbmp
rename to src/test/resources/data/images/wbmp/1/Oregon Scientific DS6639 -
DSC_0307 - small.wbmp
diff --git a/src/test/data/images/webp/1/Oregon Scientific DS6639 - DSC_0307 -
small lossless.webp b/src/test/resources/data/images/webp/1/Oregon Scientific
DS6639 - DSC_0307 - small lossless.webp
similarity index 100%
rename from src/test/data/images/webp/1/Oregon Scientific DS6639 - DSC_0307 -
small lossless.webp
rename to src/test/resources/data/images/webp/1/Oregon Scientific DS6639 -
DSC_0307 - small lossless.webp
diff --git a/src/test/data/images/webp/1/Oregon Scientific DS6639 - DSC_0307 -
small lossy.webp b/src/test/resources/data/images/webp/1/Oregon Scientific
DS6639 - DSC_0307 - small lossy.webp
similarity index 100%
rename from src/test/data/images/webp/1/Oregon Scientific DS6639 - DSC_0307 -
small lossy.webp
rename to src/test/resources/data/images/webp/1/Oregon Scientific DS6639 -
DSC_0307 - small lossy.webp
diff --git a/src/test/data/images/webp/2/1.sm.webp
b/src/test/resources/data/images/webp/2/1.sm.webp
similarity index 100%
rename from src/test/data/images/webp/2/1.sm.webp
rename to src/test/resources/data/images/webp/2/1.sm.webp
diff --git a/src/test/data/images/webp/2/2.sm.webp
b/src/test/resources/data/images/webp/2/2.sm.webp
similarity index 100%
rename from src/test/data/images/webp/2/2.sm.webp
rename to src/test/resources/data/images/webp/2/2.sm.webp
diff --git a/src/test/data/images/webp/2/3.sm.webp
b/src/test/resources/data/images/webp/2/3.sm.webp
similarity index 100%
rename from src/test/data/images/webp/2/3.sm.webp
rename to src/test/resources/data/images/webp/2/3.sm.webp
diff --git a/src/test/data/images/webp/2/4.sm.webp
b/src/test/resources/data/images/webp/2/4.sm.webp
similarity index 100%
rename from src/test/data/images/webp/2/4.sm.webp
rename to src/test/resources/data/images/webp/2/4.sm.webp
diff --git a/src/test/data/images/webp/2/5.sm.webp
b/src/test/resources/data/images/webp/2/5.sm.webp
similarity index 100%
rename from src/test/data/images/webp/2/5.sm.webp
rename to src/test/resources/data/images/webp/2/5.sm.webp
diff --git a/src/test/data/images/webp/2/README.txt
b/src/test/resources/data/images/webp/2/README.txt
similarity index 100%
rename from src/test/data/images/webp/2/README.txt
rename to src/test/resources/data/images/webp/2/README.txt
diff --git a/src/test/data/images/xbm/1/Oregon Scientific DS6639 - DSC_0307 -
small X10.xbm b/src/test/resources/data/images/xbm/1/Oregon Scientific DS6639 -
DSC_0307 - small X10.xbm
similarity index 100%
rename from src/test/data/images/xbm/1/Oregon Scientific DS6639 - DSC_0307 -
small X10.xbm
rename to src/test/resources/data/images/xbm/1/Oregon Scientific DS6639 -
DSC_0307 - small X10.xbm
diff --git a/src/test/data/images/xbm/1/Oregon Scientific DS6639 - DSC_0307 -
small.xbm b/src/test/resources/data/images/xbm/1/Oregon Scientific DS6639 -
DSC_0307 - small.xbm
similarity index 100%
rename from src/test/data/images/xbm/1/Oregon Scientific DS6639 - DSC_0307 -
small.xbm
rename to src/test/resources/data/images/xbm/1/Oregon Scientific DS6639 -
DSC_0307 - small.xbm
diff --git a/src/test/data/images/xpm/1/Oregon Scientific DS6639 - DSC_0307 -
small.xpm b/src/test/resources/data/images/xpm/1/Oregon Scientific DS6639 -
DSC_0307 - small.xpm
similarity index 100%
rename from src/test/data/images/xpm/1/Oregon Scientific DS6639 - DSC_0307 -
small.xpm
rename to src/test/resources/data/images/xpm/1/Oregon Scientific DS6639 -
DSC_0307 - small.xpm
diff --git a/src/test/data/images/xpm/1/symbolic.xpm
b/src/test/resources/data/images/xpm/1/symbolic.xpm
similarity index 100%
rename from src/test/data/images/xpm/1/symbolic.xpm
rename to src/test/resources/data/images/xpm/1/symbolic.xpm
