diff --git a/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTestCase.java b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTest.java similarity index 91% rename from imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTestCase.java rename to imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTest.java index 40ebd140..da223957 100755 --- a/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTestCase.java +++ b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTest.java @@ -28,7 +28,7 @@ package com.twelvemonkeys.imageio.plugins.svg; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Ignore; import org.junit.Test; @@ -40,18 +40,19 @@ import java.awt.image.BufferedImage; import java.awt.image.ImagingOpException; import java.io.IOException; import java.util.Arrays; +import java.util.Collections; import java.util.List; import static org.junit.Assert.assertEquals; /** - * SVGImageReaderTestCase + * SVGImageReaderTest * * @author Harald Kuhr * @author last modified by $Author: haraldk$ - * @version $Id: SVGImageReaderTestCase.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ + * @version $Id: SVGImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ -public class SVGImageReaderTestCase extends ImageReaderAbstractTestCase { +public class SVGImageReaderTest extends ImageReaderAbstractTest { private SVGImageReaderSpi provider = new SVGImageReaderSpi(); protected List getTestData() { @@ -76,15 +77,15 @@ public class SVGImageReaderTestCase extends ImageReaderAbstractTestCase getFormatNames() { - return Arrays.asList("svg"); + return Collections.singletonList("svg"); } protected List getSuffixes() { - return Arrays.asList("svg"); + return Collections.singletonList("svg"); } protected List getMIMETypes() { - return Arrays.asList("image/svg+xml"); + return Collections.singletonList("image/svg+xml"); } @Test diff --git a/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTestCase.java b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTest.java similarity index 89% rename from imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTestCase.java rename to imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTest.java index 23c55193..0a666aa6 100755 --- a/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTestCase.java +++ b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTest.java @@ -28,7 +28,7 @@ package com.twelvemonkeys.imageio.plugins.wmf; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Ignore; import org.junit.Test; @@ -36,20 +36,21 @@ import javax.imageio.spi.ImageReaderSpi; import java.awt.*; import java.io.IOException; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** - * SVGImageReaderTestCase + * WMFImageReaderTest * * @author Harald Kuhr * @author last modified by $Author: haraldk$ - * @version $Id: SVGImageReaderTestCase.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ + * @version $Id: WMFImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ -public class WMFImageReaderTestCase extends ImageReaderAbstractTestCase { +public class WMFImageReaderTest extends ImageReaderAbstractTest { private WMFImageReaderSpi provider = new WMFImageReaderSpi(); protected List getTestData() { - return Arrays.asList( + return Collections.singletonList( // TODO: Dimensions does not look right... new TestData(getClassLoaderResource("/wmf/test.wmf"), new Dimension(841, 673)) ); @@ -69,7 +70,7 @@ public class WMFImageReaderTestCase extends ImageReaderAbstractTestCase getFormatNames() { - return Arrays.asList("wmf"); + return Collections.singletonList("wmf"); } protected List getSuffixes() { 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 8e1fb976..fcdce530 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 @@ -1,6 +1,6 @@ package com.twelvemonkeys.imageio.plugins.bmp; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Test; import org.mockito.InOrder; import org.w3c.dom.Node; @@ -35,7 +35,7 @@ import static org.mockito.Mockito.*; * @author last modified by $Author: haraldk$ * @version $Id: BMPImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ -public class BMPImageReaderTest extends ImageReaderAbstractTestCase { +public class BMPImageReaderTest extends ImageReaderAbstractTest { protected List getTestData() { return Arrays.asList( // BMP Suite "Good" 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 45a20c02..fe885d86 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 @@ -1,6 +1,6 @@ package com.twelvemonkeys.imageio.plugins.bmp; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Ignore; import org.junit.Test; @@ -10,6 +10,7 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.io.IOException; import java.util.Arrays; +import java.util.Collections; import java.util.List; import static org.junit.Assert.*; @@ -21,7 +22,7 @@ import static org.junit.Assert.*; * @author last modified by $Author: haraldk$ * @version $Id: CURImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ -public class CURImageReaderTest extends ImageReaderAbstractTestCase { +public class CURImageReaderTest extends ImageReaderAbstractTest { protected List getTestData() { return Arrays.asList( new TestData(getClassLoaderResource("/cur/hand.cur"), new Dimension(32, 32)), @@ -43,11 +44,11 @@ public class CURImageReaderTest extends ImageReaderAbstractTestCase getFormatNames() { - return Arrays.asList("cur"); + return Collections.singletonList("cur"); } protected List getSuffixes() { - return Arrays.asList("cur"); + return Collections.singletonList("cur"); } protected List getMIMETypes() { 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 858a26a5..b169abe2 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 @@ -1,6 +1,6 @@ package com.twelvemonkeys.imageio.plugins.bmp; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Ignore; import org.junit.Test; @@ -8,6 +8,7 @@ import javax.imageio.spi.ImageReaderSpi; import java.awt.*; import java.io.IOException; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -17,7 +18,7 @@ import java.util.List; * @author last modified by $Author: haraldk$ * @version $Id: ICOImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ -public class ICOImageReaderTest extends ImageReaderAbstractTestCase { +public class ICOImageReaderTest extends ImageReaderAbstractTest { protected List getTestData() { return Arrays.asList( new TestData( @@ -56,11 +57,11 @@ public class ICOImageReaderTest extends ImageReaderAbstractTestCase getFormatNames() { - return Arrays.asList("ico"); + return Collections.singletonList("ico"); } protected List getSuffixes() { - return Arrays.asList("ico"); + return Collections.singletonList("ico"); } protected List getMIMETypes() { diff --git a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java similarity index 98% rename from imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java index 7b1f2a14..a92f75c2 100644 --- a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java +++ b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTest.java @@ -57,13 +57,13 @@ import static org.junit.Assert.*; import static org.mockito.Mockito.*; /** - * ImageReaderAbstractTestCase + * ImageReaderAbstractTest * * @author Harald Kuhr * @author last modified by $Author: haraldk$ - * @version $Id: ImageReaderAbstractTestCase.java,v 1.0 Apr 1, 2008 10:36:46 PM haraldk Exp$ + * @version $Id: ImageReaderAbstractTest.java,v 1.0 Apr 1, 2008 10:36:46 PM haraldk Exp$ */ -public abstract class ImageReaderAbstractTestCase { +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... @@ -83,10 +83,7 @@ public abstract class ImageReaderAbstractTestCase { try { return getReaderClass().newInstance(); } - catch (InstantiationException e) { - throw new RuntimeException(e); - } - catch (IllegalAccessException e) { + catch (InstantiationException | IllegalAccessException e) { throw new RuntimeException(e); } } @@ -1002,7 +999,7 @@ public abstract class ImageReaderAbstractTestCase { /*aspectRatio =*/ reader.getAspectRatio(-1); //assertEquals("Wrong aspect ratio", data.getDimension().width / (float) data.getDimension().height, aspectRatio, 0f); } - catch (IndexOutOfBoundsException expected) { + catch (IndexOutOfBoundsException ignore) { } catch (IOException e) { fail("Could not read image aspect ratio" + e); @@ -1391,7 +1388,7 @@ public abstract class ImageReaderAbstractTestCase { reader.read(0, param); fail("Expected to throw exception with illegal type specifier"); } - catch (IIOException expected) { + catch (IIOException | IllegalArgumentException expected) { // TODO: This is thrown by ImageReader.getDestination. But are we happy with that? String message = expected.getMessage().toLowerCase(); if (!(message.contains("destination") && message.contains("type"))) { @@ -1399,23 +1396,16 @@ public abstract class ImageReaderAbstractTestCase { throw expected; } } - catch (IllegalArgumentException expected) { - String message = expected.getMessage().toLowerCase(); - if (!(message.contains("destination") && message.contains("type"))) { - // Allow this to bubble up, du to a bug in the Sun PNGImageReader - throw expected; - } - } } } private List createIllegalTypes(Iterator pValidTypes) { - List allTypes = new ArrayList(); + List allTypes = new ArrayList<>(); for (int i = BufferedImage.TYPE_INT_RGB; i < BufferedImage.TYPE_BYTE_INDEXED; i++) { allTypes.add(ImageTypeSpecifier.createFromBufferedImageType(i)); } - List illegalTypes = new ArrayList(allTypes); + List illegalTypes = new ArrayList<>(allTypes); while (pValidTypes.hasNext()) { ImageTypeSpecifier valid = pValidTypes.next(); boolean removed = illegalTypes.remove(valid); @@ -1454,6 +1444,7 @@ public abstract class ImageReaderAbstractTestCase { assertEquals(reader.getHeight(0) + point.y, image.getHeight()); } + @SuppressWarnings("ConstantConditions") @Test public void testSetDestinationOffsetNull() throws IOException { final ImageReader reader = createReader(); @@ -1629,12 +1620,12 @@ public abstract class ImageReaderAbstractTestCase { throw new IllegalArgumentException("input == null"); } - sizes = new ArrayList(); - images = new ArrayList(); + sizes = new ArrayList<>(); + images = new ArrayList<>(); List sizes = pSizes; if (sizes == null) { - sizes = new ArrayList(); + sizes = new ArrayList<>(); if (pImages != null) { for (BufferedImage image : pImages) { sizes.add(new Dimension(image.getWidth(), image.getHeight())); @@ -1690,6 +1681,7 @@ public abstract class ImageReaderAbstractTestCase { return sizes.get(pIndex); } + @SuppressWarnings("unused") public BufferedImage getImage(final int pIndex) { return images.get(pIndex); } 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 8dc95484..84131b60 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 @@ -28,7 +28,7 @@ package com.twelvemonkeys.imageio.plugins.icns; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Ignore; import org.junit.Test; @@ -37,6 +37,7 @@ import javax.imageio.spi.ImageReaderSpi; import java.awt.*; import java.io.IOException; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -46,7 +47,7 @@ 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 ImageReaderAbstractTestCase { +public class ICNSImageReaderTest extends ImageReaderAbstractTest { @Override protected List getTestData() { return Arrays.asList( @@ -119,17 +120,17 @@ public class ICNSImageReaderTest extends ImageReaderAbstractTestCase { @Override protected List getFormatNames() { - return Arrays.asList("icns"); + return Collections.singletonList("icns"); } @Override protected List getSuffixes() { - return Arrays.asList("icns"); + return Collections.singletonList("icns"); } @Override protected List getMIMETypes() { - return Arrays.asList("image/x-apple-icons"); + return Collections.singletonList("image/x-apple-icons"); } @Test 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 11d88b74..90783b11 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 @@ -28,7 +28,7 @@ package com.twelvemonkeys.imageio.plugins.iff; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Test; import javax.imageio.ImageIO; @@ -39,11 +39,10 @@ import java.awt.image.ColorModel; import java.awt.image.IndexColorModel; import java.io.IOException; import java.util.Arrays; +import java.util.Collections; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * IFFImageReaderTestCase @@ -52,7 +51,7 @@ import static org.junit.Assert.assertTrue; * @author last modified by $Author: haraldk$ * @version $Id: IFFImageReaderTestCase.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ -public class IFFImageReaderTest extends ImageReaderAbstractTestCase { +public class IFFImageReaderTest extends ImageReaderAbstractTest { protected List getTestData() { return Arrays.asList( // 32 bit - Ok @@ -93,7 +92,7 @@ public class IFFImageReaderTest extends ImageReaderAbstractTestCase getFormatNames() { - return Arrays.asList("iff"); + return Collections.singletonList("iff"); } protected List getSuffixes() { 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 97b0ff22..7b4c460b 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 @@ -28,7 +28,7 @@ package com.twelvemonkeys.imageio.plugins.jpeg; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.hamcrest.core.IsInstanceOf; import org.junit.Ignore; import org.junit.Test; @@ -73,7 +73,7 @@ import static org.mockito.Mockito.verify; * @author last modified by $Author: haraldk$ * @version $Id: JPEGImageReaderTest.java,v 1.0 24.01.11 22.04 haraldk Exp$ */ -public class JPEGImageReaderTest extends ImageReaderAbstractTestCase { +public class JPEGImageReaderTest extends ImageReaderAbstractTest { private static final JPEGImageReaderSpi SPI = new JPEGImageReaderSpi(lookupDelegateProvider()); diff --git a/imageio/imageio-pcx/src/test/java/com/twelvemonkeys/imageio/plugins/dcx/DCXImageReaderTest.java b/imageio/imageio-pcx/src/test/java/com/twelvemonkeys/imageio/plugins/dcx/DCXImageReaderTest.java index e5a9cc5b..51ef59f3 100755 --- a/imageio/imageio-pcx/src/test/java/com/twelvemonkeys/imageio/plugins/dcx/DCXImageReaderTest.java +++ b/imageio/imageio-pcx/src/test/java/com/twelvemonkeys/imageio/plugins/dcx/DCXImageReaderTest.java @@ -28,15 +28,13 @@ package com.twelvemonkeys.imageio.plugins.dcx; -import java.awt.*; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import javax.imageio.spi.ImageReaderSpi; - -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; -import org.junit.Test; +import java.awt.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; /** * DCXImageReaderTest @@ -45,10 +43,10 @@ import org.junit.Test; * @author last modified by $Author: haraldk$ * @version $Id: DCXImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$ */ -public class DCXImageReaderTest extends ImageReaderAbstractTestCase { +public class DCXImageReaderTest extends ImageReaderAbstractTest { @Override protected List getTestData() { - return Arrays.asList( + return Collections.singletonList( new TestData(getClassLoaderResource("/dcx/input.dcx"), new Dimension(70, 46)) // RLE encoded RGB (the only sample I've found) ); } @@ -75,7 +73,7 @@ public class DCXImageReaderTest extends ImageReaderAbstractTestCase getSuffixes() { - return Arrays.asList("dcx"); + return Collections.singletonList("dcx"); } @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 69d2cc86..078e6a05 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 @@ -28,13 +28,14 @@ package com.twelvemonkeys.imageio.plugins.pcx; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Test; import javax.imageio.spi.ImageReaderSpi; import java.awt.*; import java.io.IOException; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -44,7 +45,7 @@ import java.util.List; * @author last modified by $Author: haraldk$ * @version $Id: PCXImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$ */ -public class PCXImageReaderTest extends ImageReaderAbstractTestCase { +public class PCXImageReaderTest extends ImageReaderAbstractTest { @Override protected List getTestData() { return Arrays.asList( @@ -91,7 +92,7 @@ public class PCXImageReaderTest extends ImageReaderAbstractTestCase getSuffixes() { - return Arrays.asList("pcx"); + return Collections.singletonList("pcx"); } @Override 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 41efe9f5..9c46904c 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 @@ -2,7 +2,7 @@ package com.twelvemonkeys.imageio.plugins.pict; import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream; import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStreamSpi; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Test; import javax.imageio.spi.IIORegistry; @@ -11,6 +11,7 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.io.IOException; import java.util.Arrays; +import java.util.Collections; import java.util.List; import static org.junit.Assert.assertFalse; @@ -22,7 +23,7 @@ import static org.junit.Assert.assertFalse; * @author last modified by $Author: haraldk$ * @version $Id: ICOImageReaderTestCase.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ -public class PICTImageReaderTest extends ImageReaderAbstractTestCase { +public class PICTImageReaderTest extends ImageReaderAbstractTest { static { IIORegistry.getDefaultInstance().registerServiceProvider(new ByteArrayImageInputStreamSpi()); @@ -71,7 +72,7 @@ public class PICTImageReaderTest extends ImageReaderAbstractTestCase getFormatNames() { - return Arrays.asList("pict"); + return Collections.singletonList("pict"); } protected List getSuffixes() { diff --git a/imageio/imageio-pnm/src/test/java/com/twelvemonkeys/imageio/plugins/pnm/PNMImageReaderTest.java b/imageio/imageio-pnm/src/test/java/com/twelvemonkeys/imageio/plugins/pnm/PNMImageReaderTest.java index 2efceaa6..c8a3dde1 100755 --- a/imageio/imageio-pnm/src/test/java/com/twelvemonkeys/imageio/plugins/pnm/PNMImageReaderTest.java +++ b/imageio/imageio-pnm/src/test/java/com/twelvemonkeys/imageio/plugins/pnm/PNMImageReaderTest.java @@ -28,7 +28,7 @@ package com.twelvemonkeys.imageio.plugins.pnm; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Test; import javax.imageio.ImageReader; @@ -39,9 +39,10 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; -public class PNMImageReaderTest extends ImageReaderAbstractTestCase{ +public class PNMImageReaderTest extends ImageReaderAbstractTest { @Override protected List getTestData() { return Arrays.asList( new TestData(getClassLoaderResource("/ppm/lena.ppm"), new Dimension(128, 128)), // P6 (PPM RAW) diff --git a/imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java b/imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTest.java similarity index 96% rename from imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java rename to imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTest.java index a5808c20..cc3235f5 100755 --- a/imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java +++ b/imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTest.java @@ -28,32 +28,30 @@ package com.twelvemonkeys.imageio.plugins.psd; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import com.twelvemonkeys.imageio.util.ProgressListenerBase; import org.junit.Test; import javax.imageio.ImageReadParam; +import javax.imageio.ImageReader; import javax.imageio.ImageTypeSpecifier; import javax.imageio.spi.ImageReaderSpi; -import javax.imageio.ImageReader; import java.awt.*; import java.awt.image.BufferedImage; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.ArrayList; import java.io.IOException; +import java.util.*; +import java.util.List; import static org.junit.Assert.*; /** - * PSDImageReaderTestCase + * PSDImageReaderTest * * @author Harald Kuhr * @author last modified by $Author: haraldk$ - * @version $Id: PSDImageReaderTestCase.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ + * @version $Id: PSDImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ -public class PSDImageReaderTestCase extends ImageReaderAbstractTestCase { +public class PSDImageReaderTest extends ImageReaderAbstractTest { private static final ImageReaderSpi provider = new PSDImageReaderSpi(); @@ -110,11 +108,11 @@ public class PSDImageReaderTestCase extends ImageReaderAbstractTestCase getFormatNames() { - return Arrays.asList("psd"); + return Collections.singletonList("psd"); } protected List getSuffixes() { - return Arrays.asList("psd"); + return Collections.singletonList("psd"); } protected List getMIMETypes() { @@ -243,7 +241,7 @@ public class PSDImageReaderTestCase extends ImageReaderAbstractTestCase sequnce = new ArrayList(); + final List sequnce = new ArrayList<>(); imageReader.addIIOReadProgressListener(new ProgressListenerBase() { private float mLastPercentageDone = 0; diff --git a/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTestCase.java b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java similarity index 68% rename from imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTestCase.java rename to imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java index 69da521b..be36f205 100644 --- a/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTestCase.java +++ b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java @@ -1,34 +1,47 @@ package com.twelvemonkeys.imageio.reference; -import com.sun.imageio.plugins.jpeg.JPEGImageReader; -import com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import com.twelvemonkeys.lang.SystemUtil; import org.junit.Ignore; import org.junit.Test; import javax.imageio.IIOException; +import javax.imageio.ImageReader; import javax.imageio.spi.ImageReaderSpi; import java.awt.*; import java.io.IOException; import java.util.Arrays; +import java.util.Collections; import java.util.List; +import static org.junit.Assume.assumeNoException; + /** - * JPEGImageReaderTestCase + * JPEGImageReaderTest * * @author Harald Kuhr * @author last modified by $Author: haraldk$ - * @version $Id: JPEGImageReaderTestCase.java,v 1.0 Oct 9, 2009 3:37:25 PM haraldk Exp$ + * @version $Id: JPEGImageReaderTest.java,v 1.0 Oct 9, 2009 3:37:25 PM haraldk Exp$ */ -public class JPEGImageReaderTestCase extends ImageReaderAbstractTestCase { +public class JPEGImageReaderTest extends ImageReaderAbstractTest { private static final boolean IS_JAVA_6 = SystemUtil.isClassAvailable("java.util.Deque"); - protected JPEGImageReaderSpi provider = new JPEGImageReaderSpi(); + protected final ImageReaderSpi provider = lookupSpi(); + + private ImageReaderSpi lookupSpi() { + try { + return (ImageReaderSpi) Class.forName("com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi").newInstance(); + } + catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) { + assumeNoException(e); + } + + return null; + } @Override protected List getTestData() { - return Arrays.asList( + return Collections.singletonList( new TestData(getClassLoaderResource("/jpeg/R-7439-1151526181.jpeg"), new Dimension(386, 396)) ); } @@ -39,14 +52,21 @@ public class JPEGImageReaderTestCase extends ImageReaderAbstractTestCase getReaderClass() { - return JPEGImageReader.class; + protected Class getReaderClass() { + try { + return Class.forName("com.sun.imageio.plugins.jpeg.JPEGImageReader"); + } + catch (ClassNotFoundException e) { + assumeNoException(e); + } + + return null; } @Override - protected JPEGImageReader createReader() { + protected ImageReader createReader() { try { - return (JPEGImageReader) provider.createReaderInstance(); + return provider.createReaderInstance(); } catch (IOException e) { throw new RuntimeException(e); diff --git a/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTestCase.java b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTest.java similarity index 56% rename from imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTestCase.java rename to imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTest.java index 8b1a7269..4bbf5522 100644 --- a/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTestCase.java +++ b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTest.java @@ -1,30 +1,43 @@ package com.twelvemonkeys.imageio.reference; -import com.sun.imageio.plugins.png.PNGImageReader; -import com.sun.imageio.plugins.png.PNGImageReaderSpi; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Test; import javax.imageio.IIOException; +import javax.imageio.ImageReader; import javax.imageio.spi.ImageReaderSpi; import java.awt.*; import java.io.IOException; import java.util.Arrays; +import java.util.Collections; import java.util.List; +import static org.junit.Assume.assumeNoException; + /** - * PNGImageReaderTestCase + * PNGImageReaderTest * * @author Harald Kuhr * @author last modified by $Author: haraldk$ - * @version $Id: PNGImageReaderTestCase.java,v 1.0 Oct 9, 2009 3:37:25 PM haraldk Exp$ + * @version $Id: PNGImageReaderTest.java,v 1.0 Oct 9, 2009 3:37:25 PM haraldk Exp$ */ -public class PNGImageReaderTestCase extends ImageReaderAbstractTestCase { - protected PNGImageReaderSpi provider = new PNGImageReaderSpi(); +public class PNGImageReaderTest extends ImageReaderAbstractTest { + protected final ImageReaderSpi provider = lookupSpi(); + + private ImageReaderSpi lookupSpi() { + try { + return (ImageReaderSpi) Class.forName("com.sun.imageio.plugins.png.PNGImageReaderSpi").newInstance(); + } + catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) { + assumeNoException(e); + } + + return null; + } @Override protected List getTestData() { - return Arrays.asList( + return Collections.singletonList( new TestData(getClassLoaderResource("/png/12monkeys-splash.png"), new Dimension(300, 410)) ); } @@ -35,14 +48,21 @@ public class PNGImageReaderTestCase extends ImageReaderAbstractTestCase getReaderClass() { - return PNGImageReader.class; + protected Class getReaderClass() { + try { + return Class.forName("com.sun.imageio.plugins.png.PNGImageReader"); + } + catch (ClassNotFoundException e) { + assumeNoException(e); + } + + return null; } @Override - protected PNGImageReader createReader() { + protected ImageReader createReader() { try { - return (PNGImageReader) provider.createReaderInstance(); + return provider.createReaderInstance(); } catch (IOException e) { throw new RuntimeException(e); 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 209d8efd..8d6d8112 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 @@ -28,11 +28,12 @@ package com.twelvemonkeys.imageio.plugins.sgi; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import javax.imageio.spi.ImageReaderSpi; import java.awt.*; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -42,10 +43,10 @@ import java.util.List; * @author last modified by $Author: haraldk$ * @version $Id: SGIImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$ */ -public class SGIImageReaderTest extends ImageReaderAbstractTestCase { +public class SGIImageReaderTest extends ImageReaderAbstractTest { @Override protected List getTestData() { - return Arrays.asList( + return Collections.singletonList( new TestData(getClassLoaderResource("/sgi/MARBLES.SGI"), new Dimension(1419, 1001)) // RLE encoded RGB ); } @@ -72,9 +73,7 @@ public class SGIImageReaderTest extends ImageReaderAbstractTestCase getSuffixes() { - return Arrays.asList( - "sgi" - ); + return Collections.singletonList("sgi"); } @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 59a85d49..601df0a9 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 @@ -28,7 +28,7 @@ package com.twelvemonkeys.imageio.plugins.tga; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import javax.imageio.spi.ImageReaderSpi; import java.awt.*; @@ -42,7 +42,7 @@ import java.util.List; * @author last modified by $Author: haraldk$ * @version $Id: TGAImageReaderTest.java,v 1.0 03.07.14 22:28 haraldk Exp$ */ -public class TGAImageReaderTest extends ImageReaderAbstractTestCase { +public class TGAImageReaderTest extends ImageReaderAbstractTest { @Override protected List getTestData() { return Arrays.asList( diff --git a/imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTestCase.java b/imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTest.java similarity index 90% rename from imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTestCase.java rename to imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTest.java index ee1e7440..8b6ad255 100644 --- a/imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTestCase.java +++ b/imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTest.java @@ -29,7 +29,7 @@ package com.twelvemonkeys.imageio.plugins.thumbsdb; import com.twelvemonkeys.imageio.stream.BufferedImageInputStream; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import com.twelvemonkeys.io.ole2.CompoundDocument; import com.twelvemonkeys.io.ole2.Entry; import com.twelvemonkeys.lang.SystemUtil; @@ -43,16 +43,19 @@ import java.awt.*; import java.io.IOException; import java.nio.ByteOrder; import java.util.Arrays; +import java.util.Collections; import java.util.List; +import static org.junit.Assert.assertNotNull; + /** - * ICOImageReaderTestCase + * ICOImageReaderTest * * @author Harald Kuhr * @author last modified by $Author: haraldk$ - * @version $Id: ICOImageReaderTestCase.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ + * @version $Id: ICOImageReaderTest.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$ */ -public class ThumbsDBImageReaderTestCase extends ImageReaderAbstractTestCase { +public class ThumbsDBImageReaderTest extends ImageReaderAbstractTest { private static final boolean IS_JAVA_6 = SystemUtil.isClassAvailable("java.util.Deque"); private ThumbsDBImageReaderSpi provider = new ThumbsDBImageReaderSpi(); @@ -97,15 +100,15 @@ public class ThumbsDBImageReaderTestCase extends ImageReaderAbstractTestCase getFormatNames() { - return Arrays.asList("thumbs"); + return Collections.singletonList("thumbs"); } protected List getSuffixes() { - return Arrays.asList("db"); + return Collections.singletonList("db"); } protected List getMIMETypes() { - return Arrays.asList("image/x-thumbs-db"); + return Collections.singletonList("image/x-thumbs-db"); } @Test @@ -115,7 +118,9 @@ public class ThumbsDBImageReaderTestCase extends ImageReaderAbstractTestCase { +public class TIFFImageReaderTest extends ImageReaderAbstractTest { private static final TIFFImageReaderSpi SPI = new TIFFImageReaderSpi(); @@ -108,7 +109,7 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTestCase getMIMETypes() { - return Arrays.asList("image/tiff"); + return Collections.singletonList("image/tiff"); }