You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/02/09 17:20:28 UTC
[maven-surefire] 01/01: [SUREFIRE-2145] Don't use Sink#figure()/Sink#figureCaption() since it distorts the output
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch SUREFIRE-2145
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit bdec059668cacd2a5744f69866cf0e41568ee616
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jan 26 19:39:08 2023 +0100
[SUREFIRE-2145] Don't use Sink#figure()/Sink#figureCaption() since it distorts the output
This closes #595
---
.../maven/plugins/surefire/report/SurefireReportGenerator.java | 4 ----
.../apache/maven/plugins/surefire/report/Surefire597Test.java | 4 ++--
.../maven/plugins/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 c525d5b65..4cfcce038 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 @@ public final class SurefireReportGenerator
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 @@ public final class SurefireReportGenerator
{
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 79d0e3068..d7758cb02 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 class Surefire597Test
+ "<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 class Surefire597Test
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 548bf911d..0e1f1818f 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 class SurefireReportMojoTest
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 class SurefireReportMojoTest
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 class SurefireReportMojoTest
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 class SurefireReportMojoTest
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 class SurefireReportMojoTest
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"