This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch doxia-2.0.0 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 35813392d734b211fd73f0c3627effcc998c8788 Author: Michael Osipov <[email protected]> AuthorDate: Sun May 7 02:12:26 2023 +0200 Next shot --- .../surefire/report/SurefireReportRenderer.java | 58 ++++++---------------- .../surefire/report/SurefireReportTest.java | 2 +- .../surefire-260-testWithIdenticalNames/pom.xml | 4 +- 3 files changed, 19 insertions(+), 45 deletions(-) diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportRenderer.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportRenderer.java index 386dcdf8b..079eda152 100644 --- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportRenderer.java +++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportRenderer.java @@ -103,11 +103,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { public void renderBody() { javaScript(javascriptToggleDisplayCode()); - sink.section1(); - sink.sectionTitle1(); - sink.text(getTitle()); - sink.sectionTitle1_(); - sink.section1_(); + startSection(getTitle()); renderSectionSummary(); @@ -116,6 +112,8 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { renderSectionTestCases(); renderSectionFailureDetails(); + + endSection(); } private void renderSectionSummary() { @@ -124,11 +122,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { NumberFormat percentFormat = NumberFormat.getPercentInstance(locale); percentFormat.setMinimumFractionDigits(1); - sink.section1(); - sinkAnchor("Summary"); - sink.sectionTitle1(); - sink.text(getI18nString("surefire", "label.summary")); - sink.sectionTitle1_(); + startSection(getI18nString("surefire", "label.summary"), "Summary"); constructHotLinks(); @@ -162,7 +156,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { sink.lineBreak(); - sink.section1_(); + endSection(); } private void renderSectionPackages() { @@ -175,11 +169,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { NumberFormat percentFormat = NumberFormat.getPercentInstance(locale); percentFormat.setMinimumFractionDigits(1); - sink.section1(); - sinkAnchor("Package_List"); - sink.sectionTitle1(); - sink.text(getI18nString("surefire", "label.packagelist")); - sink.sectionTitle1_(); + startSection(getI18nString("surefire", "label.packagelist"), "Package_List"); constructHotLinks(); @@ -225,11 +215,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { List<ReportTestSuite> testSuiteList = entry.getValue(); - sink.section2(); - sinkAnchor(packageName); - sink.sectionTitle2(); - sink.text(packageName); - sink.sectionTitle2_(); + startSection(packageName); boolean showTable = false; @@ -264,12 +250,12 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { endTable(); } - sink.section2_(); + endSection(); } sink.lineBreak(); - sink.section1_(); + endSection(); } private void renderSectionTestSuite(ReportTestSuite suite) { @@ -322,11 +308,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { return; } - sink.section1(); - sinkAnchor("Test_Cases"); - sink.sectionTitle1(); - sink.text(getI18nString("surefire", "label.testcases")); - sink.sectionTitle1_(); + startSection(getI18nString("surefire", "label.testcases"), "Test_Cases"); constructHotLinks(); @@ -334,11 +316,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { List<ReportTestCase> testCases = suite.getTestCases(); if (!testCases.isEmpty()) { - sink.section2(); - sinkAnchor(suite.getPackageName() + '.' + suite.getName()); - sink.sectionTitle2(); - sink.text(suite.getName()); - sink.sectionTitle2_(); + startSection(suite.getName(), suite.getPackageName() + '.' + suite.getName()); boolean showTable = false; @@ -362,13 +340,13 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { endTable(); } - sink.section2_(); + endSection(); } } sink.lineBreak(); - sink.section1_(); + endSection(); } private void constructTestCaseSection(ReportTestCase testCase) { @@ -460,7 +438,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { } private String toHtmlId(String id) { - return DoxiaUtils.isValidId(id) ? id : DoxiaUtils.encodeId(id, true); + return DoxiaUtils.isValidId(id) ? id : DoxiaUtils.encodeId(id); } private void renderSectionFailureDetails() { @@ -469,11 +447,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { return; } - sink.section1(); - sinkAnchor("Failure_Details"); - sink.sectionTitle1(); - sink.text(getI18nString("surefire", "label.failuredetails")); - sink.sectionTitle1_(); + startSection(getI18nString("surefire", "label.failuredetails"), "Failure_Details"); constructHotLinks(); @@ -540,7 +514,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer { sink.lineBreak(); - sink.section1_(); + endSection(); } private void constructHotLinks() { diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportTest.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportTest.java index c06c03565..23be4d995 100644 --- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportTest.java +++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportTest.java @@ -611,6 +611,6 @@ public class SurefireReportTest extends AbstractMojoTestCase { assertTrue(report.exists()); String htmlContent = FileUtils.fileRead(report); - // assertTrue(htmlContent.contains("<h1><a name=\"Acceptance_Test\"></a>Acceptance Test</h1></section>")); + assertThat(htmlContent, containsString(toSystemNewLine("<section><a id=\"Acceptance_Test\"></a>\n<h1>Acceptance Test</h1>"))); } } diff --git a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml index 4bb71da60..54c809278 100644 --- a/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml +++ b/surefire-its/src/test/resources/surefire-260-testWithIdenticalNames/pom.xml @@ -57,7 +57,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.7.1</version> + <version>4.0.0-M8</version> </plugin> </plugins> </build> @@ -67,7 +67,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId> - <version>3.0.0</version> + <version>4.0.0-M1-SNAPSHOT</version> <configuration> <dependencyLocationsEnabled>false</dependencyLocationsEnabled> </configuration>
