From 4db5cdc47385fa493d223fd1eee213870b555297 Mon Sep 17 00:00:00 2001
From: Yasser Zamani <yasserzamani@apache.org>
Date: Thu, 26 Apr 2018 20:44:50 +0430
Subject: [PATCH] not fail if OS or JDK doesn't support jpeg

---
 .../java/org/apache/struts2/dispatcher/ChartResultTest.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java b/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
index b4a09a03b..dd760a006 100644
--- a/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
+++ b/plugins/jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
@@ -33,6 +33,7 @@ import org.jfree.chart.ChartFactory;
 import org.jfree.chart.JFreeChart;
 import org.jfree.data.general.DefaultPieDataset;
 
+import javax.imageio.ImageIO;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -97,7 +98,9 @@ public class ChartResultTest extends StrutsTestCase {
         result.execute(actionInvocation);
 
         EasyMock.verify(responseMock);
-        assertTrue(os.isWritten());
+
+        boolean envSupportsJpeg = ImageIO.getImageWritersByFormatName("jpeg").hasNext();
+        assertTrue(envSupportsJpeg ^ !os.isWritten());
     }