Author: britter
Date: Sun Dec 28 22:23:42 2014
New Revision: 1648264
URL: http://svn.apache.org/r1648264
Log:
Make BmpReadTest parameterized
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.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/formats/bmp/BmpBaseTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java?rev=1648264&r1=1648263&r2=1648264&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
(original)
+++
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
Sun Dec 28 22:23:42 2014
@@ -521,6 +521,7 @@ public class BmpImageParser extends Imag
@Override
public IImageMetadata getMetadata(final ByteSource byteSource, final
Map<String, Object> params)
throws ImageReadException, IOException {
+ // TODO this should throw UnsupportedOperationException, but
RoundtripTest has to be refactored completely before this can be changed
return null;
}
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=1648264&r1=1648263&r2=1648264&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
Sun Dec 28 22:23:42 2014
@@ -76,7 +76,7 @@ public abstract class ImagingTest implem
return getTestImages(null, -1);
}
- protected List<File> getTestImages(final ImageFilter filter) throws
IOException,
+ protected static List<File> getTestImages(final ImageFilter filter) throws
IOException,
ImageReadException {
return getTestImages(filter, -1);
}
Modified:
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java?rev=1648264&r1=1648263&r2=1648264&view=diff
==============================================================================
---
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
(original)
+++
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.java
Sun Dec 28 22:23:42 2014
@@ -41,7 +41,7 @@ public abstract class BmpBaseTest extend
}
};
- protected List<File> getBmpImages() throws IOException, ImageReadException
{
+ protected static List<File> getBmpImages() throws IOException,
ImageReadException {
return getTestImages(IMAGE_FILTER);
}
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=1648264&r1=1648263&r2=1648264&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
Sun Dec 28 22:23:42 2014
@@ -21,39 +21,55 @@ import static org.junit.Assert.assertNot
import java.awt.image.BufferedImage;
import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.imaging.ImageInfo;
+import org.apache.commons.imaging.ImageReadException;
import org.apache.commons.imaging.Imaging;
import org.apache.commons.imaging.common.IImageMetadata;
import org.apache.commons.imaging.util.Debug;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+@RunWith(Parameterized.class)
public class BmpReadTest extends BmpBaseTest {
- @Test
- public void test() throws Exception {
- Debug.debug("start");
+ private File imageFile;
- final List<File> images = getBmpImages();
- for (int i = 0; i < images.size(); i++) {
+ @Parameterized.Parameters
+ public static Collection<File> data() throws Exception {
+ return getBmpImages();
+ }
- final File imageFile = images.get(i);
- Debug.debug("imageFile", imageFile);
+ public BmpReadTest(File imageFile) {
+ this.imageFile = imageFile;
+ }
- final IImageMetadata metadata = Imaging.getMetadata(imageFile);
- // assertNotNull(metadata);
-
- final Map<String, Object> params = new HashMap<String, Object>();
- // params.put(PARAM_KEY_VERBOSE, Boolean.TRUE);
- final ImageInfo imageInfo = Imaging.getImageInfo(imageFile,
params);
- assertNotNull(imageInfo);
-
- final BufferedImage image = Imaging.getBufferedImage(imageFile);
- assertNotNull(image);
- }
+ @Test
+ public void testImageInfo() throws ImageReadException, IOException {
+ final Map<String, Object> params = Collections.emptyMap();
+ final ImageInfo imageInfo = Imaging.getImageInfo(imageFile, params);
+ assertNotNull(imageInfo);
+ // TODO assert more
+ }
+
+ // TODO BmpImageParser doesn't support MetaData creation, however
RoundtripTest has to be refactored completely before the code can be changed
+ @Test//(expected = UnsupportedOperationException.class)
+ public void testMetaData() throws ImageReadException, IOException {
+ Imaging.getMetadata(imageFile);
+ }
+
+ @Test
+ public void testBufferedImage() throws Exception {
+ final BufferedImage image = Imaging.getBufferedImage(imageFile);
+ assertNotNull(image);
+ // TODO assert more
}
}
