From 34852f7be52af46455c5fcdaecfb31f5b4a1c6c7 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Thu, 29 Apr 2021 16:46:16 +0200
Subject: [PATCH] Cleaner tests for Java 6 or later... A little late. :-)

(cherry picked from commit 21059c8d5af2a5ebe6f9182b3c033b1e1fe8018e)
---
 .../imageio/reference/JPEGImageReaderTest.java  | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java
index de3af2aa..735ef236 100644
--- a/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java
+++ b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java
@@ -46,6 +46,7 @@ import java.util.Collections;
 import java.util.List;
 
 import static com.twelvemonkeys.imageio.util.IIOUtil.lookupProviderByName;
+import static org.junit.Assume.assumeTrue;
 
 /**
  * JPEGImageReaderTest
@@ -89,24 +90,16 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
     @Override
     public void testSetDestination() throws IOException {
         // Known bug in Sun JPEGImageReader before Java 6
-        if (IS_JAVA_6_OR_LATER) {
-            super.testSetDestination();
-        }
-        else {
-            System.err.println("WARNING: Test skipped due to known bug in Java 1.5, please test again with Java 6 or later");
-        }
+        assumeTrue("Test skipped due to known bug in Java 1.5, please test again with Java 6 or later", IS_JAVA_6_OR_LATER);
+        super.testSetDestination();
     }
 
     @Test
     @Override
     public void testSetDestinationType() throws IOException {
         // Known bug in Sun JPEGImageReader before Java 6
-        if (IS_JAVA_6_OR_LATER) {
-            super.testSetDestinationType();
-        }
-        else {
-            System.err.println("WARNING: Test skipped due to known bug in Java 1.5, please test again with Java 6 or later");
-        }
+        assumeTrue("Test skipped due to known bug in Java 1.5, please test again with Java 6 or later", IS_JAVA_6_OR_LATER);
+        super.testSetDestinationType();
     }
 
     @Test