B!! images compressed differently on JDKs before 11

Author: LarsEckart

approvaltests-tests/src/test/java/org/approvaltests/awt/ApprovalsTest.customPanel.approved.png renamed to approvaltests-tests/src/test/java/org/approvaltests/awt/ApprovalsTest.customPanel.jdkPost11.approved.png

@@ -19,31 +19,21 @@
 //@UseReporter({FileCaptureReporter.class})
 public class ApprovalsTest
 {
-  @DisabledOnJre({JRE.JAVA_8})
   @Test
   void customPanel()
   {
-    final CustomPanel panel = new CustomPanel();
+    CustomPanel panel = new CustomPanel();
     AwtApprovals.verify(panel);
   }
-  //  @DisabledOnJre({JRE.JAVA_8})
-  // TODO
   @Disabled("continue here next week")
   @Test
   void customPanelWithText()
   {
     // begin-snippet: file_capture_reporter_example
-    final CustomPanel panel = new CustomPanel(true, 20);
+    CustomPanel panel = new CustomPanel(true, 20);
     AwtApprovals.verify(panel, new Options(new FileCaptureReporter()));
     // end-snippet
   }
-  @EnabledOnJre({JRE.JAVA_8})
-  @Test
-  void customPanelOnJre8()
-  {
-    final CustomPanel panel = new CustomPanel();
-    AwtApprovals.verify(panel);
-  }
   @Test
   @UseReporter(ImageWebReporter.class)
   void testSequence()
@@ -73,8 +63,8 @@ void testSequenceWithTimings()
     AwtApprovals.verifySequenceWithTimings(5,
         f -> new Tuple<>(squareDrawer.setSquareSize(f * 10), Duration.ofSeconds(1 + f)));
   }
-  @DisabledOnJre({JRE.JAVA_8})
   @Test
+  @UseReporter(FileCaptureReporter.class)
   void testBufferedImage()
   {
     BufferedImage bufferedImage = new BufferedImage(60, 30, BufferedImage.TYPE_INT_ARGB);

approvaltests-tests/src/test/java/org/approvaltests/awt/ApprovalsTest.customPanelOnJre8.approved.png renamed to approvaltests-tests/src/test/java/org/approvaltests/awt/ApprovalsTest.customPanel.jdkPre11.approved.png

@@ -43,7 +43,10 @@ public static void verify(BufferedImage bufferedImage)
   }
   public static void verify(BufferedImage bufferedImage, Options options)
   {
-    Approvals.verify(new ImageApprovalWriter(bufferedImage), options);
+    try (NamedEnvironment env = ImageApprovalWriter.asJreAware())
+    {
+      Approvals.verify(new ImageApprovalWriter(bufferedImage), options);
+    }
   }
   public static void verify(Component c)
   {
@@ -62,7 +65,10 @@ public static void verify(Paintable c)
   }
   public static void verify(Paintable c, Options options)
   {
-    Approvals.verify(options.createWriter(c), options);
+    try (NamedEnvironment env = ImageApprovalWriter.asJreAware())
+    {
+      Approvals.verify(options.createWriter(c), options);
+    }
   }
   public static void verifySequence(int numberOfFrames, Function1<Integer, Paintable> sequenceRenderer)
   {

approvaltests-tests/src/test/java/org/approvaltests/awt/ApprovalsTest.java

@@ -2,18 +2,31 @@
 
 import com.spun.util.ObjectUtils;
 import org.approvaltests.core.ApprovalWriter;
+import org.approvaltests.namer.NamedEnvironment;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.File;
 
+import static org.approvaltests.namer.NamerFactory.asMachineSpecificTest;
+
 public class ImageApprovalWriter implements ApprovalWriter
 {
   private final BufferedImage image;
   public ImageApprovalWriter(BufferedImage image)
   {
     this.image = image;
   }
+  public static NamedEnvironment asJreAware()
+  {
+    return asMachineSpecificTest(() -> getJreInformation());
+  }
+  private static String getJreInformation()
+  {
+    String javaVersion = System.getProperty("java.version");
+    int major = Integer.parseInt(javaVersion.split("\\.")[0]);
+    return major < 11 ? "jdkPre11" : "jdkPost11";
+  }
   @Override
   public File writeReceivedFile(File received)
   {