Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-04 03:55:28 -04:00
Code Issues Projects Releases Wiki Activity

Code clean-up.

Browse Source
This commit is contained in:
Harald Kuhr 2015-04-08 13:38:15 +02:00
parent 6631d7c8bc
commit d303918d87
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
View File

@ -59,6 +59,8 @@ import java.util.*;
import java.util.List; import java.util.List;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import static org.junit.Assume.assumeNoException;
import static org.junit.Assume.assumeNotNull;
import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@ -149,7 +151,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
@Override @Override
protected List<String> getMIMETypes() { protected List<String> getMIMETypes() {
return Arrays.asList("image/jpeg"); return Collections.singletonList("image/jpeg");
} }
// TODO: Test that subsampling is actually reading something // TODO: Test that subsampling is actually reading something
@ -1096,7 +1098,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
assertTrue(markerSequences.getLength() == 1 || markerSequences.getLength() == 2); // In case of JPEG encoded thumbnail, there will be 2 assertTrue(markerSequences.getLength() == 1 || markerSequences.getLength() == 2); // In case of JPEG encoded thumbnail, there will be 2
IIOMetadataNode markerSequence = (IIOMetadataNode) markerSequences.item(0); IIOMetadataNode markerSequence = (IIOMetadataNode) markerSequences.item(0);
assertNotNull(markerSequence); assertNotNull(markerSequence);
assertThat(markerSequence.getChildNodes().getLength(), new GreaterThan<Integer>(0)); assertThat(markerSequence.getChildNodes().getLength(), new GreaterThan<>(0));
NodeList unknowns = markerSequence.getElementsByTagName("unknown"); NodeList unknowns = markerSequence.getElementsByTagName("unknown");
for (int j = 0; j < unknowns.getLength(); j++) { for (int j = 0; j < unknowns.getLength(); j++) {
@ -1155,10 +1157,6 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
JPEGImageReader reader = createReader(); JPEGImageReader reader = createReader();
ImageReader referenceReader = createReferenceReader(); ImageReader referenceReader = createReferenceReader();
if (referenceReader == null) {
return;
}
for (TestData testData : getTestData()) { for (TestData testData : getTestData()) {
reader.setInput(testData.getInputStream()); reader.setInput(testData.getInputStream());
referenceReader.setInput(testData.getInputStream()); referenceReader.setInput(testData.getInputStream());
@ -1199,13 +1197,15 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
Class<ImageReaderSpi> spiClass = (Class<ImageReaderSpi>) Class.forName("com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi"); Class<ImageReaderSpi> spiClass = (Class<ImageReaderSpi>) Class.forName("com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi");
ImageReaderSpi provider = spiClass.newInstance(); ImageReaderSpi provider = spiClass.newInstance();
return provider.createReaderInstance(); ImageReader reader = provider.createReaderInstance();
assumeNotNull(reader);
return reader;
} }
catch (Throwable t) { catch (Throwable t) {
System.err.println("WARNING: Could not create ImageReader for reference (missing dependency): " + t.getMessage()); assumeNoException(t);
return null;
} }
return null;
} }
private void assertTreesEquals(String message, Node expectedTree, Node actualTree) { private void assertTreesEquals(String message, Node expectedTree, Node actualTree) {
@ -1288,7 +1288,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
} }
private List<IIOMetadataNode> sortNodes(final NodeList nodes) { private List<IIOMetadataNode> sortNodes(final NodeList nodes) {
ArrayList<IIOMetadataNode> sortedNodes = new ArrayList<IIOMetadataNode>(new AbstractList<IIOMetadataNode>() { ArrayList<IIOMetadataNode> sortedNodes = new ArrayList<>(new AbstractList<IIOMetadataNode>() {
@Override @Override
public IIOMetadataNode get(int index) { public IIOMetadataNode get(int index) {
return (IIOMetadataNode) nodes.item(index); return (IIOMetadataNode) nodes.item(index);
@ -1436,7 +1436,6 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTestCase<JPEGImageRe
// TODO: Report bug! // TODO: Report bug!
ImageReader reader = createReader(); ImageReader reader = createReader();
// ImageReader reader = createReferenceReader();
try { try {
reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/progressive-adobe-sof-bands-dont-match-sos-band-count.jpg"))); reader.setInput(ImageIO.createImageInputStream(getClassLoaderResource("/jpeg/progressive-adobe-sof-bands-dont-match-sos-band-count.jpg")));