From 9fdbc3b1fcfb71fa547e806fbc816e4173f32ccc Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Wed, 14 Oct 2020 17:06:35 +0200 Subject: [PATCH] ImageReaderAbstractTest refactorings. --- .../plugins/svg/SVGImageReaderTest.java | 28 +--- .../plugins/wmf/WMFImageReaderTest.java | 20 +-- .../plugins/bmp/BMPImageReaderTest.java | 33 ++--- .../plugins/bmp/CURImageReaderTest.java | 23 ++- .../plugins/bmp/ICOImageReaderTest.java | 21 ++- .../imageio/util/ImageReaderAbstractTest.java | 137 +++++++++--------- .../plugins/hdr/HDRImageReaderTest.java | 18 +-- .../plugins/icns/ICNSImageReaderTest.java | 24 +-- .../plugins/iff/IFFImageReaderTest.java | 18 ++- .../plugins/jpeg/JPEGImageReaderTest.java | 48 ++---- .../plugins/dcx/DCXImageReaderTest.java | 18 +-- .../plugins/pcx/PCXImageReaderTest.java | 21 +-- .../plugins/pict/PICTImageReaderTest.java | 36 ++--- .../plugins/pnm/PNMImageReaderTest.java | 32 ++-- .../plugins/psd/PSDImageReaderTest.java | 35 ++--- .../reference/JPEGImageReaderTest.java | 43 ++---- .../imageio/reference/PNGImageReaderTest.java | 39 +---- .../plugins/sgi/SGIImageReaderTest.java | 18 +-- .../plugins/tga/TGAImageReaderTest.java | 20 +-- .../thumbsdb/ThumbsDBImageReaderTest.java | 22 +-- .../plugins/tiff/BigTIFFImageReaderTest.java | 21 +-- .../plugins/tiff/TIFFImageReaderTest.java | 25 +--- .../plugins/xwd/XWDImageReaderTest.java | 21 +-- 23 files changed, 255 insertions(+), 466 deletions(-) diff --git a/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTest.java b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTest.java index d63c4262..33dfc86b 100755 --- a/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTest.java +++ b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTest.java @@ -31,6 +31,7 @@ package com.twelvemonkeys.imageio.plugins.svg; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; + import org.junit.Ignore; import org.junit.Test; @@ -44,7 +45,6 @@ import javax.imageio.stream.ImageInputStream; import java.awt.*; import java.awt.image.BufferedImage; import java.awt.image.ImagingOpException; -import java.io.File; import java.io.IOException; import java.io.InputStream; import java.net.URISyntaxException; @@ -67,7 +67,10 @@ import static org.mockito.Mockito.*; */ public class SVGImageReaderTest extends ImageReaderAbstractTest { - private SVGImageReaderSpi provider = new SVGImageReaderSpi(); + @Override + protected ImageReaderSpi createProvider() { + return new SVGImageReaderSpi(); + } protected List getTestData() { return Arrays.asList( @@ -82,19 +85,6 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest ); } - protected ImageReaderSpi createProvider() { - return provider; - } - - @Override - protected SVGImageReader createReader() { - return new SVGImageReader(createProvider()); - } - - protected Class getReaderClass() { - return SVGImageReader.class; - } - protected List getFormatNames() { return Collections.singletonList("svg"); } @@ -111,8 +101,6 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest public void testScaleViewBox() throws IOException { URL svgUrl = getClassLoaderResource("/svg/quadrants.svg"); - File tmpDir = new File(System.getProperty("java.io.tmpdir")); - SVGImageReader reader = createReader(); SVGReadParam param = new SVGReadParam(); @@ -160,11 +148,11 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest @Test @Override - public void testReadWithSizeParam() { + public void testReadWithSizeParam() throws IOException { try { super.testReadWithSizeParam(); } - catch (AssertionError failure) { + catch (AssertionError | IOException failure) { Throwable cause = failure; while (cause.getCause() != null) { @@ -299,7 +287,7 @@ public class SVGImageReaderTest extends ImageReaderAbstractTest params.setAllowExternalResources(true); reader.read(0, params); - assertTrue("reader.read should've thrown an exception, but didn't", false); + fail("reader.read should've thrown an exception, but didn't"); } catch (IIOException allowed) { assertTrue(allowed.getMessage().contains("batikLogo.svg")); // The embedded resource we don't find diff --git a/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTest.java b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTest.java index f85d9d90..0fdb4c50 100755 --- a/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTest.java +++ b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTest.java @@ -31,6 +31,7 @@ package com.twelvemonkeys.imageio.plugins.wmf; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; + import org.junit.Ignore; import org.junit.Test; @@ -49,7 +50,10 @@ import java.util.List; * @version $Id: WMFImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ public class WMFImageReaderTest extends ImageReaderAbstractTest { - private WMFImageReaderSpi provider = new WMFImageReaderSpi(); + @Override + protected ImageReaderSpi createProvider() { + return new WMFImageReaderSpi(); + } protected List getTestData() { return Collections.singletonList( @@ -57,27 +61,17 @@ public class WMFImageReaderTest extends ImageReaderAbstractTest ); } - protected ImageReaderSpi createProvider() { - return provider; - } - @Override - protected WMFImageReader createReader() { - return new WMFImageReader(createProvider()); - } - - protected Class getReaderClass() { - return WMFImageReader.class; - } - protected List getFormatNames() { return Collections.singletonList("wmf"); } + @Override protected List getSuffixes() { return Arrays.asList("wmf", "emf"); } + @Override protected List getMIMETypes() { return Arrays.asList("image/x-wmf", "application/x-msmetafile"); } diff --git a/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java b/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java index f0af3feb..ccb4c5b7 100755 --- a/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java +++ b/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/BMPImageReaderTest.java @@ -32,6 +32,7 @@ package com.twelvemonkeys.imageio.plugins.bmp; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import com.twelvemonkeys.xml.XMLSerializer; + import org.junit.Ignore; import org.junit.Test; import org.mockito.InOrder; @@ -48,7 +49,7 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.lang.reflect.Constructor; -import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; import java.util.Iterator; @@ -68,6 +69,12 @@ import static org.mockito.Mockito.*; * @version $Id: BMPImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ public class BMPImageReaderTest extends ImageReaderAbstractTest { + @Override + protected ImageReaderSpi createProvider() { + return new BMPImageReaderSpi(); + } + + @Override protected List getTestData() { return Arrays.asList( // BMP Suite "Good" @@ -144,27 +151,17 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest ); } - protected ImageReaderSpi createProvider() { - return new BMPImageReaderSpi(); - } - @Override - protected BMPImageReader createReader() { - return new BMPImageReader(createProvider()); - } - - protected Class getReaderClass() { - return BMPImageReader.class; - } - protected List getFormatNames() { return Collections.singletonList("bmp"); } + @Override protected List getSuffixes() { return Arrays.asList("bmp", "rle"); } + @Override protected List getMIMETypes() { return Collections.singletonList("image/bmp"); } @@ -273,7 +270,7 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest } @Test - public void testAddIIOReadProgressListenerCallbacksJPEG() { + public void testAddIIOReadProgressListenerCallbacksJPEG() throws IOException { ImageReader reader = createReader(); TestData data = new TestData(getClassLoaderResource("/bmpsuite/q/rgb24jpeg.bmp"), new Dimension(127, 64)); reader.setInput(data.getInputStream()); @@ -296,7 +293,7 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest } @Test - public void testAddIIOReadProgressListenerCallbacksPNG() { + public void testAddIIOReadProgressListenerCallbacksPNG() throws IOException { ImageReader reader = createReader(); TestData data = new TestData(getClassLoaderResource("/bmpsuite/q/rgb24png.bmp"), new Dimension(127, 64)); reader.setInput(data.getInputStream()); @@ -319,7 +316,7 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest } @Test - public void testMetadataEqualsJRE() throws IOException, URISyntaxException { + public void testMetadataEqualsJRE() throws IOException { ImageReader jreReader; try { @SuppressWarnings("unchecked") @@ -356,7 +353,7 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest } IIOMetadata jreMetadata = jreReader.getImageMetadata(0); - assertEquals(true, metadata.isStandardMetadataFormatSupported()); + assertTrue(metadata.isStandardMetadataFormatSupported()); assertEquals(jreMetadata.getNativeMetadataFormatName(), metadata.getNativeMetadataFormatName()); assertArrayEquals(jreMetadata.getExtraMetadataFormatNames(), metadata.getExtraMetadataFormatNames()); @@ -379,7 +376,7 @@ public class BMPImageReaderTest extends ImageReaderAbstractTest new XMLSerializer(expected, "UTF-8").serialize(expectedTree, false); new XMLSerializer(actual, "UTF-8").serialize(actualTree, false); - assertEquals(e.getMessage(), new String(expected.toByteArray(), "UTF-8"), new String(actual.toByteArray(), "UTF-8")); + assertEquals(e.getMessage(), new String(expected.toByteArray(), StandardCharsets.UTF_8), new String(actual.toByteArray(), StandardCharsets.UTF_8)); throw e; } diff --git a/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/CURImageReaderTest.java b/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/CURImageReaderTest.java index d4d53c4a..6523c31b 100755 --- a/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/CURImageReaderTest.java +++ b/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/CURImageReaderTest.java @@ -31,6 +31,7 @@ package com.twelvemonkeys.imageio.plugins.bmp; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; + import org.junit.Ignore; import org.junit.Test; @@ -53,6 +54,12 @@ import static org.junit.Assert.*; * @version $Id: CURImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ public class CURImageReaderTest extends ImageReaderAbstractTest { + @Override + protected ImageReaderSpi createProvider() { + return new CURImageReaderSpi(); + } + + @Override protected List getTestData() { return Arrays.asList( new TestData(getClassLoaderResource("/cur/hand.cur"), new Dimension(32, 32)), @@ -60,27 +67,17 @@ public class CURImageReaderTest extends ImageReaderAbstractTest ); } - protected ImageReaderSpi createProvider() { - return new CURImageReaderSpi(); - } - @Override - protected CURImageReader createReader() { - return new CURImageReader(); - } - - protected Class getReaderClass() { - return CURImageReader.class; - } - protected List getFormatNames() { return Collections.singletonList("cur"); } + @Override protected List getSuffixes() { return Collections.singletonList("cur"); } + @Override protected List getMIMETypes() { return Arrays.asList("image/vnd.microsoft.cursor", "image/cursor", "image/x-cursor"); } @@ -99,7 +96,7 @@ public class CURImageReaderTest extends ImageReaderAbstractTest assertNotNull("Hotspot for cursor not present", hotspot); // Image weirdness - assertTrue("Hotspot for cursor undefined (java.awt.Image.UndefinedProperty)", Image.UndefinedProperty != hotspot); + assertNotSame("Hotspot for cursor undefined (java.awt.Image.UndefinedProperty)", Image.UndefinedProperty, hotspot); assertTrue(String.format("Hotspot not a java.awt.Point: %s", hotspot.getClass()), hotspot instanceof Point); assertEquals(pExpected, hotspot); diff --git a/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/ICOImageReaderTest.java b/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/ICOImageReaderTest.java index 375c98e1..a915625f 100755 --- a/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/ICOImageReaderTest.java +++ b/imageio/imageio-bmp/src/test/java/com/twelvemonkeys/imageio/plugins/bmp/ICOImageReaderTest.java @@ -31,6 +31,7 @@ package com.twelvemonkeys.imageio.plugins.bmp; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; + import org.junit.Ignore; import org.junit.Test; @@ -49,6 +50,12 @@ import java.util.List; * @version $Id: ICOImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ public class ICOImageReaderTest extends ImageReaderAbstractTest { + @Override + protected ImageReaderSpi createProvider() { + return new ICOImageReaderSpi(); + } + + @Override protected List getTestData() { return Arrays.asList( new TestData( @@ -75,27 +82,17 @@ public class ICOImageReaderTest extends ImageReaderAbstractTest ); } - protected ImageReaderSpi createProvider() { - return new ICOImageReaderSpi(); - } - @Override - protected ICOImageReader createReader() { - return new ICOImageReader(); - } - - protected Class getReaderClass() { - return ICOImageReader.class; - } - protected List getFormatNames() { return Collections.singletonList("ico"); } + @Override protected List getSuffixes() { return Collections.singletonList("ico"); } + @Override protected List getMIMETypes() { return Arrays.asList("image/vnd.microsoft.icon", "image/ico", "image/x-icon"); } diff --git a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java index ff70b7f5..80dca1aa 100644 --- a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java +++ b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java @@ -31,6 +31,7 @@ package com.twelvemonkeys.imageio.util; import com.twelvemonkeys.imageio.stream.URLImageInputStreamSpi; + import org.junit.Ignore; import org.junit.Test; import org.mockito.InOrder; @@ -49,6 +50,7 @@ import java.awt.image.RenderedImage; import java.awt.image.SampleModel; import java.io.File; import java.io.IOException; +import java.lang.reflect.ParameterizedType; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; @@ -69,27 +71,26 @@ public abstract class ImageReaderAbstractTest { // TODO: Should we really test if the provider is installed? // - Pro: Tests the META-INF/services config // - Con: Not all providers should be installed at runtime... + // TODO: Create own subclass for testing the Spis? static { IIORegistry.getDefaultInstance().registerServiceProvider(new URLImageInputStreamSpi()); ImageIO.setUseCache(false); } - protected abstract List getTestData(); + @SuppressWarnings("unchecked") + private final Class readerClass = (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0]; + + protected final ImageReaderSpi provider = createProvider(); protected abstract ImageReaderSpi createProvider(); - protected abstract Class getReaderClass(); - - protected T createReader() { - try { - return getReaderClass().newInstance(); - } - catch (InstantiationException | IllegalAccessException e) { - throw new RuntimeException(e); - } + protected final T createReader() throws IOException { + return readerClass.cast(provider.createReaderInstance(null)); } + protected abstract List getTestData(); + protected abstract List getFormatNames(); protected abstract List getSuffixes(); @@ -131,7 +132,6 @@ public abstract class ImageReaderAbstractTest { @Test public void testProviderInstalledForNames() { - Class readerClass = getReaderClass(); for (String name : getFormatNames()) { assertProviderInstalledForName(name, readerClass); } @@ -139,7 +139,6 @@ public abstract class ImageReaderAbstractTest { @Test public void testProviderInstalledForSuffixes() { - Class readerClass = getReaderClass(); for (String suffix : getSuffixes()) { assertProviderInstalledForSuffix(suffix, readerClass); } @@ -147,7 +146,6 @@ public abstract class ImageReaderAbstractTest { @Test public void testProviderInstalledForMIMETypes() { - Class readerClass = getReaderClass(); for (String type : getMIMETypes()) { assertProviderInstalledForMIMEType(type, readerClass); } @@ -157,7 +155,6 @@ public abstract class ImageReaderAbstractTest { public void testProviderCanRead() throws IOException { List testData = getTestData(); - ImageReaderSpi provider = createProvider(); for (TestData data : testData) { ImageInputStream stream = data.getInputStream(); assertNotNull(stream); @@ -170,7 +167,7 @@ public abstract class ImageReaderAbstractTest { boolean canRead = false; try { - canRead = createProvider().canDecodeInput(null); + canRead = provider.canDecodeInput(null); } catch (IllegalArgumentException ignore) { } @@ -185,7 +182,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testSetInput() { + public void testSetInput() throws IOException { // Should just pass with no exceptions ImageReader reader = createReader(); assertNotNull(reader); @@ -198,7 +195,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testSetInputNull() { + public void testSetInputNull() throws IOException { // Should just pass with no exceptions ImageReader reader = createReader(); assertNotNull(reader); @@ -207,7 +204,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testRead() { + public void testRead() throws IOException { ImageReader reader = createReader(); for (TestData data : getTestData()) { @@ -241,7 +238,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadIndexNegative() { + public void testReadIndexNegative() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -262,7 +259,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadIndexOutOfBounds() { + public void testReadIndexOutOfBounds() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -283,7 +280,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadNoInput() { + public void testReadNoInput() throws IOException { ImageReader reader = createReader(); // Do not set input @@ -323,7 +320,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadIndexNegativeWithParam() { + public void testReadIndexNegativeWithParam() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -345,7 +342,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadIndexOutOfBoundsWithParam() { + public void testReadIndexOutOfBoundsWithParam() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -367,7 +364,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadNoInputWithParam() { + public void testReadNoInputWithParam() throws IOException { ImageReader reader = createReader(); // Do not set input @@ -388,7 +385,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadWithNewParam() { + public void testReadWithNewParam() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -409,7 +406,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadWithDefaultParam() { + public void testReadWithDefaultParam() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -430,7 +427,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadWithNullParam() { + public void testReadWithNullParam() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -451,7 +448,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadWithSizeParam() { + public void testReadWithSizeParam() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -477,7 +474,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadWithSubsampleParamDimensions() { + public void testReadWithSubsampleParamDimensions() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -594,7 +591,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadWithSourceRegionParam() { + public void testReadWithSourceRegionParam() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -671,7 +668,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadWithSizeAndSourceRegionParam() { + public void testReadWithSizeAndSourceRegionParam() throws IOException { // TODO: Is this test correct??? ImageReader reader = createReader(); TestData data = getTestData().get(0); @@ -702,7 +699,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadWithSubsampleAndSourceRegionParam() { + public void testReadWithSubsampleAndSourceRegionParam() throws IOException { // NOTE: The "standard" (com.sun.imageio.plugin.*) ImageReaders pass // this test, so the test should be correct... ImageReader reader = createReader(); @@ -728,7 +725,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadAsRenderedImageIndexNegative() { + public void testReadAsRenderedImageIndexNegative() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -751,7 +748,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadAsRenderedImageIndexOutOfBounds() throws IIOException { + public void testReadAsRenderedImageIndexOutOfBounds() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -778,7 +775,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadAsRenderedImageNoInput() { + public void testReadAsRenderedImageNoInput() throws IOException { ImageReader reader = createReader(); // Do not set input @@ -800,7 +797,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadAsRenderedImage() { + public void testReadAsRenderedImage() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -823,7 +820,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testReadAsRenderedImageWithDefaultParam() { + public void testReadAsRenderedImageWithDefaultParam() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -846,7 +843,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetDefaultReadParam() { + public void testGetDefaultReadParam() throws IOException { ImageReader reader = createReader(); ImageReadParam param = reader.getDefaultReadParam(); assertNotNull(param); @@ -854,7 +851,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetFormatName() { + public void testGetFormatName() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -870,7 +867,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetMinIndex() { + public void testGetMinIndex() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -886,7 +883,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetMinIndexNoInput() { + public void testGetMinIndexNoInput() throws IOException { ImageReader reader = createReader(); int num = 0; @@ -900,7 +897,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetNumImages() { + public void testGetNumImages() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -929,7 +926,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetNumImagesNoInput() { + public void testGetNumImagesNoInput() throws IOException { ImageReader reader = createReader(); int num = -1; @@ -957,7 +954,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetWidth() { + public void testGetWidth() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -974,7 +971,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetWidthIndexOutOfBounds() { + public void testGetWidthIndexOutOfBounds() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -995,13 +992,13 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetWidthNoInput() { + public void testGetWidthNoInput() throws IOException { ImageReader reader = createReader(); int width = 0; try { width = reader.getWidth(0); - fail("Width read without imput"); + fail("Width read without input"); } catch (IllegalStateException ignore) { } @@ -1013,7 +1010,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetHeight() { + public void testGetHeight() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1030,13 +1027,13 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetHeightNoInput() { + public void testGetHeightNoInput() throws IOException { ImageReader reader = createReader(); int height = 0; try { height = reader.getHeight(0); - fail("height read without imput"); + fail("height read without input"); } catch (IllegalStateException ignore) { } @@ -1048,7 +1045,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetHeightIndexOutOfBounds() { + public void testGetHeightIndexOutOfBounds() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1069,7 +1066,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetAspectRatio() { + public void testGetAspectRatio() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1087,7 +1084,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetAspectRatioNoInput() { + public void testGetAspectRatioNoInput() throws IOException { ImageReader reader = createReader(); float aspectRatio = 0f; @@ -1105,7 +1102,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testGetAspectRatioIndexOutOfBounds() { + public void testGetAspectRatioIndexOutOfBounds() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1126,13 +1123,13 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testDisposeBeforeRead() { + public void testDisposeBeforeRead() throws IOException { ImageReader reader = createReader(); reader.dispose(); // Just pass with no exceptions } @Test - public void testDisposeAfterRead() { + public void testDisposeAfterRead() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1140,21 +1137,21 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testAddIIOReadProgressListener() { + public void testAddIIOReadProgressListener() throws IOException { ImageReader reader = createReader(); reader.addIIOReadProgressListener(mock(IIOReadProgressListener.class)); reader.dispose(); } @Test - public void testAddIIOReadProgressListenerNull() { + public void testAddIIOReadProgressListenerNull() throws IOException { ImageReader reader = createReader(); reader.addIIOReadProgressListener(null); reader.dispose(); } @Test - public void testAddIIOReadProgressListenerCallbacks() { + public void testAddIIOReadProgressListenerCallbacks() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1178,7 +1175,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testMultipleAddIIOReadProgressListenerCallbacks() { + public void testMultipleAddIIOReadProgressListenerCallbacks() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1216,21 +1213,21 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testRemoveIIOReadProgressListenerNull() { + public void testRemoveIIOReadProgressListenerNull() throws IOException { ImageReader reader = createReader(); reader.removeIIOReadProgressListener(null); reader.dispose(); } @Test - public void testRemoveIIOReadProgressListenerNone() { + public void testRemoveIIOReadProgressListenerNone() throws IOException { ImageReader reader = createReader(); reader.removeIIOReadProgressListener(mock(IIOReadProgressListener.class)); reader.dispose(); } @Test - public void testRemoveIIOReadProgressListener() { + public void testRemoveIIOReadProgressListener() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1252,7 +1249,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testRemoveIIOReadProgressListenerMultiple() { + public void testRemoveIIOReadProgressListenerMultiple() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1284,7 +1281,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testRemoveAllIIOReadProgressListeners() { + public void testRemoveAllIIOReadProgressListeners() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1307,7 +1304,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testRemoveAllIIOReadProgressListenersMultiple() { + public void testRemoveAllIIOReadProgressListenersMultiple() throws IOException { ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1334,7 +1331,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testAbort() { + public void testAbort() throws IOException { final ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1399,7 +1396,7 @@ public abstract class ImageReaderAbstractTest { } } - assertTrue("ImageTypeSepcifier from getRawImageType should be in the iterator from getImageTypes", rawFound); + assertTrue("ImageTypeSpecifier from getRawImageType should be in the iterator from getImageTypes", rawFound); } reader.dispose(); } @@ -1582,7 +1579,7 @@ public abstract class ImageReaderAbstractTest { } @Test - public void testSetDestinationOffsetNull() { + public void testSetDestinationOffsetNull() throws IOException { final ImageReader reader = createReader(); TestData data = getTestData().get(0); reader.setInput(data.getInputStream()); @@ -1715,8 +1712,6 @@ public abstract class ImageReaderAbstractTest { @Test public void testProviderAndMetadataFormatNamesMatch() throws IOException { - ImageReaderSpi provider = createProvider(); - ImageReader reader = createReader(); reader.setInput(getTestData().get(0).getInputStream()); diff --git a/imageio/imageio-hdr/src/test/java/com/twelvemonkeys/imageio/plugins/hdr/HDRImageReaderTest.java b/imageio/imageio-hdr/src/test/java/com/twelvemonkeys/imageio/plugins/hdr/HDRImageReaderTest.java index 8720973b..dbe686f7 100755 --- a/imageio/imageio-hdr/src/test/java/com/twelvemonkeys/imageio/plugins/hdr/HDRImageReaderTest.java +++ b/imageio/imageio-hdr/src/test/java/com/twelvemonkeys/imageio/plugins/hdr/HDRImageReaderTest.java @@ -46,26 +46,16 @@ import java.util.List; * @version $Id: TGAImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$ */ public class HDRImageReaderTest extends ImageReaderAbstractTest { - @Override - protected List getTestData() { - return Arrays.asList( - new TestData(getClassLoaderResource("/hdr/memorial_o876.hdr"), new Dimension(512, 768)) - ); - } - @Override protected ImageReaderSpi createProvider() { return new HDRImageReaderSpi(); } @Override - protected Class getReaderClass() { - return HDRImageReader.class; - } - - @Override - protected HDRImageReader createReader() { - return new HDRImageReader(createProvider()); + protected List getTestData() { + return Collections.singletonList( + new TestData(getClassLoaderResource("/hdr/memorial_o876.hdr"), new Dimension(512, 768)) + ); } @Override diff --git a/imageio/imageio-icns/src/test/java/com/twelvemonkeys/imageio/plugins/icns/ICNSImageReaderTest.java b/imageio/imageio-icns/src/test/java/com/twelvemonkeys/imageio/plugins/icns/ICNSImageReaderTest.java index 4d162888..0fa26a34 100644 --- a/imageio/imageio-icns/src/test/java/com/twelvemonkeys/imageio/plugins/icns/ICNSImageReaderTest.java +++ b/imageio/imageio-icns/src/test/java/com/twelvemonkeys/imageio/plugins/icns/ICNSImageReaderTest.java @@ -31,10 +31,10 @@ package com.twelvemonkeys.imageio.plugins.icns; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; + import org.junit.Ignore; import org.junit.Test; -import javax.imageio.ImageReader; import javax.imageio.spi.ImageReaderSpi; import java.awt.*; import java.io.IOException; @@ -49,7 +49,12 @@ import java.util.List; * @author last modified by $Author: haraldk$ * @version $Id: ICNSImageReaderTest.java,v 1.0 25.10.11 18:44 haraldk Exp$ */ -public class ICNSImageReaderTest extends ImageReaderAbstractTest { +public class ICNSImageReaderTest extends ImageReaderAbstractTest { + @Override + protected ImageReaderSpi createProvider() { + return new ICNSImageReaderSpi(); + } + @Override protected List getTestData() { return Arrays.asList( @@ -105,21 +110,6 @@ public class ICNSImageReaderTest extends ImageReaderAbstractTest { ); } - @Override - protected ImageReaderSpi createProvider() { - return new ICNSImageReaderSpi(); - } - - @Override - protected ImageReader createReader() { - return new ICNSImageReader(); - } - - @Override - protected Class getReaderClass() { - return ICNSImageReader.class; - } - @Override protected List getFormatNames() { return Collections.singletonList("icns"); diff --git a/imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTest.java b/imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTest.java index 20c55d3c..db1c1993 100755 --- a/imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTest.java +++ b/imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTest.java @@ -31,6 +31,7 @@ package com.twelvemonkeys.imageio.plugins.iff; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; + import org.junit.Test; import javax.imageio.ImageIO; @@ -54,6 +55,12 @@ import static org.junit.Assert.*; * @version $Id: IFFImageReaderTestCase.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ public class IFFImageReaderTest extends ImageReaderAbstractTest { + @Override + protected ImageReaderSpi createProvider() { + return new IFFImageReaderSpi(); + } + + @Override protected List getTestData() { return Arrays.asList( // 32 bit - Ok @@ -85,22 +92,17 @@ public class IFFImageReaderTest extends ImageReaderAbstractTest ); } - protected ImageReaderSpi createProvider() { - return new IFFImageReaderSpi(); - } - - protected Class getReaderClass() { - return IFFImageReader.class; - } - + @Override protected List getFormatNames() { return Collections.singletonList("iff"); } + @Override protected List getSuffixes() { return Arrays.asList("iff", "ilbm", "ham", "ham8", "lbm"); } + @Override protected List getMIMETypes() { return Arrays.asList("image/iff", "image/x-iff"); } diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java index d0b09837..b5a95d7d 100644 --- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java +++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java @@ -79,7 +79,10 @@ import static org.mockito.Mockito.*; */ public class JPEGImageReaderTest extends ImageReaderAbstractTest { - private static final JPEGImageReaderSpi SPI = new JPEGImageReaderSpi(lookupDelegateProvider()); + @Override + protected ImageReaderSpi createProvider() { + return new JPEGImageReaderSpi(lookupDelegateProvider()); + } private static ImageReaderSpi lookupDelegateProvider() { return lookupProviderByName(IIORegistry.getDefaultInstance(), "com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi", ImageReaderSpi.class); @@ -135,26 +138,6 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest getReaderClass() { - return JPEGImageReader.class; - } - @Override protected boolean allowsNullRawImageType() { return true; @@ -207,7 +190,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest { - @Override - protected List getTestData() { - return Collections.singletonList( - new TestData(getClassLoaderResource("/dcx/input.dcx"), new Dimension(70, 46)) // RLE encoded RGB (the only sample I've found) - ); - } @Override protected ImageReaderSpi createProvider() { @@ -67,13 +62,10 @@ public class DCXImageReaderTest extends ImageReaderAbstractTest } @Override - protected Class getReaderClass() { - return DCXImageReader.class; - } - - @Override - protected DCXImageReader createReader() { - return new DCXImageReader(createProvider()); + protected List getTestData() { + return Collections.singletonList( + new TestData(getClassLoaderResource("/dcx/input.dcx"), new Dimension(70, 46)) // RLE encoded RGB (the only sample I've found) + ); } @Override diff --git a/imageio/imageio-pcx/src/test/java/com/twelvemonkeys/imageio/plugins/pcx/PCXImageReaderTest.java b/imageio/imageio-pcx/src/test/java/com/twelvemonkeys/imageio/plugins/pcx/PCXImageReaderTest.java index 164c9144..afddeedf 100755 --- a/imageio/imageio-pcx/src/test/java/com/twelvemonkeys/imageio/plugins/pcx/PCXImageReaderTest.java +++ b/imageio/imageio-pcx/src/test/java/com/twelvemonkeys/imageio/plugins/pcx/PCXImageReaderTest.java @@ -31,6 +31,7 @@ package com.twelvemonkeys.imageio.plugins.pcx; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; + import org.junit.Test; import javax.imageio.ImageIO; @@ -55,6 +56,11 @@ import static org.junit.Assert.assertNotNull; * @version $Id: PCXImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$ */ public class PCXImageReaderTest extends ImageReaderAbstractTest { + @Override + protected ImageReaderSpi createProvider() { + return new PCXImageReaderSpi(); + } + @Override protected List getTestData() { return Arrays.asList( @@ -79,21 +85,6 @@ public class PCXImageReaderTest extends ImageReaderAbstractTest ); } - @Override - protected ImageReaderSpi createProvider() { - return new PCXImageReaderSpi(); - } - - @Override - protected Class getReaderClass() { - return PCXImageReader.class; - } - - @Override - protected PCXImageReader createReader() { - return new PCXImageReader(createProvider()); - } - @Override protected List getFormatNames() { return Arrays.asList("PCX", "pcx"); diff --git a/imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTest.java b/imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTest.java index d9c65271..68af69d9 100644 --- a/imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTest.java +++ b/imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTest.java @@ -33,6 +33,7 @@ package com.twelvemonkeys.imageio.plugins.pict; import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream; import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStreamSpi; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; + import org.junit.Ignore; import org.junit.Test; @@ -62,7 +63,10 @@ public class PICTImageReaderTest extends ImageReaderAbstractTest getTestData() { @@ -91,27 +95,17 @@ public class PICTImageReaderTest extends ImageReaderAbstractTest getReaderClass() { - return PICTImageReader.class; - } - protected List getFormatNames() { return Collections.singletonList("pict"); } + @Override protected List getSuffixes() { return Arrays.asList("pct", "pict"); } + @Override protected List getMIMETypes() { return Arrays.asList("image/pict", "image/x-pict"); } @@ -162,7 +156,7 @@ public class PICTImageReaderTest extends ImageReaderAbstractTest { - @Override protected List getTestData() { + @Override + protected ImageReaderSpi createProvider() { + return new PNMImageReaderSpi(); + } + + @Override + protected List getTestData() { return Arrays.asList( new TestData(getClassLoaderResource("/ppm/lena.ppm"), new Dimension(128, 128)), // P6 (PPM RAW) new TestData(getClassLoaderResource("/ppm/colors.ppm"), new Dimension(3, 2)), // P3 (PPM PLAIN) @@ -60,32 +66,23 @@ public class PNMImageReaderTest extends ImageReaderAbstractTest ); } - @Override protected ImageReaderSpi createProvider() { - return new PNMImageReaderSpi(); - } - - @Override protected Class getReaderClass() { - return PNMImageReader.class; - } - - @Override protected PNMImageReader createReader() { - return new PNMImageReader(createProvider()); - } - - @Override protected List getFormatNames() { + @Override + protected List getFormatNames() { return Arrays.asList( "pnm", "pbm", "pgm", "ppm", "pam", "PNM", "PBM", "PGM", "PPM", "PAM" ); } - @Override protected List getSuffixes() { + @Override + protected List getSuffixes() { return Arrays.asList( "pbm", "pgm", "ppm", "pam" ); } - @Override protected List getMIMETypes() { + @Override + protected List getMIMETypes() { return Arrays.asList( "image/x-portable-pixmap", "image/x-portable-anymap", @@ -135,7 +132,6 @@ public class PNMImageReaderTest extends ImageReaderAbstractTest @Test public void testXVThumbNotIncorrectlyRecognizedAsPAM() throws IOException { - ImageReaderSpi provider = createProvider(); assertTrue("Should recognize PAM format", provider.canDecodeInput(new TestData(getClassLoaderResource("/pam/rgba.pam"), new Dimension()).getInputStream())); // Sanity assertFalse("Should distinguish xv-thumbs from PAM format", provider.canDecodeInput(new TestData(getClassLoaderResource("/xv-thumb/xv-thumb.xvt"), new Dimension()).getInputStream())); } diff --git a/imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTest.java b/imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTest.java index e8540f08..879efdbd 100755 --- a/imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTest.java +++ b/imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTest.java @@ -32,6 +32,7 @@ package com.twelvemonkeys.imageio.plugins.psd; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import com.twelvemonkeys.imageio.util.ProgressListenerBase; + import org.junit.Test; import org.w3c.dom.NodeList; @@ -46,8 +47,8 @@ import javax.imageio.stream.ImageInputStream; import java.awt.*; import java.awt.image.BufferedImage; import java.io.IOException; -import java.util.*; import java.util.List; +import java.util.*; import static org.junit.Assert.*; @@ -59,9 +60,12 @@ import static org.junit.Assert.*; * @version $Id: PSDImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ public class PSDImageReaderTest extends ImageReaderAbstractTest { + @Override + protected ImageReaderSpi createProvider() { + return new PSDImageReaderSpi(); + } - private static final ImageReaderSpi provider = new PSDImageReaderSpi(); - + @Override protected List getTestData() { return Arrays.asList( // 5 channel, RGB @@ -72,7 +76,7 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest new TestData(getClassLoaderResource("/psd/escenic-liquid-logo.psd"), new Dimension(595, 420)), // 3 channel RGB, "no composite layer" new TestData(getClassLoaderResource("/psd/jugware-icon.psd"), new Dimension(128, 128)), - // 3 channel RGB, old data, no layer info/mask + // 3 channel RGB, old data, no layer info/mask new TestData(getClassLoaderResource("/psd/MARBLES.PSD"), new Dimension(1419, 1001)), // 1 channel, indexed color new TestData(getClassLoaderResource("/psd/coral_fish.psd"), new Dimension(800, 800)), @@ -105,27 +109,17 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest ); } - protected ImageReaderSpi createProvider() { - return provider; - } - @Override - protected PSDImageReader createReader() { - return new PSDImageReader(provider); - } - - protected Class getReaderClass() { - return PSDImageReader.class; - } - protected List getFormatNames() { return Collections.singletonList("psd"); } + @Override protected List getSuffixes() { return Collections.singletonList("psd"); } + @Override protected List getMIMETypes() { return Arrays.asList( "image/vnd.adobe.photoshop", @@ -135,7 +129,7 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest } @Test - public void testSupportsThumbnail() { + public void testSupportsThumbnail() throws IOException { PSDImageReader imageReader = createReader(); assertTrue(imageReader.readerSupportsThumbnails()); } @@ -261,7 +255,7 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest final List seqeunce = new ArrayList<>(); imageReader.addIIOReadProgressListener(new ProgressListenerBase() { - private float mLastPercentageDone = 0; + private float lastPercentageDone = 0; @Override public void thumbnailStarted(final ImageReader pSource, final int pImageIndex, final int pThumbnailIndex) { @@ -276,8 +270,9 @@ public class PSDImageReaderTest extends ImageReaderAbstractTest @Override public void thumbnailProgress(final ImageReader pSource, final float pPercentageDone) { // Optional - assertTrue("Listener invoked out of sequence", seqeunce.size() == 1); - assertTrue(pPercentageDone >= mLastPercentageDone); + assertEquals("Listener invoked out of sequence", 1, seqeunce.size()); + assertTrue(pPercentageDone >= lastPercentageDone); + lastPercentageDone = pPercentageDone; } }); diff --git a/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java index 4364e7fd..de3af2aa 100644 --- a/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java +++ b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java @@ -32,11 +32,11 @@ package com.twelvemonkeys.imageio.reference; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import com.twelvemonkeys.lang.SystemUtil; + +import com.sun.imageio.plugins.jpeg.JPEGImageReader; import org.junit.Ignore; import org.junit.Test; -import javax.imageio.IIOException; -import javax.imageio.ImageReader; import javax.imageio.spi.IIORegistry; import javax.imageio.spi.ImageReaderSpi; import java.awt.*; @@ -46,7 +46,6 @@ import java.util.Collections; import java.util.List; import static com.twelvemonkeys.imageio.util.IIOUtil.lookupProviderByName; -import static org.junit.Assume.assumeNoException; /** * JPEGImageReaderTest @@ -55,10 +54,13 @@ import static org.junit.Assume.assumeNoException; * @author last modified by $Author: haraldk$ * @version $Id: JPEGImageReaderTest.java,v 1.0 Oct 9, 2009 3:37:25 PM haraldk Exp$ */ -public class JPEGImageReaderTest extends ImageReaderAbstractTest { +public class JPEGImageReaderTest extends ImageReaderAbstractTest { private static final boolean IS_JAVA_6_OR_LATER = SystemUtil.isClassAvailable("java.util.Deque"); - - private final ImageReaderSpi provider = lookupProviderByName(IIORegistry.getDefaultInstance(), "com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi", ImageReaderSpi.class); + + @Override + protected ImageReaderSpi createProvider() { + return lookupProviderByName(IIORegistry.getDefaultInstance(), "com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi", ImageReaderSpi.class); + } @Override protected List getTestData() { @@ -67,33 +69,6 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest { ); } - @Override - protected ImageReaderSpi createProvider() { - return provider; - } - - @Override - protected Class getReaderClass() { - try { - return Class.forName("com.sun.imageio.plugins.jpeg.JPEGImageReader"); - } - catch (ClassNotFoundException e) { - assumeNoException(e); - } - - return null; - } - - @Override - protected ImageReader createReader() { - try { - return provider.createReaderInstance(); - } - catch (IOException e) { - throw new RuntimeException(e); - } - } - // These are NOT correct implementations, but I don't really care here @Override protected List getFormatNames() { @@ -137,7 +112,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest { @Test @Ignore("Known issue") @Override - public void testReadAsRenderedImageIndexOutOfBounds() throws IIOException { + public void testReadAsRenderedImageIndexOutOfBounds() throws IOException { super.testReadAsRenderedImageIndexOutOfBounds(); } diff --git a/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTest.java b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTest.java index 02ae9fdb..307257a9 100644 --- a/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTest.java +++ b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTest.java @@ -32,10 +32,11 @@ package com.twelvemonkeys.imageio.reference; import com.twelvemonkeys.imageio.util.IIOUtil; import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; + +import com.sun.imageio.plugins.png.PNGImageReader; import org.junit.Test; import javax.imageio.IIOException; -import javax.imageio.ImageReader; import javax.imageio.spi.IIORegistry; import javax.imageio.spi.ImageReaderSpi; import java.awt.*; @@ -44,8 +45,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.junit.Assume.assumeNoException; - /** * PNGImageReaderTest * @@ -53,8 +52,11 @@ import static org.junit.Assume.assumeNoException; * @author last modified by $Author: haraldk$ * @version $Id: PNGImageReaderTest.java,v 1.0 Oct 9, 2009 3:37:25 PM haraldk Exp$ */ -public class PNGImageReaderTest extends ImageReaderAbstractTest { - private final ImageReaderSpi provider = IIOUtil.lookupProviderByName(IIORegistry.getDefaultInstance(), "com.sun.imageio.plugins.png.PNGImageReaderSpi", ImageReaderSpi.class); +public class PNGImageReaderTest extends ImageReaderAbstractTest { + @Override + protected ImageReaderSpi createProvider() { + return IIOUtil.lookupProviderByName(IIORegistry.getDefaultInstance(), "com.sun.imageio.plugins.png.PNGImageReaderSpi", ImageReaderSpi.class); + } @Override protected List getTestData() { @@ -63,33 +65,6 @@ public class PNGImageReaderTest extends ImageReaderAbstractTest { ); } - @Override - protected ImageReaderSpi createProvider() { - return provider; - } - - @Override - protected Class getReaderClass() { - try { - return Class.forName("com.sun.imageio.plugins.png.PNGImageReader"); - } - catch (ClassNotFoundException e) { - assumeNoException(e); - } - - return null; - } - - @Override - protected ImageReader createReader() { - try { - return provider.createReaderInstance(); - } - catch (IOException e) { - throw new RuntimeException(e); - } - } - // These are NOT correct implementations, but I don't really care here @Override protected List getFormatNames() { diff --git a/imageio/imageio-sgi/src/test/java/com/twelvemonkeys/imageio/plugins/sgi/SGIImageReaderTest.java b/imageio/imageio-sgi/src/test/java/com/twelvemonkeys/imageio/plugins/sgi/SGIImageReaderTest.java index 7389a3c2..aea3f3b4 100755 --- a/imageio/imageio-sgi/src/test/java/com/twelvemonkeys/imageio/plugins/sgi/SGIImageReaderTest.java +++ b/imageio/imageio-sgi/src/test/java/com/twelvemonkeys/imageio/plugins/sgi/SGIImageReaderTest.java @@ -46,26 +46,16 @@ import java.util.List; * @version $Id: SGIImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$ */ public class SGIImageReaderTest extends ImageReaderAbstractTest { - @Override - protected List getTestData() { - return Collections.singletonList( - new TestData(getClassLoaderResource("/sgi/MARBLES.SGI"), new Dimension(1419, 1001)) // RLE encoded RGB - ); - } - @Override protected ImageReaderSpi createProvider() { return new SGIImageReaderSpi(); } @Override - protected Class getReaderClass() { - return SGIImageReader.class; - } - - @Override - protected SGIImageReader createReader() { - return new SGIImageReader(createProvider()); + protected List getTestData() { + return Collections.singletonList( + new TestData(getClassLoaderResource("/sgi/MARBLES.SGI"), new Dimension(1419, 1001)) // RLE encoded RGB + ); } @Override diff --git a/imageio/imageio-tga/src/test/java/com/twelvemonkeys/imageio/plugins/tga/TGAImageReaderTest.java b/imageio/imageio-tga/src/test/java/com/twelvemonkeys/imageio/plugins/tga/TGAImageReaderTest.java index 8329e88b..657bc992 100755 --- a/imageio/imageio-tga/src/test/java/com/twelvemonkeys/imageio/plugins/tga/TGAImageReaderTest.java +++ b/imageio/imageio-tga/src/test/java/com/twelvemonkeys/imageio/plugins/tga/TGAImageReaderTest.java @@ -45,6 +45,11 @@ import java.util.List; * @version $Id: TGAImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$ */ public class TGAImageReaderTest extends ImageReaderAbstractTest { + @Override + protected ImageReaderSpi createProvider() { + return new TGAImageReaderSpi(); + } + @Override protected List getTestData() { return Arrays.asList( @@ -82,21 +87,6 @@ public class TGAImageReaderTest extends ImageReaderAbstractTest ); } - @Override - protected ImageReaderSpi createProvider() { - return new TGAImageReaderSpi(); - } - - @Override - protected Class getReaderClass() { - return TGAImageReader.class; - } - - @Override - protected TGAImageReader createReader() { - return new TGAImageReader(createProvider()); - } - @Override protected List getFormatNames() { return Arrays.asList("TGA", "tga", "TARGA", "targa"); diff --git a/imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTest.java b/imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTest.java index 296aa00a..09e7db5d 100644 --- a/imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTest.java +++ b/imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTest.java @@ -35,6 +35,7 @@ import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import com.twelvemonkeys.io.ole2.CompoundDocument; import com.twelvemonkeys.io.ole2.Entry; import com.twelvemonkeys.lang.SystemUtil; + import org.junit.Ignore; import org.junit.Test; @@ -60,13 +61,16 @@ import static org.junit.Assert.assertNotNull; public class ThumbsDBImageReaderTest extends ImageReaderAbstractTest { private static final boolean IS_JAVA_6 = SystemUtil.isClassAvailable("java.util.Deque"); - private ThumbsDBImageReaderSpi provider = new ThumbsDBImageReaderSpi(); + @Override + protected ImageReaderSpi createProvider() { + return new ThumbsDBImageReaderSpi(); + } protected List getTestData() { return Arrays.asList( new TestData( getClassLoaderResource("/thumbsdb/Thumbs.db"), - new Dimension(96, 96), new Dimension(96, 96), new Dimension(16, 16), + new Dimension(96, 96), new Dimension(96, 96), new Dimension(16, 16), new Dimension(96, 45), new Dimension(63, 96), new Dimension(96, 96), new Dimension(96, 64), new Dimension(96, 96), new Dimension(96, 77) ), @@ -88,27 +92,17 @@ public class ThumbsDBImageReaderTest extends ImageReaderAbstractTest getReaderClass() { - return ThumbsDBImageReader.class; - } - protected List getFormatNames() { return Collections.singletonList("thumbs"); } + @Override protected List getSuffixes() { return Collections.singletonList("db"); } + @Override protected List getMIMETypes() { return Collections.singletonList("image/x-thumbs-db"); } diff --git a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/BigTIFFImageReaderTest.java b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/BigTIFFImageReaderTest.java index 531edea1..99ef4584 100644 --- a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/BigTIFFImageReaderTest.java +++ b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/BigTIFFImageReaderTest.java @@ -46,7 +46,11 @@ import java.util.List; * @version $Id: BigTIFFImageReaderTest.java,v 1.0 26/04/2017 harald.kuhr Exp$ */ public class BigTIFFImageReaderTest extends ImageReaderAbstractTest { - private static final BigTIFFImageReaderSpi SPI = new BigTIFFImageReaderSpi(); + + @Override + protected ImageReaderSpi createProvider() { + return new BigTIFFImageReaderSpi(); + } @Override protected List getTestData() { @@ -62,21 +66,6 @@ public class BigTIFFImageReaderTest extends ImageReaderAbstractTest getReaderClass() { - return TIFFImageReader.class; - } - - @Override - protected TIFFImageReader createReader() { - return SPI.createReaderInstance(null); - } - @Override protected List getFormatNames() { return Arrays.asList("bigtiff", "BigTIFF", "BIGTIFF"); diff --git a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java index 880eaf40..a6573673 100644 --- a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java +++ b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java @@ -71,7 +71,10 @@ import static org.mockito.Mockito.*; */ public class TIFFImageReaderTest extends ImageReaderAbstractTest { - private static final TIFFImageReaderSpi SPI = new TIFFImageReaderSpi(); + @Override + protected ImageReaderSpi createProvider() { + return new TIFFImageReaderSpi(); + } @Override protected List getTestData() { @@ -182,20 +185,6 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest getReaderClass() { - return TIFFImageReader.class; - } - - @Override - protected TIFFImageReader createReader() { - return SPI.createReaderInstance(null); - } @Override protected List getFormatNames() { @@ -844,7 +833,7 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest { - - private final XWDImageReaderSpi provider = new XWDImageReaderSpi(); + @Override + protected ImageReaderSpi createProvider() { + return new XWDImageReaderSpi(); + } @Override protected List getTestData() { @@ -21,21 +23,6 @@ public class XWDImageReaderTest extends ImageReaderAbstractTest ); } - @Override - protected ImageReaderSpi createProvider() { - return provider; - } - - @Override - protected Class getReaderClass() { - return XWDImageReader.class; - } - - @Override - protected XWDImageReader createReader() { - return provider.createReaderInstance(null); - } - @Override protected List getFormatNames() { return Arrays.asList("xwd", "XWD");