Skip to content

Commit bdec059

Browse files
michael-omichael-o
committed
[SUREFIRE-2145] Don't use Sink#figure()/Sink#figureCaption() since it distorts the output
This closes #595
1 parent c2c4180 commit bdec059

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

‎maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -659,8 +659,6 @@ private static void sinkLineBreak( Sink sink )
659659

660660
private static void sinkIcon( String type, Sink sink )
661661
{
662-
sink.figure();
663-
664662
if ( type.startsWith( "junit.framework" ) || "skipped".equals( type ) )
665663
{
666664
sink.figureGraphics( "images/icon_warning_sml.gif" );
@@ -673,8 +671,6 @@ else if ( type.startsWith( "success" ) )
673671
{
674672
sink.figureGraphics( "images/icon_error_sml.gif" );
675673
}
676-
677-
sink.figure_();
678674
}
679675

680676
private static void sinkHeader( Sink sink, String header )

‎maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire597Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void testCorruptedTestCaseFailureWithMissingErrorTypeAndMessage()
101101
+ "<th>Success Rate</th>\n"
102102
+ "<th>Time</th></tr>\n"
103103
+ "<tr class=\"b\">\n"
104-
+ "<td align=\"left\"><a href=\"#surefire.MyTest\"><figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure></a></td>\n"
104+
+ "<td align=\"left\"><a href=\"#surefire.MyTest\"><img src=\"images/icon_error_sml.gif\" alt=\"\" /></a></td>\n"
105105
+ "<td align=\"left\"><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
106106
+ "<td align=\"left\">1</td>\n"
107107
+ "<td align=\"left\">1</td>\n"
@@ -112,7 +112,7 @@ public void testCorruptedTestCaseFailureWithMissingErrorTypeAndMessage()
112112
assertThat( xml, containsString( toSystemNewLine(
113113
"<table border=\"0\" class=\"bodyTable\">\n"
114114
+ "<tr class=\"a\">\n"
115-
+ "<td align=\"left\"><figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure></td>\n"
115+
+ "<td align=\"left\"><img src=\"images/icon_error_sml.gif\" alt=\"\" /></td>\n"
116116
+ "<td align=\"left\"><a id=\"surefire.MyTest.test\"></a>test</td></tr>\n"
117117
+ "<tr class=\"b\">\n"
118118
+ "<td align=\"left\"></td>\n"

‎maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public void testSurefireReportSingleError()
234234
containsString( toSystemNewLine( "<tr class=\"b\">\n"
235235
+ "<td align=\"left\">"
236236
+ "<a href=\"#surefire.MyTest\">"
237-
+ "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
237+
+ "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
238238
+ "</a>"
239239
+ "</td>\n"
240240
+ "<td align=\"left\"><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
@@ -318,7 +318,7 @@ public void testSurefireReportNestedClassTrimStackTrace()
318318
containsString( toSystemNewLine( "<tr class=\"b\">\n"
319319
+ "<td align=\"left\">"
320320
+ "<a href=\"#surefire.MyTest\">"
321-
+ "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
321+
+ "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
322322
+ "</a>"
323323
+ "</td>\n"
324324
+ "<td align=\"left\"><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
@@ -380,7 +380,7 @@ public void testSurefireReportNestedClass()
380380
containsString( toSystemNewLine( "<tr class=\"b\">\n"
381381
+ "<td align=\"left\">"
382382
+ "<a href=\"#surefire.MyTest\">"
383-
+ "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
383+
+ "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
384384
+ "</a>"
385385
+ "</td>\n"
386386
+ "<td align=\"left\"><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
@@ -466,7 +466,7 @@ public void testSurefireReportEnclosedTrimStackTrace()
466466
containsString( toSystemNewLine( "<tr class=\"b\">\n"
467467
+ "<td align=\"left\">"
468468
+ "<a href=\"#surefire.MyTest$A\">"
469-
+ "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
469+
+ "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
470470
+ "</a>"
471471
+ "</td>\n"
472472
+ "<td align=\"left\"><a href=\"#surefire.MyTest$A\">MyTest$A</a></td>\n"
@@ -527,7 +527,7 @@ public void testSurefireReportEnclosed()
527527
containsString( toSystemNewLine( "<tr class=\"b\">\n"
528528
+ "<td align=\"left\">"
529529
+ "<a href=\"#surefire.MyTest$A\">"
530-
+ "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
530+
+ "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
531531
+ "</a>"
532532
+ "</td>\n"
533533
+ "<td align=\"left\"><a href=\"#surefire.MyTest$A\">MyTest$A</a></td>\n"

0 commit comments

Comments
 (0)