svn commit: r1648114 - in /commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging: ./ color/ common/ common/bytesource/ formats/bmp/ formats/dcx/ formats/gif/ formats/icns/ formats/ico/ formats/jpeg/ formats/jpeg/decoder/ formats/jpeg/ex...

[britter]

Author: britter
Date: Sat Dec 27 21:19:43 2014
New Revision: 1648114

URL: http://svn.apache.org/r1648114
Log:
Use annotation based testing

Modified:
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/DctTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/palette/PaletteQuantizationTest.java
    
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,9 +17,14 @@
 
 package org.apache.commons.imaging;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 
 import org.apache.commons.io.FilenameUtils;
+import org.junit.Test;
 
 public class ImagingGuessFormatTest extends ImagingTest {
 
@@ -36,6 +41,7 @@ public class ImagingGuessFormatTest exte
     public static final String PPM_IMAGE_FILE = "pbm\\1\\Oregon Scientific 
DS6639 - DSC_0307 - small.ppm";
     public static final String TGA_IMAGE_FILE = "tga\\1\\Oregon Scientific 
DS6639 - DSC_0307 - small.tga";
 
+    @Test
     public void testGuess_all() throws Exception {
         testGuess(ImageFormats.PNG, PNG_IMAGE_FILE);
         testGuess(ImageFormats.GIF, GIF_IMAGE_FILE);
@@ -58,6 +64,7 @@ public class ImagingGuessFormatTest exte
 
     public static final String UNKNOWN_IMAGE_FILE = "info.txt";
 
+    @Test
     public void testGuess_unknown() throws Exception {
         testGuess(ImageFormats.UNKNOWN, UNKNOWN_IMAGE_FILE);
     }

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,16 +17,17 @@
 
 package org.apache.commons.imaging;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
 import org.apache.commons.imaging.test.util.FileSystemTraversal;
 import org.apache.commons.imaging.util.Debug;
 
-public abstract class ImagingTest extends TestCase implements
+public abstract class ImagingTest implements
         ImagingTestConstants, ImagingConstants {
 
     protected File createTempDirectory() throws IOException {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java
 Sat Dec 27 21:19:43 2014
@@ -16,14 +16,17 @@
  */
 package org.apache.commons.imaging.color;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
-public class ColorConversionsTest extends TestCase {
+public class ColorConversionsTest {
     private static final int SAMPLE_RGBS[] = { 0xffffffff, 0xff000000,
             0xffff0000, 0xff00ff00, 0xff0000ff, 0xffff00ff, 0xfff0ff00,
             0xff00ffff, 0x00000000, 0xff7f7f7f, };
 
+    @Test
     public void testRGBtoCMYK() throws Exception {
         for (final int rgb : SAMPLE_RGBS) {
             final ColorCmy cmy = ColorConversions.convertRGBtoCMY(rgb);
@@ -40,6 +43,7 @@ public class ColorConversionsTest extend
         }
     }
 
+    @Test
     public void testRGBtoHSL() throws Exception {
         for (final int rgb : SAMPLE_RGBS) {
             final ColorHsl hsl = ColorConversions.convertRGBtoHSL(rgb);
@@ -52,6 +56,7 @@ public class ColorConversionsTest extend
         }
     }
 
+    @Test
     public void testRGBtoHSV() throws Exception {
         for (final int rgb : SAMPLE_RGBS) {
             final ColorHsv hsv = ColorConversions.convertRGBtoHSV(rgb);
@@ -64,6 +69,7 @@ public class ColorConversionsTest extend
         }
     }
 
+    @Test
     public void testXYZ() throws Exception {
         for (final int rgb : SAMPLE_RGBS) {
             final ColorXyz xyz = ColorConversions.convertRGBtoXYZ(rgb);

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java
 Sat Dec 27 21:19:43 2014
@@ -15,11 +15,16 @@
 
 package org.apache.commons.imaging.common;
 
+import static org.junit.Assert.assertEquals;
+
 import java.nio.ByteOrder;
 
 import org.apache.commons.imaging.ImagingTest;
+import org.junit.Test;
 
 public class BinaryFileFunctionsTest extends ImagingTest {
+
+    @Test
     public void testFloatToByteConversion() {
         final byte[] bytesLE = ByteConversions.toBytes(1.0f, 
ByteOrder.LITTLE_ENDIAN);
         assertEquals(ByteConversions.toFloat(bytesLE, 
ByteOrder.LITTLE_ENDIAN), 1.0f, 0f);
@@ -28,6 +33,7 @@ public class BinaryFileFunctionsTest ext
         assertEquals(ByteConversions.toFloat(bytesBE, ByteOrder.BIG_ENDIAN), 
1.0f, 0f);
     }
 
+    @Test
     public void testDoubleToByteConversion() {
         final byte[] bytesLE = ByteConversions.toBytes(1.0, 
ByteOrder.LITTLE_ENDIAN);
         assertEquals(ByteConversions.toDouble(bytesLE, 
ByteOrder.LITTLE_ENDIAN), 1.0, 0);

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
 Sat Dec 27 21:19:43 2014
@@ -22,9 +22,11 @@ import java.text.NumberFormat;
 
 import org.apache.commons.imaging.ImagingTest;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class RationalNumberTest extends ImagingTest {
 
+    @Test
     public void test() {
         final double testValues[] = {
                 0, //

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
 Sat Dec 27 21:19:43 2014
@@ -18,6 +18,7 @@
 package org.apache.commons.imaging.common.bytesource;
 
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -27,6 +28,7 @@ import java.io.InputStream;
 
 import org.apache.commons.imaging.util.IoUtils;
 import org.apache.commons.io.IOUtils;
+import org.junit.Test;
 
 public class ByteSourceDataTest extends ByteSourceTest {
 
@@ -128,6 +130,7 @@ public class ByteSourceDataTest extends
 
     }
 
+    @Test
     public void test() throws Exception {
         final ByteSourceFactory byteSourceFactories[] = {
                 new ByteSourceFileFactory(),

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
 Sat Dec 27 21:19:43 2014
@@ -18,6 +18,8 @@
 package org.apache.commons.imaging.common.bytesource;
 
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
@@ -37,9 +39,11 @@ import org.apache.commons.imaging.ImageR
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.io.FileUtils;
+import org.junit.Test;
 
 public class ByteSourceImageTest extends ByteSourceTest {
 
+    @Test
     public void test() throws Exception {
         final List<File> imageFiles = getTestImages();
         for (int i = 0; i < imageFiles.size(); i++) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.common.bytesource;
 
+import static org.junit.Assert.assertTrue;
+
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.bmp;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -27,9 +29,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class BmpReadTest extends BmpBaseTest {
 
+    @Test
     public void test() throws Exception {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,9 @@
 
 package org.apache.commons.imaging.formats.bmp;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
@@ -30,6 +33,7 @@ import org.apache.commons.imaging.ImageW
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.io.FileUtils;
+import org.junit.Test;
 
 public class BmpRoundtripTest extends BmpBaseTest {
 
@@ -70,31 +74,37 @@ public class BmpRoundtripTest extends Bm
         return result;
     }
 
+    @Test
     public void testSmallBlackPixels() throws Exception {
         final int[][] smallBlackPixels = getSimpleRawData(256, 256, 0);
         writeAndReadImageData(smallBlackPixels);
     }
 
+    @Test
     public void testSingleBlackPixel() throws Exception {
         final int[][] singleBlackPixel = getSimpleRawData(1, 1, 0);
         writeAndReadImageData(singleBlackPixel);
     }
 
+    @Test
     public void testSmallRedPixels() throws Exception {
         final int[][] smallRedPixels = getSimpleRawData(256, 256, 0xffff0000);
         writeAndReadImageData(smallRedPixels);
     }
 
+    @Test
     public void testSingleRedPixel() throws Exception {
         final int[][] singleRedPixel = getSimpleRawData(1, 1, 0xffff0000);
         writeAndReadImageData(singleRedPixel);
     }
 
+    @Test
     public void testSmallAscendingPixels() throws Exception {
         final int[][] smallAscendingPixels = getAscendingRawData(256, 256);
         writeAndReadImageData(smallAscendingPixels);
     }
 
+    @Test
     public void testSmallRandomPixels() throws Exception {
         final int[][] smallRandomPixels = randomRawData(256, 256);
         writeAndReadImageData(smallRandomPixels);

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.dcx;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -27,9 +29,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class DcxReadTest extends DcxBaseTest {
 
+    @Test
     public void test() throws Exception {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.gif;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.List;
@@ -25,9 +27,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class GifReadTest extends GifBaseTest {
 
+    @Test
     public void test() throws Exception {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.icns;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -27,9 +29,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class IcnsReadTest extends IcnsBaseTest {
 
+    @Test
     public void test() throws Exception {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,9 @@
 
 package org.apache.commons.imaging.formats.icns;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -28,6 +31,7 @@ import org.apache.commons.imaging.Imagin
 import org.apache.commons.imaging.common.BinaryOutputStream;
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.io.FileUtils;
+import org.junit.Test;
 
 public class IcnsRoundTripTest extends IcnsBaseTest {
     // 16x16 test image
@@ -50,6 +54,7 @@ public class IcnsRoundTripTest extends I
         {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}
     };
 
+    @Test
     public void test1BPPIconMaskVersus8BPPMask() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0xff000000;
@@ -87,6 +92,7 @@ public class IcnsRoundTripTest extends I
                 baos.toByteArray(), foreground, background);
     }
 
+    @Test
     public void test8BPPIcon8BPPMask() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0x00cccccc;
@@ -124,6 +130,7 @@ public class IcnsRoundTripTest extends I
                 foreground, background);
     }
 
+    @Test
     public void test8BPPIcon8BPPMaskVersus1BPPMask() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0x00cccccc;
@@ -182,6 +189,7 @@ public class IcnsRoundTripTest extends I
                 baos.toByteArray(), foreground, background);
     }
 
+    @Test
     public void test8BPPIcon1BPPMaskVersus8BPPMask() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0x00cccccc;
@@ -240,6 +248,7 @@ public class IcnsRoundTripTest extends I
                 baos.toByteArray(), foreground, background);
     }
 
+    @Test
     public void test8BPPIconNoMask() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0xffcccccc;
@@ -265,6 +274,7 @@ public class IcnsRoundTripTest extends I
                 foreground, background);
     }
 
+    @Test
     public void test32BPPMaskedIcon() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0x000000ff;
@@ -321,6 +331,7 @@ public class IcnsRoundTripTest extends I
                 foreground, background);
     }
 
+    @Test
     public void test32BPPHalfMaskedIcon() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0xff0000ff;
@@ -373,6 +384,7 @@ public class IcnsRoundTripTest extends I
         assertTrue("ICNS file with corrupt mask didn't fail to parse", threw);
     }
 
+    @Test
     public void test32BPPMaskMissingIcon() throws Exception {
         final int foreground = 0xff000000;
         final int background = 0xff0000ff;

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.ico;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -27,9 +29,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class IcoReadTest extends IcoBaseTest {
 
+    @Test
     public void test() throws Exception {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,9 @@
 
 package org.apache.commons.imaging.formats.ico;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -31,6 +34,7 @@ import org.apache.commons.imaging.Imagin
 import org.apache.commons.imaging.common.BinaryOutputStream;
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.io.FileUtils;
+import org.junit.Test;
 
 public class IcoRoundtripTest extends IcoBaseTest {
     // 16x16 test image
@@ -327,6 +331,7 @@ public class IcoRoundtripTest extends Ic
         bos.write4Bytes(colorsImportant); // colors important
     }
 
+    @Test
     public void testNormalIcons() throws Exception {
         final int foreground = 0xFFF000E0;
         final int background = 0xFF102030;
@@ -350,6 +355,7 @@ public class IcoRoundtripTest extends Ic
         }
     }
 
+    @Test
     public void testBadICONDIRENTRYIcons() throws Exception {
         final int foreground = 0xFFF000E0;
         final int background = 0xFF102030;
@@ -393,6 +399,7 @@ public class IcoRoundtripTest extends Ic
         }
     }
 
+    @Test
     public void testColorsUsed() throws Exception {
         final int foreground = 0xFFF000E0;
         final int background = 0xFF102030;
@@ -415,6 +422,7 @@ public class IcoRoundtripTest extends Ic
         }
     }
 
+    @Test
     public void testZeroColorPlanes() throws Exception {
         final int foreground = 0xFFF000E0;
         final int background = 0xFF102030;
@@ -447,6 +455,7 @@ public class IcoRoundtripTest extends Ic
         }
     }
 
+    @Test
     public void testBitfieldCompression() throws Exception {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         final BinaryOutputStream bos = new BinaryOutputStream(baos,
@@ -466,6 +475,7 @@ public class IcoRoundtripTest extends Ic
                 baos.toByteArray(), 0xFF0000FF, 0xFFFFFFFF);
     }
 
+    @Test
     public void test32bitMask() throws Exception {
         final int foreground = 0xFFF000E0;
         final int background = 0xFF102030;
@@ -484,6 +494,7 @@ public class IcoRoundtripTest extends Ic
                 foreground, background);
     }
 
+    @Test
     public void testAlphaVersusANDMask() throws Exception {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         final BinaryOutputStream bos = new BinaryOutputStream(baos,
@@ -501,6 +512,7 @@ public class IcoRoundtripTest extends Ic
                 0xFF000000, 0x00000000);
     }
 
+    @Test
     public void testFullyTransparent32bitRGBA() throws Exception {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         final BinaryOutputStream bos = new BinaryOutputStream(baos,

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,9 @@
 
 package org.apache.commons.imaging.formats.jpeg;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -28,9 +31,11 @@ import org.apache.commons.imaging.ImageR
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class JpegReadTest extends JpegBaseTest {
 
+    @Test
     public void test() throws Exception {
         final List<File> images = getJpegImages();
         for (int i = 0; i < images.size(); i++) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.jpeg;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -25,9 +27,11 @@ import java.util.Map;
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.ImagingTest;
 import org.apache.commons.imaging.common.IImageMetadata;
+import org.junit.Test;
 
 public class JpegWithJpegThumbnailTest extends ImagingTest {
 
+    @Test
     public void testSingleImage() throws Exception {
         final File imageFile = getTestImageByName("img_F028c_small.jpg");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/DctTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/DctTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/DctTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/decoder/DctTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,9 +17,13 @@
 
 package org.apache.commons.imaging.formats.jpeg.decoder;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
 
-public class DctTest extends TestCase {
+import org.junit.Test;
+
+public class DctTest {
+
+    @Test
     public void testVectors() throws Exception {
         final float[] originalData = new float[8];
         for (int i = 0; i < 8; i++) {
@@ -49,6 +53,7 @@ public class DctTest extends TestCase {
         }
     }
 
+    @Test
     public void testMatrices() throws Exception {
         final float[] originalData = new float[8 * 8];
         final float[][] originalData8x8 = new float[8][8];

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,10 @@
 
 package org.apache.commons.imaging.formats.jpeg.exif;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -31,9 +35,11 @@ import org.apache.commons.imaging.format
 import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
 import org.apache.commons.imaging.formats.tiff.constants.AllTagConstants;
 import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
+import org.junit.Test;
 
 public class AsciiFieldTest extends ExifBaseTest implements AllTagConstants {
 
+    @Test
     public void testSingleImage() throws Exception {
         final File imageFile = getTestImageByName("Canon Powershot SD750 - 
2007.12.26.n.IMG_3704.JPG");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
 Sat Dec 27 21:19:43 2014
@@ -28,6 +28,7 @@ import org.apache.commons.imaging.common
 import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
 import org.apache.commons.imaging.formats.jpeg.JpegUtils;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class ExifDumpTest extends ExifBaseTest {
     // public ExifDumpTest(String name)
@@ -35,6 +36,7 @@ public class ExifDumpTest extends ExifBa
     // super(name);
     // }
 
+    @Test
     public void test() throws Exception {
         final List<File> images = getImagesWithExifData();
         for (int i = 0; i < images.size(); i++) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,10 @@
 
 package org.apache.commons.imaging.formats.jpeg.exif;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -44,6 +48,7 @@ import org.apache.commons.imaging.format
 import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.io.FileUtils;
+import org.junit.Test;
 
 public class ExifRewriteTest extends ExifBaseTest implements AllTagConstants {
     // public ExifRewriteTest(String name)
@@ -51,6 +56,7 @@ public class ExifRewriteTest extends Exi
     // super(name);
     // }
 
+    @Test
     public void testRemove() throws Exception {
         final List<File> images = getImagesWithExifData();
         for (int i = 0; i < images.size(); i++) {
@@ -89,6 +95,7 @@ public class ExifRewriteTest extends Exi
         }
     }
 
+    @Test
     public void testInsert() throws Exception {
         final List<File> images = getImagesWithExifData();
         for (int i = 0; i < images.size(); i++) {
@@ -242,6 +249,7 @@ public class ExifRewriteTest extends Exi
         }
     }
 
+    @Test
     public void testRewriteLossy() throws Exception {
         final Rewriter rewriter = new Rewriter() {
             public void rewrite(final ByteSource byteSource, final 
OutputStream os,
@@ -255,6 +263,7 @@ public class ExifRewriteTest extends Exi
         rewrite(rewriter, "lossy");
     }
 
+    @Test
     public void testRewriteLossless() throws Exception {
         final Rewriter rewriter = new Rewriter() {
             public void rewrite(final ByteSource byteSource, final 
OutputStream os,

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
 Sat Dec 27 21:19:43 2014
@@ -27,9 +27,11 @@ import org.apache.commons.imaging.Imagin
 import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
 import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class GpsTest extends ExifBaseTest implements ImagingConstants {
 
+    @Test
     public void test() throws Exception {
 
         final List<File> images = getImagesWithExifData(300);

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
 Sat Dec 27 21:19:43 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.commons.imaging.formats.jpeg.exif;
 
+import static org.junit.Assert.assertEquals;
+
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -31,6 +33,7 @@ import org.apache.commons.imaging.format
 import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
 import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory;
 import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
+import org.junit.Test;
 
 public class MicrosoftTagTest extends ExifBaseTest {
     private static final String AUTHOR = "author";
@@ -38,6 +41,7 @@ public class MicrosoftTagTest extends Ex
     private static final String SUBJECT = "subject";
     private static final String TITLE = "title";
 
+    @Test
     public void testWrite() throws Exception {
         final BufferedImage image = new BufferedImage(10, 10, 
BufferedImage.TYPE_INT_ARGB);
         final TiffOutputSet exifSet = new TiffOutputSet();
@@ -61,7 +65,8 @@ public class MicrosoftTagTest extends Ex
             throw new Exception("bad metadata format");
         }
     }
-    
+
+    @Test
     public void testRewrite() throws Exception {
         final File imageWithExif = getImageWithExifData();
         final TiffImageMetadata metadata = 
toTiffMetadata(Imaging.getMetadata(imageWithExif));

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
 Sat Dec 27 21:19:43 2014
@@ -31,6 +31,7 @@ import org.apache.commons.imaging.format
 import org.apache.commons.imaging.formats.tiff.TiffField;
 import org.apache.commons.imaging.formats.tiff.TiffImageMetadata;
 import org.apache.commons.imaging.formats.tiff.constants.AllTagConstants;
+import org.junit.Test;
 
 public abstract class SpecificExifTagTest extends ExifBaseTest implements
         AllTagConstants {
@@ -39,11 +40,13 @@ public abstract class SpecificExifTagTes
     // super(name);
     // }
 
+    @Test
     public void testSingleImage() throws Exception {
         final File imageFile = getImageWithExifData();
         checkImage(imageFile);
     }
 
+    @Test
     public void testAllImages() throws Exception {
         final List<File> images = getImagesWithExifData();
         for (int i = 0; i < images.size(); i++) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
 Sat Dec 27 21:19:43 2014
@@ -23,6 +23,7 @@ import java.util.List;
 import org.apache.commons.imaging.examples.WriteExifMetadataExample;
 import org.apache.commons.imaging.formats.tiff.constants.AllTagConstants;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class WriteExifMetadataExampleTest extends ExifBaseTest implements
         AllTagConstants {
@@ -31,6 +32,7 @@ public class WriteExifMetadataExampleTes
     // super(name);
     // }
 
+    @Test
     public void test() throws Exception {
         final List<File> images = getJpegImages();
         for (int i = 0; i < images.size(); i++) {
@@ -55,6 +57,7 @@ public class WriteExifMetadataExampleTes
         }
     }
 
+    @Test
     public void testInsert() throws Exception {
         final List<File> images = getJpegImages();
         for (int i = 0; i < images.size(); i++) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.jpeg.iptc;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.io.File;
 import java.util.HashMap;
 import java.util.List;
@@ -26,9 +28,11 @@ import org.apache.commons.imaging.Imagin
 import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
 import org.apache.commons.imaging.formats.jpeg.JpegPhotoshopMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class IptcDumpTest extends IptcBaseTest {
 
+    @Test
     public void test() throws Exception {
         final List<File> images = getImagesWithIptcData();
         for (int i = 0; i < images.size(); i++) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,9 @@
 
 package org.apache.commons.imaging.formats.jpeg.iptc;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -32,27 +35,27 @@ import org.apache.commons.imaging.format
 import org.apache.commons.imaging.formats.jpeg.JpegPhotoshopMetadata;
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.imaging.util.IoUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 public class IptcUpdateTest extends IptcBaseTest {
     private List<File> imagesWithIptcData;
 
-    @Override
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
-
         imagesWithIptcData = getImagesWithIptcData();
     }
 
-    @Override
+    @After
     public void tearDown() throws Exception {
-        super.tearDown();
-
         imagesWithIptcData = null;
     }
 
     /*
      * Remove all Photoshop IPTC data from a JPEG file.
      */
+    @Test
     public void testRemove() throws Exception {
         final List<File> images = imagesWithIptcData;
         for (int i = 0; i < images.size(); i++) {
@@ -98,6 +101,7 @@ public class IptcUpdateTest extends Iptc
         }
     }
 
+    @Test
     public void testRemoveInsertUpdate() throws Exception {
         final List<File> images = imagesWithIptcData;
         for (int i = 0; i < images.size(); i++) {
@@ -288,6 +292,7 @@ public class IptcUpdateTest extends Iptc
      * Add a few IPTC values to JPEG images, whether or not they have existing
      * IPTC data.
      */
+    @Test
     public void testAddIptcData() throws Exception {
         final List<File> images = getJpegImages();
         for (int i = 0; i < images.size(); i++) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.jpeg.xmp;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.io.File;
 import java.util.HashMap;
 import java.util.List;
@@ -26,9 +28,11 @@ import org.apache.commons.imaging.common
 import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
 import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class JpegXmpDumpTest extends JpegXmpBaseTest {
 
+    @Test
     public void test() throws Exception {
         final List<File> images = getImagesWithXmpData();
         for (int i = 0; i < images.size(); i++) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,10 @@
 
 package org.apache.commons.imaging.formats.jpeg.xmp;
 
+import static junit.framework.TestCase.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -30,9 +34,11 @@ import org.apache.commons.imaging.common
 import org.apache.commons.imaging.formats.jpeg.JpegImageParser;
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.imaging.util.IoUtils;
+import org.junit.Test;
 
 public class JpegXmpRewriteTest extends JpegXmpBaseTest {
 
+    @Test
     public void testRemoveInsertUpdate() throws Exception {
         final List<File> images = getImagesWithXmpData();
         for (int i = 0; i < images.size(); i++) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.pam;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -27,9 +29,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class PamReadTest extends PamBaseTest {
 
+    @Test
     public void test() throws Exception {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.pcx;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -27,9 +29,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class PcxReadTest extends PcxBaseTest {
 
+    @Test
     public void test() throws Exception {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.png;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.Hashtable;
@@ -25,9 +27,11 @@ import java.util.List;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class ConvertPngToGifTest extends PngBaseTest {
 
+    @Test
     public void test() throws Exception {
 
         final List<File> images = getPngImages();

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,9 @@
 
 package org.apache.commons.imaging.formats.png;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -26,9 +29,11 @@ import org.apache.commons.imaging.ImageF
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.io.FilenameUtils;
+import org.junit.Test;
 
 public class PngMultipleRoundtripTest extends PngBaseTest {
 
+    @Test
     public void test() throws Exception {
         final String imagesFolderPath = FilenameUtils
                 .separatorsToSystem("src\\test\\data\\images\\png\\3");

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,9 @@
 
 package org.apache.commons.imaging.formats.png;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.List;
@@ -25,9 +28,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class PngReadTest extends PngBaseTest {
 
+    @Test
     public void test() throws Exception {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,10 @@
 
 package org.apache.commons.imaging.formats.png;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -28,9 +32,11 @@ import java.util.Map;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.io.FileUtils;
+import org.junit.Test;
 
 public class PngTextTest extends PngBaseTest {
 
+    @Test
     public void test() throws Exception {
         final int width = 1;
         final int height = 1;

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.png;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -26,9 +28,11 @@ import java.util.Map;
 import org.apache.commons.imaging.ImageFormats;
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class PngWriteForceTrueColorText extends PngBaseTest {
 
+    @Test
     public void test() throws Exception {
 
         final List<File> images = getPngImages();

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,9 @@
 
 package org.apache.commons.imaging.formats.png;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
@@ -30,6 +33,7 @@ import org.apache.commons.imaging.ImageW
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.ImagingTest;
 import org.apache.commons.io.FileUtils;
+import org.junit.Test;
 
 public class PngWriteReadTest extends ImagingTest {
     // public PngWriteReadTest(String name)
@@ -74,6 +78,7 @@ public class PngWriteReadTest extends Im
         return result;
     }
 
+    @Test
     public void test() throws Exception {
         final int[][] smallBlackPixels = getSimpleRawData(256, 256, 0);
         final int[][] singleBlackPixel = getSimpleRawData(1, 1, 0);
@@ -91,6 +96,7 @@ public class PngWriteReadTest extends Im
         }
     }
 
+    @Test
     public void testTransparency() throws Exception {
         // Test for https://issues.apache.org/jira/browse/SANSELAN-52
         final int[][] smallAscendingPixels = getAscendingRawData(256, 256);

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.commons.imaging.formats.psd;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -26,8 +28,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class PsdReadTest extends PsdBaseTest {
+
+    @Test
     public void test() throws Exception {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.commons.imaging.formats.rgbe;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
@@ -26,8 +28,11 @@ import org.apache.commons.imaging.ImageR
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class RgbeReadTest extends RgbeBaseTest {
+
+    @Test
     public void test() throws IOException, ImageReadException {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,9 @@
 
 package org.apache.commons.imaging.formats.tiff;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.HashMap;
@@ -29,8 +32,11 @@ import org.apache.commons.imaging.Imagin
 import org.apache.commons.imaging.common.itu_t4.T4AndT6Compression;
 import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class TiffCcittTest extends TiffBaseTest {
+
+    @Test
     public void testAll5x2Compressions() {
         final byte[] uncompressed = new byte[2];
         final int[] combinations = new int[10];
@@ -150,6 +156,7 @@ public class TiffCcittTest extends TiffB
         } while (nextCombination(combinations, 1));
     }
 
+    @Test
     public void testAll5x2Images() {
         final int[] combinations = new int[10];
         final BufferedImage image = new BufferedImage(5, 2,

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffLzwTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.tiff;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -27,14 +29,17 @@ import java.util.List;
 import org.apache.commons.imaging.common.mylzw.MyLzwCompressor;
 import org.apache.commons.imaging.common.mylzw.MyLzwDecompressor;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class TiffLzwTest extends TiffBaseTest {
 
+    @Test
     public void testTrivial() throws Exception {
         final byte[] bytes = { 0, };
         compressRoundtripAndValidate(bytes);
     }
 
+    @Test
     public void testMedium() throws Exception {
         final int LENGTH = 1024 * 32;
         final byte[] bytes = new byte[LENGTH];

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.tiff;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.List;
@@ -25,9 +27,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class TiffReadTest extends TiffBaseTest {
 
+    @Test
     public void test() throws Exception {
         final List<File> images = getTiffImages();
         for (final File imageFile : images) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java
 Sat Dec 27 21:19:43 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.commons.imaging.formats.tiff;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Map;
@@ -30,8 +32,11 @@ import org.apache.commons.imaging.format
 import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossy;
 import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory;
 import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
+import org.junit.Test;
 
 public class TiffReadWriteTagsTest extends TiffBaseTest {
+
+    @Test
     public void testReadWriteTags() throws ImageWriteException, 
ImageReadException, IOException {
         String description = "A pretty picture";
         short page = 1;
@@ -73,7 +78,7 @@ public class TiffReadWriteTagsTest exten
         assertEquals(width, 
rootDir.getSingleFieldValue(AllTagConstants.TIFF_TAG_IMAGE_WIDTH));
         assertEquals(width, 
rootDir.getSingleFieldValue(AllTagConstants.TIFF_TAG_IMAGE_LENGTH));
         assertEquals(area, 
rootDir.getFieldValue(AllTagConstants.GPS_TAG_GPS_AREA_INFORMATION, true));
-        assertEquals(widthRes, 
rootDir.getSingleFieldValue(AllTagConstants.EXIF_TAG_WIDTH_RESOLUTION));
-        assertEquals(geoDoubleParams, 
rootDir.getSingleFieldValue(AllTagConstants.EXIF_TAG_GEO_DOUBLE_PARAMS_TAG));
+        assertEquals(widthRes, 
rootDir.getSingleFieldValue(AllTagConstants.EXIF_TAG_WIDTH_RESOLUTION), 0.0);
+        assertEquals(geoDoubleParams, 
rootDir.getSingleFieldValue(AllTagConstants.EXIF_TAG_GEO_DOUBLE_PARAMS_TAG), 
0.0);
     }
 }

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.commons.imaging.formats.tiff;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -29,9 +31,11 @@ import org.apache.commons.imaging.Imagin
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class TiffRoundtripTest extends TiffBaseTest {
 
+    @Test
     public void test() throws Exception {
         final List<File> images = getTiffImages();
         for (final File imageFile : images) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
 Sat Dec 27 21:19:43 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.commons.imaging.formats.tiff;
 
+import static org.junit.Assert.assertEquals;
+
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.Map;
@@ -26,8 +28,11 @@ import org.apache.commons.imaging.ImageR
 import org.apache.commons.imaging.ImageWriteException;
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
+import org.junit.Test;
 
 public class TiffSubImageTest extends TiffBaseTest {
+
+    @Test
     public void testSubImage() throws ImageReadException, ImageWriteException, 
IOException {
         BufferedImage src = new BufferedImage(10, 10, 
BufferedImage.TYPE_INT_RGB);
         byte[] imageBytes = Imaging.writeImageToBytes(src, ImageFormats.TIFF, 
null);

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffTagIntegrityTest.java
 Sat Dec 27 21:19:43 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.commons.imaging.formats.tiff;
 
+import static org.junit.Assert.assertEquals;
+
 import java.lang.reflect.Field;
 import java.util.List;
 
@@ -39,8 +41,11 @@ import org.apache.commons.imaging.format
 import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
 import org.apache.commons.imaging.formats.tiff.constants.WangTagConstants;
 import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo;
+import org.junit.Test;
 
 public class TiffTagIntegrityTest extends ImagingTest {
+
+    @Test
     public void testTagIntegrity() {
         verifyFields(AdobePageMaker6TagConstants.class,
                 AdobePageMaker6TagConstants.ALL_ADOBE_PAGEMAKER_6_TAGS);

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -15,6 +15,8 @@
 
 package org.apache.commons.imaging.formats.wbmp;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -25,9 +27,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class WbmpReadTest extends WbmpBaseTest {
 
+    @Test
     public void test() throws Exception {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -15,6 +15,8 @@
 
 package org.apache.commons.imaging.formats.xbm;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -25,9 +27,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class XbmReadTest extends XbmBaseTest {
 
+    @Test
     public void test() throws Exception {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpDumpTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,15 +17,19 @@
 
 package org.apache.commons.imaging.formats.xmp;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.io.File;
 import java.util.List;
 
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.ImagingTest;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class XmpDumpTest extends ImagingTest {
 
+    @Test
     public void test() throws Exception {
         final List<File> images = getTestImages();
         for (final File imageFile : images) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,9 @@
 
 package org.apache.commons.imaging.formats.xmp;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -28,9 +31,11 @@ import org.apache.commons.imaging.ImageF
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.ImagingTest;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class XmpUpdateTest extends ImagingTest {
 
+    @Test
     public void test() throws Exception {
         final List<File> images = getTestImages();
         for (final File imageFile : images) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
 Sat Dec 27 21:19:43 2014
@@ -15,6 +15,8 @@
 
 package org.apache.commons.imaging.formats.xpm;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.util.HashMap;
@@ -25,9 +27,11 @@ import org.apache.commons.imaging.ImageI
 import org.apache.commons.imaging.Imaging;
 import org.apache.commons.imaging.common.IImageMetadata;
 import org.apache.commons.imaging.util.Debug;
+import org.junit.Test;
 
 public class XpmReadTest extends XpmBaseTest {
 
+    @Test
     public void test() throws Exception {
         Debug.debug("start");
 

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/palette/PaletteQuantizationTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/palette/PaletteQuantizationTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/palette/PaletteQuantizationTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/palette/PaletteQuantizationTest.java
 Sat Dec 27 21:19:43 2014
@@ -16,12 +16,17 @@
  */
 package org.apache.commons.imaging.palette;
 
+import static org.junit.Assert.assertEquals;
+
 import java.awt.image.BufferedImage;
 
 import org.apache.commons.imaging.ImageWriteException;
 import org.apache.commons.imaging.ImagingTest;
+import org.junit.Test;
 
 public class PaletteQuantizationTest extends ImagingTest {
+
+    @Test
     public void testPaletteQuantization() throws ImageWriteException {
         BufferedImage whiteImage = new BufferedImage(10, 10, 
BufferedImage.TYPE_INT_RGB);
         for (int y = 0; y < whiteImage.getHeight(); y++) {

Modified: 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java?rev=1648114&r1=1648113&r2=1648114&view=diff
==============================================================================
--- 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java
 (original)
+++ 
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java
 Sat Dec 27 21:19:43 2014
@@ -17,6 +17,10 @@
 
 package org.apache.commons.imaging.roundtrip;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
@@ -35,6 +39,7 @@ import org.apache.commons.imaging.PixelD
 import org.apache.commons.imaging.common.RgbBufferedImageFactory;
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.io.FileUtils;
+import org.junit.Test;
 
 public class RoundtripTest extends ImagingTest {
     private static final int COLOR_FULL_RGB = 0;
@@ -267,6 +272,7 @@ public class RoundtripTest extends Imagi
         }
     }
 
+    @Test
     public void testBitmapRoundtrip() throws Exception {
         final BufferedImage testImages[] = { //
 
@@ -295,6 +301,7 @@ public class RoundtripTest extends Imagi
         }
     }
 
+    @Test
     public void testGrayscaleRoundtrip() throws Exception {
         final BufferedImage testImages[] = { //
 
@@ -328,6 +335,7 @@ public class RoundtripTest extends Imagi
         }
     }
 
+    @Test
     public void testLimitedColorRoundtrip() throws Exception {
         final BufferedImage testImages[] = { //
 
@@ -359,6 +367,7 @@ public class RoundtripTest extends Imagi
         }
     }
 
+    @Test
     public void testFullColorRoundtrip() throws Exception {
         final BufferedImage testImages[] = { //
 
@@ -392,7 +401,8 @@ public class RoundtripTest extends Imagi
             }
         }
     }
-    
+
+    @Test
     public void testPixelDensityRoundtrip() throws IOException,
             ImageReadException, ImageWriteException {
         final BufferedImage testImage = createFullColorImage(2, 2);
@@ -429,9 +439,9 @@ public class RoundtripTest extends Imagi
         }
     }
 
-    public void testNullParametersRoundtrip() throws IOException,
-               ImageReadException, ImageWriteException {
-       final BufferedImage testImage = createFullColorImage(1, 1);
+    @Test
+    public void testNullParametersRoundtrip() throws IOException, 
ImageReadException, ImageWriteException {
+        final BufferedImage testImage = createFullColorImage(1, 1);
         for (final FormatInfo formatInfo : FORMAT_INFOS) {
             if (!formatInfo.canRead || !formatInfo.canWrite) {
                 continue;