From bdec059668cacd2a5744f69866cf0e41568ee616 Mon Sep 17 00:00:00 2001
From: Michael Osipov <michaelo@apache.org>
Date: Thu, 26 Jan 2023 19:39:08 +0100
Subject: [PATCH] [SUREFIRE-2145] Don't use Sink#figure()/Sink#figureCaption()
 since it distorts the output

This closes #595
---
 .../surefire/report/SurefireReportGenerator.java       |  4 ----
 .../maven/plugins/surefire/report/Surefire597Test.java |  4 ++--
 .../surefire/report/SurefireReportMojoTest.java        | 10 +++++-----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
index c525d5b651..4cfcce0386 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
@@ -659,8 +659,6 @@ private static void sinkLineBreak( Sink sink )
 
     private static void sinkIcon( String type, Sink sink )
     {
-        sink.figure();
-
         if ( type.startsWith( "junit.framework" ) || "skipped".equals( type ) )
         {
             sink.figureGraphics( "images/icon_warning_sml.gif" );
@@ -673,8 +671,6 @@ else if ( type.startsWith( "success" ) )
         {
             sink.figureGraphics( "images/icon_error_sml.gif" );
         }
-
-        sink.figure_();
     }
 
     private static void sinkHeader( Sink sink, String header )
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java
index 79d0e30684..d7758cb021 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java
@@ -101,7 +101,7 @@ public void testCorruptedTestCaseFailureWithMissingErrorTypeAndMessage()
                 + "<th>Success Rate</th>\n"
                 + "<th>Time</th></tr>\n"
                 + "<tr class=\"b\">\n"
-                + "<td align=\"left\"><a href=\"#surefire.MyTest\"><figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure></a></td>\n"
+                + "<td align=\"left\"><a href=\"#surefire.MyTest\"><img src=\"images/icon_error_sml.gif\" alt=\"\" /></a></td>\n"
                 + "<td align=\"left\"><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
                 + "<td align=\"left\">1</td>\n"
                 + "<td align=\"left\">1</td>\n"
@@ -112,7 +112,7 @@ public void testCorruptedTestCaseFailureWithMissingErrorTypeAndMessage()
         assertThat( xml, containsString( toSystemNewLine(
             "<table border=\"0\" class=\"bodyTable\">\n"
                 + "<tr class=\"a\">\n"
-                + "<td align=\"left\"><figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure></td>\n"
+                + "<td align=\"left\"><img src=\"images/icon_error_sml.gif\" alt=\"\" /></td>\n"
                 + "<td align=\"left\"><a id=\"surefire.MyTest.test\"></a>test</td></tr>\n"
                 + "<tr class=\"b\">\n"
                 + "<td align=\"left\"></td>\n"
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
index 548bf911d1..0e1f1818fb 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
@@ -234,7 +234,7 @@ public void testSurefireReportSingleError()
                     containsString( toSystemNewLine( "<tr class=\"b\">\n"
                                                          + "<td align=\"left\">"
                                                          + "<a href=\"#surefire.MyTest\">"
-                                                         + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
+                                                         + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
                                                          + "</a>"
                                                          + "</td>\n"
                                                          + "<td align=\"left\"><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
@@ -318,7 +318,7 @@ public void testSurefireReportNestedClassTrimStackTrace()
                     containsString( toSystemNewLine( "<tr class=\"b\">\n"
                                                          + "<td align=\"left\">"
                                                          + "<a href=\"#surefire.MyTest\">"
-                                                         + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
+                                                         + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
                                                          + "</a>"
                                                          + "</td>\n"
                                                          + "<td align=\"left\"><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
@@ -380,7 +380,7 @@ public void testSurefireReportNestedClass()
                     containsString( toSystemNewLine( "<tr class=\"b\">\n"
                                                          + "<td align=\"left\">"
                                                          + "<a href=\"#surefire.MyTest\">"
-                                                         + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
+                                                         + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
                                                          + "</a>"
                                                          + "</td>\n"
                                                          + "<td align=\"left\"><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
@@ -466,7 +466,7 @@ public void testSurefireReportEnclosedTrimStackTrace()
                     containsString( toSystemNewLine( "<tr class=\"b\">\n"
                                                          + "<td align=\"left\">"
                                                          + "<a href=\"#surefire.MyTest$A\">"
-                                                         + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
+                                                         + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
                                                          + "</a>"
                                                          + "</td>\n"
                                                          + "<td align=\"left\"><a href=\"#surefire.MyTest$A\">MyTest$A</a></td>\n"
@@ -527,7 +527,7 @@ public void testSurefireReportEnclosed()
                     containsString( toSystemNewLine( "<tr class=\"b\">\n"
                                         + "<td align=\"left\">"
                                         + "<a href=\"#surefire.MyTest$A\">"
-                                        + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
+                                        + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
                                         + "</a>"
                                         + "</td>\n"
                                         + "<td align=\"left\"><a href=\"#surefire.MyTest$A\">MyTest$A</a></td>\n"