TMI-64: Test case clean-up

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 <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @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<SVGImageReader> {
+public class SVGImageReaderTest extends ImageReaderAbstractTest<SVGImageReader> {
     private SVGImageReaderSpi provider = new SVGImageReaderSpi();
 
     protected List<TestData> getTestData() {
@@ -76,15 +77,15 @@ public class SVGImageReaderTestCase extends ImageReaderAbstractTestCase<SVGImage
     }
 
     protected List<String> getFormatNames() {
-        return Arrays.asList("svg");
+        return Collections.singletonList("svg");
     }
 
     protected List<String> getSuffixes() {
-        return Arrays.asList("svg");
+        return Collections.singletonList("svg");
     }
 
     protected List<String> getMIMETypes() {
-        return Arrays.asList("image/svg+xml");
+        return Collections.singletonList("image/svg+xml");
     }
 
     @Test

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 <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @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<WMFImageReader> {
+public class WMFImageReaderTest extends ImageReaderAbstractTest<WMFImageReader> {
     private WMFImageReaderSpi provider = new WMFImageReaderSpi();
 
     protected List<TestData> 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<WMFImage
     }
 
     protected List<String> getFormatNames() {
-        return Arrays.asList("wmf");
+        return Collections.singletonList("wmf");
     }
 
     protected List<String> getSuffixes() {

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<BMPImageReader> {
+public class BMPImageReaderTest extends ImageReaderAbstractTest<BMPImageReader> {
     protected List<TestData> getTestData() {
         return Arrays.asList(
                 // BMP Suite "Good"

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<CURImageReader> {
+public class CURImageReaderTest extends ImageReaderAbstractTest<CURImageReader> {
     protected List<TestData> getTestData() {
         return Arrays.asList(
                 new TestData(getClassLoaderResource("/cur/hand.cur"), new Dimension(32, 32)),
@@ -43,11 +44,11 @@ public class CURImageReaderTest extends ImageReaderAbstractTestCase<CURImageRead
     }
 
     protected List<String> getFormatNames() {
-        return Arrays.asList("cur");
+        return Collections.singletonList("cur");
     }
 
     protected List<String> getSuffixes() {
-        return Arrays.asList("cur");
+        return Collections.singletonList("cur");
     }
 
     protected List<String> getMIMETypes() {

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<ICOImageReader> {
+public class ICOImageReaderTest extends ImageReaderAbstractTest<ICOImageReader> {
     protected List<TestData> getTestData() {
         return Arrays.asList(
                 new TestData(
@@ -56,11 +57,11 @@ public class ICOImageReaderTest extends ImageReaderAbstractTestCase<ICOImageRead
     }
 
     protected List<String> getFormatNames() {
-        return Arrays.asList("ico");
+        return Collections.singletonList("ico");
     }
 
     protected List<String> getSuffixes() {
-        return Arrays.asList("ico");
+        return Collections.singletonList("ico");
     }
 
     protected List<String> getMIMETypes() {

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 <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @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<T extends ImageReader> {
+public abstract class ImageReaderAbstractTest<T extends ImageReader> {
     // 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<T extends ImageReader> {
         try {
             return getReaderClass().newInstance();
         }
-        catch (InstantiationException e) {
+        catch (InstantiationException | IllegalAccessException e) {
-            throw new RuntimeException(e);
-        }
-        catch (IllegalAccessException e) {
             throw new RuntimeException(e);
         }
     }
@@ -1002,7 +999,7 @@ public abstract class ImageReaderAbstractTestCase<T extends ImageReader> {
             /*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<T extends ImageReader> {
                 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<T extends ImageReader> {
                     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<ImageTypeSpecifier> createIllegalTypes(Iterator<ImageTypeSpecifier> pValidTypes) {
-        List<ImageTypeSpecifier> allTypes = new ArrayList<ImageTypeSpecifier>();
+        List<ImageTypeSpecifier> allTypes = new ArrayList<>();
         for (int i = BufferedImage.TYPE_INT_RGB; i < BufferedImage.TYPE_BYTE_INDEXED; i++) {
             allTypes.add(ImageTypeSpecifier.createFromBufferedImageType(i));
         }
 
-        List<ImageTypeSpecifier> illegalTypes = new ArrayList<ImageTypeSpecifier>(allTypes);
+        List<ImageTypeSpecifier> illegalTypes = new ArrayList<>(allTypes);
         while (pValidTypes.hasNext()) {
             ImageTypeSpecifier valid = pValidTypes.next();
             boolean removed = illegalTypes.remove(valid);
@@ -1454,6 +1444,7 @@ public abstract class ImageReaderAbstractTestCase<T extends ImageReader> {
         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<T extends ImageReader> {
                 throw new IllegalArgumentException("input == null");
             }
 
-            sizes = new ArrayList<Dimension>();
+            sizes = new ArrayList<>();
-            images = new ArrayList<BufferedImage>();
+            images = new ArrayList<>();
 
             List<Dimension> sizes = pSizes;
             if (sizes == null) {
-                sizes = new ArrayList<Dimension>();
+                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<T extends ImageReader> {
             return sizes.get(pIndex);
         }
 
+        @SuppressWarnings("unused")
         public BufferedImage getImage(final int pIndex) {
             return images.get(pIndex);
         }

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<TestData> getTestData() {
         return Arrays.asList(
@@ -119,17 +120,17 @@ public class ICNSImageReaderTest extends ImageReaderAbstractTestCase {
 
     @Override
     protected List<String> getFormatNames() {
-        return Arrays.asList("icns");
+        return Collections.singletonList("icns");
     }
 
     @Override
     protected List<String> getSuffixes() {
-        return Arrays.asList("icns");
+        return Collections.singletonList("icns");
     }
 
     @Override
     protected List<String> getMIMETypes() {
-        return Arrays.asList("image/x-apple-icons");
+        return Collections.singletonList("image/x-apple-icons");
     }
 
     @Test

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.*;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * 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<IFFImageReader> {
+public class IFFImageReaderTest extends ImageReaderAbstractTest<IFFImageReader> {
     protected List<TestData> getTestData() {
         return Arrays.asList(
                 // 32 bit - Ok
@@ -93,7 +92,7 @@ public class IFFImageReaderTest extends ImageReaderAbstractTestCase<IFFImageRead
     }
 
     protected List<String> getFormatNames() {
-        return Arrays.asList("iff");
+        return Collections.singletonList("iff");
     }
 
     protected List<String> getSuffixes() {

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<JPEGImageReader> {
+public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader> {
 
     private static final JPEGImageReaderSpi SPI = new JPEGImageReaderSpi(lookupDelegateProvider());
 

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 com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
 
 import javax.imageio.spi.ImageReaderSpi;
-
+import java.awt.*;
-import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase;
+import java.util.Arrays;
-import org.junit.Test;
+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<DCXImageReader> {
+public class DCXImageReaderTest extends ImageReaderAbstractTest<DCXImageReader> {
     @Override
     protected List<TestData> 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<DCXImageRead
 
     @Override
     protected List<String> getSuffixes() {
-        return Arrays.asList("dcx");
+        return Collections.singletonList("dcx");
     }
 
     @Override

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<PCXImageReader> {
+public class PCXImageReaderTest extends ImageReaderAbstractTest<PCXImageReader> {
     @Override
     protected List<TestData> getTestData() {
         return Arrays.asList(
@@ -91,7 +92,7 @@ public class PCXImageReaderTest extends ImageReaderAbstractTestCase<PCXImageRead
 
     @Override
     protected List<String> getSuffixes() {
-        return Arrays.asList("pcx");
+        return Collections.singletonList("pcx");
     }
 
     @Override

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<PICTImageReader> {
+public class PICTImageReaderTest extends ImageReaderAbstractTest<PICTImageReader> {
 
     static {
         IIORegistry.getDefaultInstance().registerServiceProvider(new ByteArrayImageInputStreamSpi());
@@ -71,7 +72,7 @@ public class PICTImageReaderTest extends ImageReaderAbstractTestCase<PICTImageRe
     }
 
     protected List<String> getFormatNames() {
-        return Arrays.asList("pict");
+        return Collections.singletonList("pict");
     }
 
     protected List<String> getSuffixes() {

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<PNMImageReader>{
+public class PNMImageReaderTest extends ImageReaderAbstractTest<PNMImageReader> {
     @Override protected List<TestData> getTestData() {
         return Arrays.asList(
                 new TestData(getClassLoaderResource("/ppm/lena.ppm"), new Dimension(128, 128)),     // P6 (PPM RAW)

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 <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @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<PSDImageReader> {
+public class PSDImageReaderTest extends ImageReaderAbstractTest<PSDImageReader> {
 
     private static final ImageReaderSpi provider = new PSDImageReaderSpi();
 
@@ -110,11 +108,11 @@ public class PSDImageReaderTestCase extends ImageReaderAbstractTestCase<PSDImage
     }
 
     protected List<String> getFormatNames() {
-        return Arrays.asList("psd");
+        return Collections.singletonList("psd");
     }
 
     protected List<String> getSuffixes() {
-        return Arrays.asList("psd");
+        return Collections.singletonList("psd");
     }
 
     protected List<String> getMIMETypes() {
@@ -243,7 +241,7 @@ public class PSDImageReaderTestCase extends ImageReaderAbstractTestCase<PSDImage
 
         imageReader.setInput(getTestData().get(0).getInputStream());
 
-        final List<Object> sequnce = new ArrayList<Object>();
+        final List<Object> sequnce = new ArrayList<>();
         imageReader.addIIOReadProgressListener(new ProgressListenerBase() {
             private float mLastPercentageDone = 0;
 

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.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
-import com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi;
-import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase;
 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 <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @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<JPEGImageReader> {
+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<TestData> 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<JPEGIma
     }
 
     @Override
-    protected Class<JPEGImageReader> getReaderClass() {
+    protected Class getReaderClass() {
-        return JPEGImageReader.class;
+        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);

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.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
-import com.sun.imageio.plugins.png.PNGImageReaderSpi;
-import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase;
 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 <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @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<PNGImageReader> {
+public class PNGImageReaderTest extends ImageReaderAbstractTest {
-    protected PNGImageReaderSpi provider = new PNGImageReaderSpi();
+    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<TestData> 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<PNGImage
     }
 
     @Override
-    protected Class<PNGImageReader> getReaderClass() {
+    protected Class getReaderClass() {
-        return PNGImageReader.class;
+        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);

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<SGIImageReader> {
+public class SGIImageReaderTest extends ImageReaderAbstractTest<SGIImageReader> {
     @Override
     protected List<TestData> 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<SGIImageRead
 
     @Override
     protected List<String> getSuffixes() {
-        return Arrays.asList(
+        return Collections.singletonList("sgi");
-                "sgi"
-        );
     }
 
     @Override

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<TGAImageReader> {
+public class TGAImageReaderTest extends ImageReaderAbstractTest<TGAImageReader> {
     @Override
     protected List<TestData> getTestData() {
         return Arrays.asList(

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 <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
  * @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<ThumbsDBImageReader> {
+public class ThumbsDBImageReaderTest extends ImageReaderAbstractTest<ThumbsDBImageReader> {
     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<Thu
     }
 
     protected List<String> getFormatNames() {
-        return Arrays.asList("thumbs");
+        return Collections.singletonList("thumbs");
     }
 
     protected List<String> getSuffixes() {
-        return Arrays.asList("db");
+        return Collections.singletonList("db");
     }
 
     protected List<String> 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<Thu
         Entry root = new CompoundDocument(input).getRootEntry();
         
         Entry child = root.getChildEntry("Catalog");
-        child.getInputStream();
+
+        assertNotNull(child);
+        assertNotNull(child.getInputStream());
     }
 
     @Test

imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java

@@ -26,7 +26,7 @@ package com.twelvemonkeys.imageio.plugins.tiff;/*
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase;
+import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
 import org.junit.Test;
 
 import javax.imageio.ImageReadParam;
@@ -37,6 +37,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.assertEquals;
@@ -52,7 +53,7 @@ import static org.mockito.Mockito.*;
  * @author last modified by $Author: haraldk$
  * @version $Id: TIFFImageReaderTest.java,v 1.0 08.05.12 15:25 haraldk Exp$
  */
-public class TIFFImageReaderTest extends ImageReaderAbstractTestCase<TIFFImageReader> {
+public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader> {
 
     private static final TIFFImageReaderSpi SPI = new TIFFImageReaderSpi();
 
@@ -108,7 +109,7 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTestCase<TIFFImageRe
 
     @Override
     protected List<String> getMIMETypes() {
-        return Arrays.asList("image/tiff");
+        return Collections.singletonList("image/tiff");
     }