Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-10-04 11:26:44 -04:00
Code Issues Projects Releases Wiki Activity

ImageReaderAbstractTest refactorings.

Browse Source 
(cherry picked from commit 9fdbc3b1fc)
This commit is contained in:
Harald Kuhr
2020-10-14 17:06:35 +02:00
parent 1ace3a6d5f
commit 769acc8726
22 changed files with 251 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java
View File

@@ -32,11 +32,11 @@ package com.twelvemonkeys.imageio.reference;
import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
import com.twelvemonkeys.lang.SystemUtil;
import com.sun.imageio.plugins.jpeg.JPEGImageReader;
import org.junit.Ignore;
import org.junit.Test;
import javax.imageio.IIOException;
import javax.imageio.ImageReader;
import javax.imageio.spi.IIORegistry;
import javax.imageio.spi.ImageReaderSpi;
import java.awt.*;
@@ -46,7 +46,6 @@ import java.util.Collections;
import java.util.List;
import static com.twelvemonkeys.imageio.util.IIOUtil.lookupProviderByName;
import static org.junit.Assume.assumeNoException;
/**
* JPEGImageReaderTest
@@ -55,10 +54,13 @@ import static org.junit.Assume.assumeNoException;
* @author last modified by $Author: haraldk$
* @version $Id: JPEGImageReaderTest.java,v 1.0 Oct 9, 2009 3:37:25 PM haraldk Exp$
*/
public class JPEGImageReaderTest extends ImageReaderAbstractTest {
public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader> {
private static final boolean IS_JAVA_6_OR_LATER = SystemUtil.isClassAvailable("java.util.Deque");
private final ImageReaderSpi provider = lookupProviderByName(IIORegistry.getDefaultInstance(), "com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi", ImageReaderSpi.class);
@Override
protected ImageReaderSpi createProvider() {
return lookupProviderByName(IIORegistry.getDefaultInstance(), "com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi", ImageReaderSpi.class);
}
@Override
protected List<TestData> getTestData() {
@@ -67,33 +69,6 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest {
);
}
@Override
protected ImageReaderSpi createProvider() {
return provider;
}
@Override
protected Class getReaderClass() {
try {
return Class.forName("com.sun.imageio.plugins.jpeg.JPEGImageReader");
}
catch (ClassNotFoundException e) {
assumeNoException(e);
}
return null;
}
@Override
protected ImageReader createReader() {
try {
return provider.createReaderInstance();
}
catch (IOException e) {
throw new RuntimeException(e);
}
}
// These are NOT correct implementations, but I don't really care here
@Override
protected List<String> getFormatNames() {
@@ -137,7 +112,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest {
@Test
@Ignore("Known issue")
@Override
public void testReadAsRenderedImageIndexOutOfBounds() throws IIOException {
public void testReadAsRenderedImageIndexOutOfBounds() throws IOException {
super.testReadAsRenderedImageIndexOutOfBounds();
}

39
imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTest.java
View File

@@ -32,10 +32,11 @@ package com.twelvemonkeys.imageio.reference;
import com.twelvemonkeys.imageio.util.IIOUtil;
import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
import com.sun.imageio.plugins.png.PNGImageReader;
import org.junit.Test;
import javax.imageio.IIOException;
import javax.imageio.ImageReader;
import javax.imageio.spi.IIORegistry;
import javax.imageio.spi.ImageReaderSpi;
import java.awt.*;
@@ -44,8 +45,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import static org.junit.Assume.assumeNoException;
/**
* PNGImageReaderTest
*
@@ -53,8 +52,11 @@ import static org.junit.Assume.assumeNoException;
* @author last modified by $Author: haraldk$
* @version $Id: PNGImageReaderTest.java,v 1.0 Oct 9, 2009 3:37:25 PM haraldk Exp$
*/
public class PNGImageReaderTest extends ImageReaderAbstractTest {
private final ImageReaderSpi provider = IIOUtil.lookupProviderByName(IIORegistry.getDefaultInstance(), "com.sun.imageio.plugins.png.PNGImageReaderSpi", ImageReaderSpi.class);
public class PNGImageReaderTest extends ImageReaderAbstractTest<PNGImageReader> {
@Override
protected ImageReaderSpi createProvider() {
return IIOUtil.lookupProviderByName(IIORegistry.getDefaultInstance(), "com.sun.imageio.plugins.png.PNGImageReaderSpi", ImageReaderSpi.class);
}
@Override
protected List<TestData> getTestData() {
@@ -63,33 +65,6 @@ public class PNGImageReaderTest extends ImageReaderAbstractTest {
);
}
@Override
protected ImageReaderSpi createProvider() {
return provider;
}
@Override
protected Class getReaderClass() {
try {
return Class.forName("com.sun.imageio.plugins.png.PNGImageReader");
}
catch (ClassNotFoundException e) {
assumeNoException(e);
}
return null;
}
@Override
protected ImageReader createReader() {
try {
return provider.createReaderInstance();
}
catch (IOException e) {
throw new RuntimeException(e);
}
}
// These are NOT correct implementations, but I don't really care here
@Override
protected List<String> getFormatNames() {