You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/06/10 08:54:51 UTC
[maven-surefire] branch master updated: Upgrade Doxia to 1.9
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 71c462d Upgrade Doxia to 1.9
71c462d is described below
commit 71c462debf64f2a1d6599a38238b0c15024f045c
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Jun 9 23:31:47 2019 +0200
Upgrade Doxia to 1.9
---
.../apache/maven/plugins/surefire/report/Surefire1183Test.java | 2 +-
.../apache/maven/plugins/surefire/report/Surefire597Test.java | 8 ++++----
.../maven/plugins/surefire/report/SurefireReportMojoTest.java | 10 +++++-----
pom.xml | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire1183Test.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire1183Test.java
index 7a47e16..20e20f2 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire1183Test.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/Surefire1183Test.java
@@ -117,6 +117,6 @@ public class Surefire1183Test extends AbstractMojoTestCase
assertTrue( report.exists() );
String htmlContent = FileUtils.fileRead ( report );
- assertTrue( htmlContent.contains ( "<h2><a name=\"Acceptance_Test\"></a>Acceptance Test</h2></div>" ) );
+ assertTrue( htmlContent.contains ( "<h2><a name=\"Acceptance_Test\"></a>Acceptance Test</h2></section>" ) );
}
}
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 96e0b33..b179e3c 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
@@ -20,7 +20,7 @@ package org.apache.maven.plugins.surefire.report;
*/
import junit.framework.TestCase;
-import org.apache.maven.doxia.module.xhtml.XhtmlSink;
+import org.apache.maven.doxia.module.xhtml5.Xhtml5Sink;
import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.plugin.surefire.log.api.NullConsoleLogger;
@@ -47,7 +47,7 @@ public class Surefire597Test
ConsoleLogger log = new NullConsoleLogger();
SurefireReportGenerator gen = new SurefireReportGenerator( singletonList( report ), ENGLISH, true, null, log );
StringWriter writer = new StringWriter();
- gen.doGenerateReport( new SurefireReportMojo().getBundle( ENGLISH ), new XhtmlSink( writer ) {} );
+ gen.doGenerateReport( new SurefireReportMojo().getBundle( ENGLISH ), new Xhtml5Sink( writer ) {} );
String xml = writer.toString();
assertThat( xml, containsString( toSystemNewLine(
"<table border=\"1\" class=\"bodyTable\">\n"
@@ -97,7 +97,7 @@ public class Surefire597Test
+ "<th>Success Rate</th>\n"
+ "<th>Time</th></tr>\n"
+ "<tr class=\"b\">\n"
- + "<td><a href=\"#surefire.MyTest\"><img src=\"images/icon_error_sml.gif\" alt=\"\" /></a></td>\n"
+ + "<td><a href=\"#surefire.MyTest\"><figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure></a></td>\n"
+ "<td><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
+ "<td>1</td>\n"
+ "<td>1</td>\n"
@@ -108,7 +108,7 @@ public class Surefire597Test
assertThat( xml, containsString( toSystemNewLine(
"<table border=\"1\" class=\"bodyTable\">\n"
+ "<tr class=\"a\">\n"
- + "<td><img src=\"images/icon_error_sml.gif\" alt=\"\" /></td>\n"
+ + "<td><figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure></td>\n"
+ "<td><a name=\"surefire.MyTest.test\"></a>test</td></tr>\n"
+ "<tr class=\"b\">\n"
+ "<td></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 64c583e..e62c168 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
@@ -261,7 +261,7 @@ public class SurefireReportMojoTest
containsString( toSystemNewLine( "<tr class=\"b\">\n"
+ "<td>"
+ "<a href=\"#surefire.MyTest\">"
- + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
+ + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
+ "</a>"
+ "</td>\n"
+ "<td><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
@@ -346,7 +346,7 @@ public class SurefireReportMojoTest
containsString( toSystemNewLine( "<tr class=\"b\">\n"
+ "<td>"
+ "<a href=\"#surefire.MyTest\">"
- + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
+ + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
+ "</a>"
+ "</td>\n"
+ "<td><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
@@ -409,7 +409,7 @@ public class SurefireReportMojoTest
containsString( toSystemNewLine( "<tr class=\"b\">\n"
+ "<td>"
+ "<a href=\"#surefire.MyTest\">"
- + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
+ + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
+ "</a>"
+ "</td>\n"
+ "<td><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
@@ -496,7 +496,7 @@ public class SurefireReportMojoTest
containsString( toSystemNewLine( "<tr class=\"b\">\n"
+ "<td>"
+ "<a href=\"#surefire.MyTest$A\">"
- + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
+ + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
+ "</a>"
+ "</td>\n"
+ "<td><a href=\"#surefire.MyTest$A\">MyTest$A</a></td>\n"
@@ -558,7 +558,7 @@ public class SurefireReportMojoTest
containsString( toSystemNewLine( "<tr class=\"b\">\n"
+ "<td>"
+ "<a href=\"#surefire.MyTest$A\">"
- + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
+ + "<figure><img src=\"images/icon_error_sml.gif\" alt=\"\" /></figure>"
+ "</a>"
+ "</td>\n"
+ "<td><a href=\"#surefire.MyTest$A\">MyTest$A</a></td>\n"
diff --git a/pom.xml b/pom.xml
index 8469f31..4199e38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,8 +90,8 @@
<!-- <shadedVersion>3.0.0-M2</shadedVersion> commented out due to https://issues.apache.org/jira/browse/MRELEASE-799 -->
<commonsLang3Version>3.8.1</commonsLang3Version>
<commonsIoVersion>2.6</commonsIoVersion>
- <doxiaVersion>1.8</doxiaVersion>
- <doxiaSitetoolsVersion>1.8.1</doxiaSitetoolsVersion>
+ <doxiaVersion>1.9</doxiaVersion>
+ <doxiaSitetoolsVersion>1.9</doxiaSitetoolsVersion>
<!-- maven-shared-utils:3.2.0+ another behavior - broke Surefire performance - end of subprocess notification not arrived in ForkStarter -->
<mavenSharedUtilsVersion>3.1.0</mavenSharedUtilsVersion>
<powermockVersion>2.0.2</powermockVersion>