From bdec059668cacd2a5744f69866cf0e41568ee616 Mon Sep 17 00:00:00 2001 From: Michael Osipov 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() + "Success Rate\n" + "Time\n" + "\n" - + "
\"\"
\n" + + "\"\"\n" + "MyTest\n" + "1\n" + "1\n" @@ -112,7 +112,7 @@ public void testCorruptedTestCaseFailureWithMissingErrorTypeAndMessage() assertThat( xml, containsString( toSystemNewLine( "\n" + "\n" - + "\n" + + "\n" + "\n" + "\n" + "\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( "\n" + "\n" + "\n" @@ -318,7 +318,7 @@ public void testSurefireReportNestedClassTrimStackTrace() containsString( toSystemNewLine( "\n" + "\n" + "\n" @@ -380,7 +380,7 @@ public void testSurefireReportNestedClass() containsString( toSystemNewLine( "\n" + "\n" + "\n" @@ -466,7 +466,7 @@ public void testSurefireReportEnclosedTrimStackTrace() containsString( toSystemNewLine( "\n" + "\n" + "\n" @@ -527,7 +527,7 @@ public void testSurefireReportEnclosed() containsString( toSystemNewLine( "\n" + "\n" + "\n"
\"\"
\"\"test
" + "" - + "
\"\"
" + + "\"\"" + "
" + "
MyTest
" + "" - + "
\"\"
" + + "\"\"" + "
" + "
MyTest
" + "" - + "
\"\"
" + + "\"\"" + "
" + "
MyTest
" + "" - + "
\"\"
" + + "\"\"" + "
" + "
MyTest$A
" + "" - + "
\"\"
" + + "\"\"" + "
" + "
MyTest$A