Test cases for writers + renamed reader test cases to follow naming convention.

imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java

@@ -35,6 +35,7 @@ import javax.imageio.ImageIO;
 import javax.imageio.ImageWriteParam;
 import javax.imageio.ImageWriter;
 import javax.imageio.event.IIOWriteProgressListener;
+import javax.imageio.stream.ImageOutputStream;
 import java.awt.image.RenderedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -76,7 +77,8 @@ public abstract class ImageWriterAbstractTestCase {
     public void testWrite() throws IOException {
         ImageWriter writer = createImageWriter();
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        writer.setOutput(ImageIO.createImageOutputStream(buffer));
+        ImageOutputStream stream = ImageIO.createImageOutputStream(buffer);
+        writer.setOutput(stream);
 
         try {
             writer.write(getTestData());
@@ -84,24 +86,8 @@ public abstract class ImageWriterAbstractTestCase {
         catch (IOException e) {
             fail(e.getMessage());
         }
-
+        finally {
-        assertTrue("No image data written", buffer.size() > 0);
+            stream.close(); // Force data to be written
-    }
-
-    @Test
-    public void testWrite2() {
-        // Note: There's a difference between new ImageOutputStreamImpl and
-        // ImageIO.createImageOutputStream... Make sure writers handle both
-        // cases
-        ImageWriter writer = createImageWriter();
-        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-
-        try {
-            writer.setOutput(ImageIO.createImageOutputStream(buffer));
-            writer.write(getTestData());
-        }
-        catch (IOException e) {
-            fail(e.getMessage());
         }
 
         assertTrue("No image data written", buffer.size() > 0);
@@ -125,15 +111,13 @@ public abstract class ImageWriterAbstractTestCase {
         assertTrue("Image data written", buffer.size() == 0);
     }
 
-    @Test
+    @Test(expected = IllegalStateException.class)
     public void testWriteNoOutput() {
         ImageWriter writer = createImageWriter();
 
         try {
             writer.write(getTestData());
         }
-        catch (IllegalStateException ignore) {
-        }
         catch (IOException e) {
             fail(e.getMessage());
         }

imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTest.java

@@ -42,7 +42,7 @@ import java.util.List;
  * @author last modified by $Author: haraldk$
  * @version $Id: IFFImageReaderTestCase.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$
  */
-public class IFFImageReaderTestCase extends ImageReaderAbstractTestCase<IFFImageReader> {
+public class IFFImageReaderTest extends ImageReaderAbstractTestCase<IFFImageReader> {
     // TODO: Need test for IFF PBM
     protected List<TestData> getTestData() {
         return Arrays.asList(

imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriterTest.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2012, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.iff;
+
+import com.twelvemonkeys.imageio.util.ImageWriterAbstractTestCase;
+
+import javax.imageio.ImageWriter;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+
+/**
+ * JPEG2000ImageWriterTest
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: JPEG2000ImageWriterTest.java,v 1.0 20.01.12 12:19 haraldk Exp$
+ */
+public class IFFImageWriterTest extends ImageWriterAbstractTestCase {
+    private final IFFImageWriterSpi provider = new IFFImageWriterSpi();
+
+    @Override
+    protected ImageWriter createImageWriter() {
+        return new IFFImageWriter(provider);
+    }
+
+    @Override
+    protected RenderedImage getTestData() {
+        return new BufferedImage(100, 100, BufferedImage.TYPE_INT_ARGB);
+    }
+}

imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java

@@ -112,7 +112,7 @@ public class PICTImageWriter extends ImageWriterBase {
         super(pProvider);
     }
 
-    private void writePICTHeader(RenderedImage pImage) throws IOException {
+    private void writePICTHeader(final RenderedImage pImage) throws IOException {
         // TODO: Make 512 byte header optional
         // Write empty 512-byte header
         byte[] buf = new byte[PICT.PICT_NULL_HEADER_SIZE];
@@ -337,6 +337,8 @@ public class PICTImageWriter extends ImageWriterBase {
 
                 scanWidthLeft = w;
             }
+            
+            processImageProgress((100f * i) / h);
         }
     }
 
@@ -350,10 +352,11 @@ public class PICTImageWriter extends ImageWriterBase {
         if ((length & 1) > 0) {
             imageOutput.writeByte(0);
         }
+
         imageOutput.writeShort(PICT.OP_END_OF_PICTURE);
     }
 
-    public void write(IIOMetadata pStreamMetadata, IIOImage pImage, ImageWriteParam pParam) throws IOException {
+    public void write(final IIOMetadata pStreamMetadata, final IIOImage pImage, final ImageWriteParam pParam) throws IOException {
         assertOutput();
 
         if (pImage.hasRaster()) {
@@ -369,14 +372,18 @@ public class PICTImageWriter extends ImageWriterBase {
         Raster raster = image instanceof BufferedImage ? ((BufferedImage) image).getRaster() : image.getData();
         DataBuffer buf = raster.getDataBuffer();
         if (buf instanceof DataBufferByte) {
-            writePICTData(0, 0, image.getWidth(), image.getHeight(),
+            writePICTData(
+                    0, 0, image.getWidth(), image.getHeight(),
                     image.getColorModel(), ((DataBufferByte) buf).getData(),
-                    0, image.getWidth());
+                    0, image.getWidth()
+            );
         }
         else if (buf instanceof DataBufferInt) {
-            writePICTData(0, 0, image.getWidth(), image.getHeight(),
+            writePICTData(
+                    0, 0, image.getWidth(), image.getHeight(),
                     image.getColorModel(), ((DataBufferInt) buf).getData(),
-                    0, image.getWidth());
+                    0, image.getWidth()
+            );
         }
         else {
             throw new IIOException("DataBuffer type " + buf.getDataType() + " not supported");

imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTest.java

@@ -18,7 +18,7 @@ import static org.junit.Assert.*;
  * @author last modified by $Author: haraldk$
  * @version $Id: ICOImageReaderTestCase.java,v 1.0 Apr 1, 2008 10:39:17 PM haraldk Exp$
  */
-public class PICTImageReaderTestCase extends ImageReaderAbstractTestCase<PICTImageReader> {
+public class PICTImageReaderTest extends ImageReaderAbstractTestCase<PICTImageReader> {
 
     static ImageReaderSpi sProvider = new PICTImageReaderSpi();
 

imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterTest.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2012, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name "TwelveMonkeys" nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.plugins.pict;
+
+import com.twelvemonkeys.imageio.util.ImageWriterAbstractTestCase;
+
+import javax.imageio.ImageWriter;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+
+/**
+ * PICTImageWriterTest
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: PICTImageWriterTest.java,v 1.0 20.01.12 12:26 haraldk Exp$
+ */
+public class PICTImageWriterTest extends ImageWriterAbstractTestCase {
+    private final PICTImageWriterSpi provider = new PICTImageWriterSpi();
+
+    @Override
+    protected ImageWriter createImageWriter() {
+        return new PICTImageWriter(provider);
+    }
+
+    @Override
+    protected RenderedImage getTestData() {
+        // TODO: Alpha support
+        return new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB);
+    }
+}