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:27 UTC
[maven-surefire] branch SUREFIRE-2145 updated (b0cd40169 -> bdec05966)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch SUREFIRE-2145
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
omit b0cd40169 [SUREFIRE-2145] Don't use Sink#figure()/Sink#figureCaption() since it distorts the output
add 59e096d98 [SUREFIRE-2095] Fork crash doesn't fail build with -Dmaven.test.failure.ignore=true when run with failsafe (#545)
add b8887b43c Bump commons-email
add 11d05413b [SUREFIRE-2065] Fix parameterized JUnit4 test reporting (#608)
add ee5e81e2d [SUREFIRE-2146] Don't draw border around reporting tables (#596)
add c6ddebc08 Bump junit in /surefire-its/src/test/resources/surefire-2065-junit4 (#611)
add c2c41804a Bump log4j-core
new bdec05966 [SUREFIRE-2145] Don't use Sink#figure()/Sink#figureCaption() since it distorts the output
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b0cd40169)
\
N -- N -- N refs/heads/SUREFIRE-2145 (bdec05966)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/maven/plugin/failsafe/VerifyMojo.java | 40 +++++++-
.../maven/plugin/failsafe/JUnit4SuiteTest.java | 3 +-
.../maven/plugin/failsafe/VerifyMojoTest.java | 108 +++++++++++++++++++++
.../failsafe-summary-booter-fork-error.xml | 41 ++++++++
.../verify-mojo/failsafe-summary-success.xml | 8 ++
.../surefire/report/SurefireReportGenerator.java | 10 +-
.../plugins/surefire/report/Surefire597Test.java | 8 +-
.../api/testset/FundamentalFilterTest.java | 4 +-
.../maven/surefire/its/fixture/TestFile.java | 19 ++++
.../maven/surefire/its/jiras/Surefire2065IT.java | 103 ++++++++++++++++++++
...e2095FailsafeJvmCrashShouldNotBeIgnoredIT.java} | 9 +-
.../src/test/resources/classpath-filtering/pom.xml | 2 +-
.../surefire-1659-stream-corruption/pom.xml | 2 +-
.../{testng-jdk14 => surefire-2065-common}/pom.xml | 30 +++---
.../test/java/pkg/junit4/ParameterizedTest.java | 29 ++++++
.../junit4/ParameterizedWithDisplayNameTest.java | 31 ++++++
.../test/java/pkg/junit5/ParameterizedTest.java | 30 ++++++
.../junit5/ParameterizedWithDisplayNameTest.java | 30 ++++++
.../pom.xml | 16 +--
.../test/java/pkg/junit4/ParameterizedTest.java | 29 ++++++
.../junit4/ParameterizedWithDisplayNameTest.java | 31 ++++++
.../{testng-jdk14 => surefire-2065-junit5}/pom.xml | 27 +++---
.../test/java/pkg/junit5/ParameterizedTest.java | 30 ++++++
.../junit5/ParameterizedWithDisplayNameTest.java | 30 ++++++
.../pom.xml | 22 ++++-
.../src/test/java/PojoIT.java} | 2 +-
.../surefire/junitplatform/RunListenerAdapter.java | 35 ++++---
27 files changed, 658 insertions(+), 71 deletions(-)
create mode 100644 maven-failsafe-plugin/src/test/java/org/apache/maven/plugin/failsafe/VerifyMojoTest.java
create mode 100644 maven-failsafe-plugin/src/test/resources/verify-mojo/failsafe-summary-booter-fork-error.xml
create mode 100644 maven-failsafe-plugin/src/test/resources/verify-mojo/failsafe-summary-success.xml
create mode 100644 surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire2065IT.java
copy surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/{Surefire1426JvmCrashShouldNotBeIgnoredIT.java => Surefire2095FailsafeJvmCrashShouldNotBeIgnoredIT.java} (82%)
copy surefire-its/src/test/resources/{testng-jdk14 => surefire-2065-common}/pom.xml (67%)
create mode 100644 surefire-its/src/test/resources/surefire-2065-common/src/test/java/pkg/junit4/ParameterizedTest.java
create mode 100644 surefire-its/src/test/resources/surefire-2065-common/src/test/java/pkg/junit4/ParameterizedWithDisplayNameTest.java
create mode 100644 surefire-its/src/test/resources/surefire-2065-common/src/test/java/pkg/junit5/ParameterizedTest.java
create mode 100644 surefire-its/src/test/resources/surefire-2065-common/src/test/java/pkg/junit5/ParameterizedWithDisplayNameTest.java
copy surefire-its/src/test/resources/{unicode-testnames => surefire-2065-junit4}/pom.xml (79%)
create mode 100644 surefire-its/src/test/resources/surefire-2065-junit4/src/test/java/pkg/junit4/ParameterizedTest.java
create mode 100644 surefire-its/src/test/resources/surefire-2065-junit4/src/test/java/pkg/junit4/ParameterizedWithDisplayNameTest.java
copy surefire-its/src/test/resources/{testng-jdk14 => surefire-2065-junit5}/pom.xml (70%)
create mode 100644 surefire-its/src/test/resources/surefire-2065-junit5/src/test/java/pkg/junit5/ParameterizedTest.java
create mode 100644 surefire-its/src/test/resources/surefire-2065-junit5/src/test/java/pkg/junit5/ParameterizedWithDisplayNameTest.java
copy surefire-its/src/test/resources/{surefire-1426-ignore-fail-jvm-crash => surefire-2095-failsafe-jvm-crash}/pom.xml (71%)
copy surefire-its/src/test/resources/{pojo-simple/src/test/java/PojoTest.java => surefire-2095-failsafe-jvm-crash/src/test/java/PojoIT.java} (98%)
[maven-surefire] 01/01: [SUREFIRE-2145] Don't use Sink#figure()/Sink#figureCaption() since it distorts the output
Posted by mi...@apache.org.
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"