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

#292 Made test cases Java 9 compatible.

Browse Source
This commit is contained in:
Harald Kuhr 2016-11-15 20:05:14 +01:00
parent d4b3f3e04a
commit 37e6d31ed9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import org.junit.Test;
import javax.imageio.IIOException; import javax.imageio.IIOException;
import javax.imageio.ImageReader; import javax.imageio.ImageReader;
import javax.imageio.spi.IIORegistry;
import javax.imageio.spi.ImageReaderSpi; import javax.imageio.spi.ImageReaderSpi;
import java.awt.*; import java.awt.*;
import java.io.IOException; import java.io.IOException;
@ -24,15 +25,15 @@ import static org.junit.Assume.assumeNoException;
* @version $Id: JPEGImageReaderTest.java,v 1.0 Oct 9, 2009 3:37:25 PM haraldk Exp$ * @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 {
private static final boolean IS_JAVA_6 = SystemUtil.isClassAvailable("java.util.Deque"); private static final boolean IS_JAVA_6_OR_LATER = SystemUtil.isClassAvailable("java.util.Deque");
protected final ImageReaderSpi provider = lookupSpi(); protected final ImageReaderSpi provider = lookupSpi();
private ImageReaderSpi lookupSpi() { private ImageReaderSpi lookupSpi() {
try { try {
return (ImageReaderSpi) Class.forName("com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi").newInstance(); return (ImageReaderSpi) IIORegistry.getDefaultInstance().getServiceProviderByClass(Class.forName("com.sun.imageio.plugins.jpeg.JPEGImageReaderSpi"));
} }
catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) { catch (ClassNotFoundException e) {
assumeNoException(e); assumeNoException(e);
} }
@ -93,7 +94,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest {
@Override @Override
public void testSetDestination() throws IOException { public void testSetDestination() throws IOException {
// Known bug in Sun JPEGImageReader before Java 6 // Known bug in Sun JPEGImageReader before Java 6
if (IS_JAVA_6) { if (IS_JAVA_6_OR_LATER) {
super.testSetDestination(); super.testSetDestination();
} }
else { else {
@ -105,7 +106,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest {
@Override @Override
public void testSetDestinationType() throws IOException { public void testSetDestinationType() throws IOException {
// Known bug in Sun JPEGImageReader before Java 6 // Known bug in Sun JPEGImageReader before Java 6
if (IS_JAVA_6) { if (IS_JAVA_6_OR_LATER) {
super.testSetDestinationType(); super.testSetDestinationType();
} }
else { else {

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

@ -5,6 +5,7 @@ import org.junit.Test;
import javax.imageio.IIOException; import javax.imageio.IIOException;
import javax.imageio.ImageReader; import javax.imageio.ImageReader;
import javax.imageio.spi.IIORegistry;
import javax.imageio.spi.ImageReaderSpi; import javax.imageio.spi.ImageReaderSpi;
import java.awt.*; import java.awt.*;
import java.io.IOException; import java.io.IOException;
@ -26,9 +27,9 @@ public class PNGImageReaderTest extends ImageReaderAbstractTest {
private ImageReaderSpi lookupSpi() { private ImageReaderSpi lookupSpi() {
try { try {
return (ImageReaderSpi) Class.forName("com.sun.imageio.plugins.png.PNGImageReaderSpi").newInstance(); return (ImageReaderSpi) IIORegistry.getDefaultInstance().getServiceProviderByClass(Class.forName("com.sun.imageio.plugins.png.PNGImageReaderSpi"));
} }
catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) { catch (ClassNotFoundException e) {
assumeNoException(e); assumeNoException(e);
} }