You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/08/18 15:02:30 UTC
[commons-imaging] branch master updated: Better test class name
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
The following commit(s) were added to refs/heads/master by this push:
new 741b435a Better test class name
741b435a is described below
commit 741b435ab12b5c8b58f503a2e97d41ac9c133b8e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Aug 18 11:02:25 2023 -0400
Better test class name
---
.../commons/imaging/{ImagingTest.java => AbstractImagingTest.java} | 2 +-
.../java/org/apache/commons/imaging/ImagingGuessFormatTest.java | 2 +-
.../java/org/apache/commons/imaging/bytesource/ByteSourceTest.java | 4 ++--
.../org/apache/commons/imaging/common/BinaryFileFunctionsTest.java | 4 ++--
.../java/org/apache/commons/imaging/common/RationalNumberTest.java | 4 ++--
.../imaging/formats/bmp/{BmpBaseTest.java => AbstractBmpTest.java} | 6 +++---
.../java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java | 2 +-
.../org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java | 2 +-
.../imaging/formats/dcx/{DcxBaseTest.java => AbstractDcxTest.java} | 6 +++---
.../java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java | 2 +-
.../imaging/formats/gif/{GifBaseTest.java => AbstractGifTest.java} | 6 +++---
.../java/org/apache/commons/imaging/formats/gif/GifReadTest.java | 2 +-
.../java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java | 4 ++--
.../imaging/formats/ico/{IcoBaseTest.java => AbstractIcoTest.java} | 6 +++---
.../java/org/apache/commons/imaging/formats/ico/IcoReadTest.java | 2 +-
.../org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java | 2 +-
.../java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java | 4 ++--
.../commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java | 4 ++--
.../formats/jpeg/exif/{ExifBaseTest.java => AbstractExifTest.java} | 6 +++---
.../{SpecificExifTagTest.java => AbstractSpecificExifTagTest.java} | 2 +-
.../apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java | 2 +-
.../org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java | 2 +-
.../apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java | 2 +-
.../imaging/formats/jpeg/exif/ExifRewriterRoundtripTest.java | 2 +-
.../java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java | 2 +-
.../commons/imaging/formats/jpeg/exif/MakerNoteFieldTest.java | 2 +-
.../apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java | 2 +-
.../org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.java | 2 +-
.../imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java | 2 +-
.../org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java | 4 ++--
.../jpeg/xmp/{JpegXmpBaseTest.java => AbstractJpegXmpTest.java} | 6 +++---
.../apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java | 2 +-
.../apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java | 2 +-
.../imaging/formats/pam/{PamBaseTest.java => AbstractPamTest.java} | 6 +++---
.../java/org/apache/commons/imaging/formats/pam/PamReadTest.java | 2 +-
.../imaging/formats/pcx/{PcxBaseTest.java => AbstractPcxTest.java} | 6 +++---
.../java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java | 2 +-
.../imaging/formats/png/{PngBaseTest.java => AbstractPngTest.java} | 6 +++---
.../org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java | 2 +-
.../org/apache/commons/imaging/formats/png/PngImageParserTest.java | 2 +-
.../commons/imaging/formats/png/PngMultipleRoundtripTest.java | 2 +-
.../java/org/apache/commons/imaging/formats/png/PngReadTest.java | 2 +-
.../java/org/apache/commons/imaging/formats/png/PngTextTest.java | 2 +-
.../commons/imaging/formats/png/PngWriteForceTrueColorText.java | 2 +-
.../org/apache/commons/imaging/formats/png/PngWriteReadTest.java | 4 ++--
.../java/org/apache/commons/imaging/formats/png/PngWriterTest.java | 2 +-
.../imaging/formats/psd/{PsdBaseTest.java => AbstractPsdTest.java} | 6 +++---
.../java/org/apache/commons/imaging/formats/psd/PsdReadTest.java | 2 +-
.../java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java | 4 ++--
.../java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java | 4 ++--
.../apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java | 4 ++--
.../java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java | 4 ++--
.../java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java | 4 ++--
.../java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java | 4 ++--
.../java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java | 4 ++--
.../imaging/formats/xpm/{XpmBaseTest.java => AbstractXpmTest.java} | 6 +++---
.../java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java | 2 +-
.../org/apache/commons/imaging/palette/PaletteQuantizationTest.java | 4 ++--
58 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/src/test/java/org/apache/commons/imaging/ImagingTest.java b/src/test/java/org/apache/commons/imaging/AbstractImagingTest.java
similarity index 98%
rename from src/test/java/org/apache/commons/imaging/ImagingTest.java
rename to src/test/java/org/apache/commons/imaging/AbstractImagingTest.java
index 0ecbaccb..14bcf689 100644
--- a/src/test/java/org/apache/commons/imaging/ImagingTest.java
+++ b/src/test/java/org/apache/commons/imaging/AbstractImagingTest.java
@@ -28,7 +28,7 @@ import java.util.List;
import org.apache.commons.imaging.internal.Debug;
import org.apache.commons.imaging.test.FileSystemTraversal;
-public abstract class ImagingTest {
+public abstract class AbstractImagingTest {
public interface ImageFilter {
boolean accept(File file) throws IOException, ImagingException;
diff --git a/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java b/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
index 3e10a04d..41737f92 100644
--- a/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
+++ b/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
@@ -27,7 +27,7 @@ import org.apache.commons.io.FilenameUtils;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-public class ImagingGuessFormatTest extends ImagingTest {
+public class ImagingGuessFormatTest extends AbstractImagingTest {
public static final String BMP_IMAGE_FILE = "bmp\\1\\Oregon Scientific DS6639 - DSC_0307 - small.bmp";
public static final String PNG_IMAGE_FILE = "png\\1\\Oregon Scientific DS6639 - DSC_0307 - small.png";
diff --git a/src/test/java/org/apache/commons/imaging/bytesource/ByteSourceTest.java b/src/test/java/org/apache/commons/imaging/bytesource/ByteSourceTest.java
index ff1c9248..22d5a72f 100644
--- a/src/test/java/org/apache/commons/imaging/bytesource/ByteSourceTest.java
+++ b/src/test/java/org/apache/commons/imaging/bytesource/ByteSourceTest.java
@@ -28,10 +28,10 @@ import java.io.OutputStream;
import java.nio.file.Files;
import org.apache.commons.imaging.ImagingConstants;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
import org.junit.jupiter.api.Test;
-public abstract class ByteSourceTest extends ImagingTest {
+public abstract class ByteSourceTest extends AbstractImagingTest {
protected static byte[][] getTestByteArrays() {
final byte[] single = new byte[1];
for (int i = 0; i < single.length; i++) {
diff --git a/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java b/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java
index dfb8602c..231c904b 100644
--- a/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java
@@ -19,10 +19,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import java.nio.ByteOrder;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
import org.junit.jupiter.api.Test;
-public class BinaryFileFunctionsTest extends ImagingTest {
+public class BinaryFileFunctionsTest extends AbstractImagingTest {
@Test
public void testDoubleToByteConversion() {
diff --git a/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java b/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
index f50482d4..d239d938 100644
--- a/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
@@ -24,13 +24,13 @@ import java.text.NumberFormat;
import java.util.Arrays;
import java.util.stream.Stream;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-public class RationalNumberTest extends ImagingTest {
+public class RationalNumberTest extends AbstractImagingTest {
public static Stream<Double> data() {
return Arrays.asList(
diff --git a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/bmp/AbstractBmpTest.java
similarity index 87%
rename from src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
rename to src/test/java/org/apache/commons/imaging/formats/bmp/AbstractBmpTest.java
index 0b8d261d..21be4948 100644
--- a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/bmp/AbstractBmpTest.java
@@ -24,11 +24,11 @@ import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class BmpBaseTest extends ImagingTest {
+public abstract class AbstractBmpTest extends AbstractImagingTest {
- private static final ImageFilter IMAGE_FILTER = BmpBaseTest::isBmp;
+ private static final ImageFilter IMAGE_FILTER = AbstractBmpTest::isBmp;
protected static List<File> getBmpImages() throws IOException, ImagingException {
return getTestImages(IMAGE_FILTER);
diff --git a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
index 38c75dca..3355d07e 100644
--- a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-public class BmpReadTest extends BmpBaseTest {
+public class BmpReadTest extends AbstractBmpTest {
public static Collection<File> data() throws Exception {
return getBmpImages();
diff --git a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
index 69edccbe..a04a5867 100644
--- a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
@@ -30,7 +30,7 @@ import org.apache.commons.imaging.ImagingException;
import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Test;
-public class BmpRoundtripTest extends BmpBaseTest {
+public class BmpRoundtripTest extends AbstractBmpTest {
private int[][] bufferedImageToImageData(final BufferedImage image) {
final int width = image.getWidth();
diff --git a/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/dcx/AbstractDcxTest.java
similarity index 87%
rename from src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
rename to src/test/java/org/apache/commons/imaging/formats/dcx/AbstractDcxTest.java
index 26a987d0..b59f891e 100644
--- a/src/test/java/org/apache/commons/imaging/formats/dcx/DcxBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/dcx/AbstractDcxTest.java
@@ -25,11 +25,11 @@ import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class DcxBaseTest extends ImagingTest {
+public abstract class AbstractDcxTest extends AbstractImagingTest {
- private static final ImageFilter IMAGE_FILTER = DcxBaseTest::isDcx;
+ private static final ImageFilter IMAGE_FILTER = AbstractDcxTest::isDcx;
protected static List<File> getDcxImages() throws IOException, ImagingException {
return getTestImages(IMAGE_FILTER);
diff --git a/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java b/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
index b67e9053..2f330794 100644
--- a/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-public class DcxReadTest extends DcxBaseTest {
+public class DcxReadTest extends AbstractDcxTest {
public static Stream<File> data() throws Exception {
return getDcxImages().stream();
diff --git a/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/gif/AbstractGifTest.java
similarity index 92%
rename from src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
rename to src/test/java/org/apache/commons/imaging/formats/gif/AbstractGifTest.java
index 9536fefd..bf265b45 100644
--- a/src/test/java/org/apache/commons/imaging/formats/gif/GifBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/gif/AbstractGifTest.java
@@ -25,15 +25,15 @@ import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class GifBaseTest extends ImagingTest {
+public abstract class AbstractGifTest extends AbstractImagingTest {
private final static String ANIMATED_FOLDER_NAME = "animated";
private final static String SINGLE_IMAGE_FOLDER_NAME = "single";
- private static final ImageFilter IMAGE_FILTER = GifBaseTest::isGif;
+ private static final ImageFilter IMAGE_FILTER = AbstractGifTest::isGif;
private static final ImageFilter ANIMATED_IMAGE_FILTER = file -> isGif(file) && isAnimated(file);
diff --git a/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java b/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
index 69d1280a..30b1c4c2 100644
--- a/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-public class GifReadTest extends GifBaseTest {
+public class GifReadTest extends AbstractGifTest {
public static Stream<File> animatedImageData() throws Exception {
return getAnimatedGifImages().stream();
diff --git a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
index 48150dfa..9536fb63 100644
--- a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.java
@@ -25,9 +25,9 @@ import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class IcnsBaseTest extends ImagingTest {
+public abstract class IcnsBaseTest extends AbstractImagingTest {
private static final ImageFilter IMAGE_FILTER = IcnsBaseTest::isIcns;
diff --git a/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/ico/AbstractIcoTest.java
similarity index 86%
rename from src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java
rename to src/test/java/org/apache/commons/imaging/formats/ico/AbstractIcoTest.java
index 7afdb504..836bb3f5 100644
--- a/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/ico/AbstractIcoTest.java
@@ -22,11 +22,11 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class IcoBaseTest extends ImagingTest {
+public abstract class AbstractIcoTest extends AbstractImagingTest {
- private static final ImageFilter IMAGE_FILTER = IcoBaseTest::isIco;
+ private static final ImageFilter IMAGE_FILTER = AbstractIcoTest::isIco;
protected static List<File> getIcoImages() throws IOException, ImagingException {
return getTestImages(IMAGE_FILTER);
diff --git a/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java b/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
index 5d40eeed..fb7859fa 100644
--- a/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-public class IcoReadTest extends IcoBaseTest {
+public class IcoReadTest extends AbstractIcoTest {
public static Stream<File> data() throws Exception {
return getIcoImages().stream();
diff --git a/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java b/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
index 60617c34..bc4e0b21 100644
--- a/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
@@ -36,7 +36,7 @@ import org.apache.commons.imaging.internal.Debug;
import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.Test;
-public class IcoRoundtripTest extends IcoBaseTest {
+public class IcoRoundtripTest extends AbstractIcoTest {
private interface BitmapGenerator {
byte[] generateBitmap(int foreground, int background, int paletteSize)
throws IOException, ImagingException;
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
index 4da4726f..9c90f569 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.java
@@ -25,9 +25,9 @@ import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class JpegBaseTest extends ImagingTest {
+public abstract class JpegBaseTest extends AbstractImagingTest {
public static final ImageFilter imageFilter = JpegBaseTest::isJpeg;
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
index ccc462be..f337d1a2 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
@@ -23,11 +23,11 @@ import java.awt.image.BufferedImage;
import java.io.File;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
import org.apache.commons.imaging.common.ImageMetadata;
import org.junit.jupiter.api.Test;
-public class JpegWithJpegThumbnailTest extends ImagingTest {
+public class JpegWithJpegThumbnailTest extends AbstractImagingTest {
@Test
public void testSingleImage() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AbstractExifTest.java
similarity index 91%
rename from src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java
rename to src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AbstractExifTest.java
index 3509a20f..3fbbfca1 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AbstractExifTest.java
@@ -22,13 +22,13 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
import org.apache.commons.imaging.bytesource.ByteSource;
import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
-public abstract class ExifBaseTest extends ImagingTest {
+public abstract class AbstractExifTest extends AbstractImagingTest {
- private static final ImageFilter HAS_EXIF_IMAGE_FILTER = ExifBaseTest::hasExifData;
+ private static final ImageFilter HAS_EXIF_IMAGE_FILTER = AbstractExifTest::hasExifData;
private static final ImageFilter JPEG_IMAGE_FILTER = file -> file.getName().toLowerCase().endsWith(".jpg");
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AbstractSpecificExifTagTest.java
similarity index 97%
rename from src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
rename to src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AbstractSpecificExifTagTest.java
index 7098b5da..ac037af0 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AbstractSpecificExifTagTest.java
@@ -32,7 +32,7 @@ import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-public abstract class SpecificExifTagTest extends ExifBaseTest {
+public abstract class AbstractSpecificExifTagTest extends AbstractExifTest {
public static Stream<File> data() throws Exception {
return getImagesWithExifData().stream();
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
index dfa32061..e0192795 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
@@ -34,7 +34,7 @@ import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
import org.junit.jupiter.api.Test;
-public class AsciiFieldTest extends ExifBaseTest {
+public class AsciiFieldTest extends AbstractExifTest {
@Test
public void testSingleImage() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
index 99627e35..301288d7 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
@@ -31,7 +31,7 @@ import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-public class ExifDumpTest extends ExifBaseTest {
+public class ExifDumpTest extends AbstractExifTest {
public static Stream<File> data() throws Exception {
return getImagesWithExifData().stream();
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
index 1e2aa346..81f7c75e 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
@@ -48,7 +48,7 @@ import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Test;
-public class ExifRewriteTest extends ExifBaseTest {
+public class ExifRewriteTest extends AbstractExifTest {
// public ExifRewriteTest(String name)
// {
// super(name);
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriterRoundtripTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriterRoundtripTest.java
index bd75a356..79384207 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriterRoundtripTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriterRoundtripTest.java
@@ -46,7 +46,7 @@ import org.opentest4j.TestSkippedException;
* Read and write EXIF data, and verify that it's identical, and no data corruption occurred.
*/
@Disabled
-public class ExifRewriterRoundtripTest extends ExifBaseTest {
+public class ExifRewriterRoundtripTest extends AbstractExifTest {
public static Stream<File> data() throws Exception {
return getImagesWithExifData().stream();
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
index dfba9288..ea724bef 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
@@ -27,7 +27,7 @@ import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-public class GpsTest extends ExifBaseTest {
+public class GpsTest extends AbstractExifTest {
public static Stream<File> data() throws Exception {
return getImagesWithExifData().stream();
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MakerNoteFieldTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MakerNoteFieldTest.java
index 2eb0366f..234cb9e9 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MakerNoteFieldTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MakerNoteFieldTest.java
@@ -25,7 +25,7 @@ import org.apache.commons.imaging.formats.tiff.TiffField;
import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
import org.apache.commons.imaging.internal.Debug;
-public class MakerNoteFieldTest extends SpecificExifTagTest {
+public class MakerNoteFieldTest extends AbstractSpecificExifTagTest {
@Override
protected void checkField(final File imageFile, final TiffField field)
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
index fa5838ea..4f50c278 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
@@ -41,7 +41,7 @@ import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory;
import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
import org.junit.jupiter.api.Test;
-public class MicrosoftTagTest extends ExifBaseTest {
+public class MicrosoftTagTest extends AbstractExifTest {
private static final String AUTHOR = "author";
private static final String COMMENT = "comment";
private static final String SUBJECT = "subject";
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.java
index 3431c31c..2974e5e6 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/TextFieldTest.java
@@ -29,7 +29,7 @@ import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants;
import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType;
import org.apache.commons.imaging.internal.Debug;
-public class TextFieldTest extends SpecificExifTagTest {
+public class TextFieldTest extends AbstractSpecificExifTagTest {
@Override
protected void checkField(final File imageFile, final TiffField field)
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
index 6d430837..fc0af6fd 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
@@ -33,7 +33,7 @@ import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-public class WriteExifMetadataExampleTest extends ExifBaseTest {
+public class WriteExifMetadataExampleTest extends AbstractExifTest {
public static Stream<File> data() throws Exception {
return getJpegImages().stream();
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java
index 94c4edc8..e55eb9ae 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.java
@@ -22,11 +22,11 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
import org.apache.commons.imaging.bytesource.ByteSource;
import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
-public abstract class IptcBaseTest extends ImagingTest {
+public abstract class IptcBaseTest extends AbstractImagingTest {
private static final ImageFilter HAS_IPTC_IMAGE_FILTER = IptcBaseTest::hasIptcData;
private static final ImageFilter JPEG_IMAGE_FILTER = file -> file.getName().toLowerCase().endsWith(".jpg");
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/AbstractJpegXmpTest.java
similarity index 94%
rename from src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java
rename to src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/AbstractJpegXmpTest.java
index c4871dd3..eeb7eab8 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/AbstractJpegXmpTest.java
@@ -22,13 +22,13 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
import org.apache.commons.imaging.bytesource.ByteSource;
import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
-public abstract class JpegXmpBaseTest extends ImagingTest {
+public abstract class AbstractJpegXmpTest extends AbstractImagingTest {
- private static final ImageFilter HAS_JPEG_XMP_IMAGE_FILTER = JpegXmpBaseTest::hasJpegXmpData;
+ private static final ImageFilter HAS_JPEG_XMP_IMAGE_FILTER = AbstractJpegXmpTest::hasJpegXmpData;
protected static List<File> getImagesWithXmpData() throws IOException,
ImagingException {
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java
index 68bca07d..cd004356 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java
@@ -28,7 +28,7 @@ import org.apache.commons.imaging.formats.jpeg.JpegImagingParameters;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-public class JpegXmpDumpTest extends JpegXmpBaseTest {
+public class JpegXmpDumpTest extends AbstractJpegXmpTest {
public static Stream<File> data() throws Exception {
return getImagesWithXmpData().stream();
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
index 52c74e63..f8de0926 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
@@ -31,7 +31,7 @@ import org.apache.commons.imaging.formats.jpeg.JpegImagingParameters;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
-public class JpegXmpRewriteTest extends JpegXmpBaseTest {
+public class JpegXmpRewriteTest extends AbstractJpegXmpTest {
public static Stream<File> data() throws Exception {
return getImagesWithXmpData().stream();
diff --git a/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/pam/AbstractPamTest.java
similarity index 87%
rename from src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java
rename to src/test/java/org/apache/commons/imaging/formats/pam/AbstractPamTest.java
index c391b306..8ea155bd 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pam/PamBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pam/AbstractPamTest.java
@@ -25,11 +25,11 @@ import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class PamBaseTest extends ImagingTest {
+public abstract class AbstractPamTest extends AbstractImagingTest {
- private static final ImageFilter IMAGE_FILTER = PamBaseTest::isPam;
+ private static final ImageFilter IMAGE_FILTER = AbstractPamTest::isPam;
private static boolean isPam(final File file) throws IOException {
final ImageFormat format = Imaging.guessFormat(file);
diff --git a/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java b/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
index ca575b4f..db809ea0 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
@@ -30,7 +30,7 @@ import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Test;
-public class PamReadTest extends PamBaseTest {
+public class PamReadTest extends AbstractPamTest {
@Test
public void test() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/pcx/AbstractPcxTest.java
similarity index 86%
rename from src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java
rename to src/test/java/org/apache/commons/imaging/formats/pcx/AbstractPcxTest.java
index 37b903d5..b34ca40f 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pcx/AbstractPcxTest.java
@@ -22,11 +22,11 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class PcxBaseTest extends ImagingTest {
+public abstract class AbstractPcxTest extends AbstractImagingTest {
- private static final ImageFilter IMAGE_FILTER = PcxBaseTest::isPcx;
+ private static final ImageFilter IMAGE_FILTER = AbstractPcxTest::isPcx;
private static boolean isPcx(final File file) {
return file.getName().toLowerCase().endsWith(".pcx");
diff --git a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java b/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
index c2373a89..0ac5fd77 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
@@ -30,7 +30,7 @@ import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Test;
-public class PcxReadTest extends PcxBaseTest {
+public class PcxReadTest extends AbstractPcxTest {
@Test
public void test() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/png/AbstractPngTest.java
similarity index 87%
rename from src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
rename to src/test/java/org/apache/commons/imaging/formats/png/AbstractPngTest.java
index 9bf84033..1b71695a 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/AbstractPngTest.java
@@ -25,11 +25,11 @@ import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class PngBaseTest extends ImagingTest {
+public abstract class AbstractPngTest extends AbstractImagingTest {
- private static final ImageFilter IMAGE_FILTER = PngBaseTest::isPng;
+ private static final ImageFilter IMAGE_FILTER = AbstractPngTest::isPng;
private static boolean isPng(final File file) throws IOException {
final ImageFormat format = Imaging.guessFormat(file);
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java b/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
index 7bd6bc15..0b145a50 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
@@ -29,7 +29,7 @@ import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Test;
-public class ConvertPngToGifTest extends PngBaseTest {
+public class ConvertPngToGifTest extends AbstractPngTest {
@Test
public void test() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
index 018e6bab..b20fec8a 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngImageParserTest.java
@@ -29,7 +29,7 @@ import org.apache.commons.imaging.ImageInfo;
import org.apache.commons.imaging.common.AllocationRequestException;
import org.junit.jupiter.api.Test;
-public class PngImageParserTest extends PngBaseTest {
+public class PngImageParserTest extends AbstractPngTest {
private static byte[] getPngImageBytes(final BufferedImage image, final PngImagingParameters params) throws IOException {
try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
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 35a6f488..7c4032fd 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
@@ -30,7 +30,7 @@ import org.apache.commons.imaging.internal.Debug;
import org.apache.commons.io.FilenameUtils;
import org.junit.jupiter.api.Test;
-public class PngMultipleRoundtripTest extends PngBaseTest {
+public class PngMultipleRoundtripTest extends AbstractPngTest {
@Test
public void test() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
index 0e852c98..15ef9fac 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
@@ -37,7 +37,7 @@ import org.apache.commons.imaging.internal.Debug;
import org.apache.commons.imaging.test.TestResources;
import org.junit.jupiter.api.Test;
-public class PngReadTest extends PngBaseTest {
+public class PngReadTest extends AbstractPngTest {
@Test
public void test() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
index b04a3831..c91fb8dd 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
@@ -30,7 +30,7 @@ import java.util.List;
import org.apache.commons.imaging.Imaging;
import org.junit.jupiter.api.Test;
-public class PngTextTest extends PngBaseTest {
+public class PngTextTest extends AbstractPngTest {
@Test
public void test() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java b/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
index 78186cf6..c0911fd1 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
@@ -27,7 +27,7 @@ import java.util.List;
import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Test;
-public class PngWriteForceTrueColorText extends PngBaseTest {
+public class PngWriteForceTrueColorText extends AbstractPngTest {
@Test
public void test() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
index 0d1c31ac..4a5338c6 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
@@ -32,12 +32,12 @@ import java.util.Random;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
import org.apache.commons.imaging.common.GenericImageMetadata;
import org.apache.commons.imaging.common.ImageMetadata;
import org.junit.jupiter.api.Test;
-public class PngWriteReadTest extends ImagingTest {
+public class PngWriteReadTest extends AbstractImagingTest {
private int[][] bufferedImageToImageData(final BufferedImage image) {
final int width = image.getWidth();
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java
index 35944940..cfd4d216 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngWriterTest.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
/**
* Unit tests for class {@link PngWriter}.
*/
-public class PngWriterTest extends PngBaseTest {
+public class PngWriterTest extends AbstractPngTest {
private static int countColors(final byte[] bytes) throws IOException {
final BufferedImage imageParsed = Imaging.getBufferedImage(bytes);
diff --git a/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/psd/AbstractPsdTest.java
similarity index 87%
rename from src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java
rename to src/test/java/org/apache/commons/imaging/formats/psd/AbstractPsdTest.java
index ebe091a8..8d47e700 100644
--- a/src/test/java/org/apache/commons/imaging/formats/psd/PsdBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/psd/AbstractPsdTest.java
@@ -24,10 +24,10 @@ import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class PsdBaseTest extends ImagingTest {
- private static final ImageFilter IMAGE_FILTER = PsdBaseTest::isPsd;
+public abstract class AbstractPsdTest extends AbstractImagingTest {
+ private static final ImageFilter IMAGE_FILTER = AbstractPsdTest::isPsd;
private static boolean isPsd(final File file) throws IOException {
final ImageFormat format = Imaging.guessFormat(file);
diff --git a/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java b/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java
index ab7bd8cc..671e1016 100644
--- a/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java
@@ -29,7 +29,7 @@ import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Test;
-public class PsdReadTest extends PsdBaseTest {
+public class PsdReadTest extends AbstractPsdTest {
@Test
public void test() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
index 098df2e8..330aa2af 100644
--- a/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeBaseTest.java
@@ -24,9 +24,9 @@ import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class RgbeBaseTest extends ImagingTest {
+public abstract class RgbeBaseTest extends AbstractImagingTest {
private static final ImageFilter IMAGE_FILTER = RgbeBaseTest::isRgbe;
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
index 6188f05a..314c46c4 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.java
@@ -25,9 +25,9 @@ import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class TiffBaseTest extends ImagingTest {
+public abstract class TiffBaseTest extends AbstractImagingTest {
private static final ImageFilter IMAGE_FILTER = TiffBaseTest::isTiff;
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java
index 8dccddf7..f3461135 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
import org.apache.commons.imaging.formats.tiff.constants.AdobePageMaker6TagConstants;
import org.apache.commons.imaging.formats.tiff.constants.AdobePhotoshopTagConstants;
import org.apache.commons.imaging.formats.tiff.constants.AliasSketchbookProTagConstants;
@@ -47,7 +47,7 @@ import org.apache.commons.imaging.formats.tiff.constants.WangTagConstants;
import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo;
import org.junit.jupiter.api.Test;
-public class TiffTagIntegrityTest extends ImagingTest {
+public class TiffTagIntegrityTest extends AbstractImagingTest {
@Test
public void testTagIntegrity() {
diff --git a/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java
index e89f2059..6c38211f 100644
--- a/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.java
@@ -19,9 +19,9 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class WbmpBaseTest extends ImagingTest {
+public abstract class WbmpBaseTest extends AbstractImagingTest {
private static final ImageFilter IMAGE_FILTER = WbmpBaseTest::isWbmp;
private static boolean isWbmp(final File file) {
diff --git a/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java
index 174698b0..a7ed3707 100644
--- a/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/xbm/XbmBaseTest.java
@@ -19,9 +19,9 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class XbmBaseTest extends ImagingTest {
+public abstract class XbmBaseTest extends AbstractImagingTest {
private static final ImageFilter IMAGE_FILTER = XbmBaseTest::isXbm;
diff --git a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
index 520cc997..a93da366 100644
--- a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
@@ -22,11 +22,11 @@ import java.io.File;
import java.util.List;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Test;
-public class XmpDumpTest extends ImagingTest {
+public class XmpDumpTest extends AbstractImagingTest {
@Test
public void test() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
index 51a2b92b..575b02cc 100644
--- a/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
@@ -29,13 +29,13 @@ import org.apache.commons.imaging.ImageFormat;
import org.apache.commons.imaging.ImageFormats;
import org.apache.commons.imaging.ImageParser;
import org.apache.commons.imaging.Imaging;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
import org.apache.commons.imaging.common.XmpImagingParameters;
import org.apache.commons.imaging.internal.Debug;
import org.apache.commons.imaging.internal.ImageParserFactory;
import org.junit.jupiter.api.Test;
-public class XmpUpdateTest<E extends XmpImagingParameters<E>> extends ImagingTest {
+public class XmpUpdateTest<E extends XmpImagingParameters<E>> extends AbstractImagingTest {
@Test
public void test() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java b/src/test/java/org/apache/commons/imaging/formats/xpm/AbstractXpmTest.java
similarity index 83%
rename from src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java
rename to src/test/java/org/apache/commons/imaging/formats/xpm/AbstractXpmTest.java
index 2c63c076..b75ca0f6 100644
--- a/src/test/java/org/apache/commons/imaging/formats/xpm/XpmBaseTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/xpm/AbstractXpmTest.java
@@ -19,11 +19,11 @@ import java.io.IOException;
import java.util.List;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
-public abstract class XpmBaseTest extends ImagingTest {
+public abstract class AbstractXpmTest extends AbstractImagingTest {
- private static final ImageFilter IMAGE_FILTER = XpmBaseTest::isXpm;
+ private static final ImageFilter IMAGE_FILTER = AbstractXpmTest::isXpm;
private static boolean isXpm(final File file) {
return file.getName().toLowerCase().endsWith(".xpm");
diff --git a/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java b/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
index 0c054967..fb79c359 100644
--- a/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
@@ -27,7 +27,7 @@ import org.apache.commons.imaging.common.ImageMetadata;
import org.apache.commons.imaging.internal.Debug;
import org.junit.jupiter.api.Test;
-public class XpmReadTest extends XpmBaseTest {
+public class XpmReadTest extends AbstractXpmTest {
@Test
public void test() throws Exception {
diff --git a/src/test/java/org/apache/commons/imaging/palette/PaletteQuantizationTest.java b/src/test/java/org/apache/commons/imaging/palette/PaletteQuantizationTest.java
index 463d6773..9f4b66fe 100644
--- a/src/test/java/org/apache/commons/imaging/palette/PaletteQuantizationTest.java
+++ b/src/test/java/org/apache/commons/imaging/palette/PaletteQuantizationTest.java
@@ -21,10 +21,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import java.awt.image.BufferedImage;
import org.apache.commons.imaging.ImagingException;
-import org.apache.commons.imaging.ImagingTest;
+import org.apache.commons.imaging.AbstractImagingTest;
import org.junit.jupiter.api.Test;
-public class PaletteQuantizationTest extends ImagingTest {
+public class PaletteQuantizationTest extends AbstractImagingTest {
private void checkPaletteDetails(final BufferedImage image, final int limit, final int expectedSize) throws ImagingException {
final PaletteFactory paletteFactory = new PaletteFactory();