From 16caec4a22b088e7baca5dfad361084ef2ed8166 Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Wed, 28 Oct 2020 18:48:16 +0100 Subject: [PATCH] ...and fix the broken test. --- .../imageio/stream/ImageInputStreamSpiTest.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/ImageInputStreamSpiTest.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/ImageInputStreamSpiTest.java index 3845b9a8..df95fee9 100644 --- a/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/ImageInputStreamSpiTest.java +++ b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/ImageInputStreamSpiTest.java @@ -8,8 +8,7 @@ import java.io.IOException; import java.lang.reflect.ParameterizedType; import java.util.Locale; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.*; abstract class ImageInputStreamSpiTest { private final ImageInputStreamSpi provider = createProvider(); @@ -53,11 +52,15 @@ abstract class ImageInputStreamSpiTest { provider.createInputStreamInstance(null, true, ImageIO.getCacheDirectory()); } - @Test(expected = IllegalArgumentException.class) + @Test public void createCachedNullCache() throws IOException { - if (provider.canUseCacheFile() || provider.needsCacheFile()) { + try { provider.createInputStreamInstance(createInput(), true, null); } + catch (IllegalArgumentException expected) { + // All good + assertFalse(provider.needsCacheFile()); + } } @Test