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 2024/08/21 20:06:49 UTC
(maven-surefire) branch doxia-2.0.0 updated (2f14a7ee1 -> 05e4681f3)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
omit 2f14a7ee1 [SUREFIRE-2227] Dynamically calculate xrefTestLocation
omit 1110b988f [SUREFIRE-2228] Upgrade to Doxia 2.0.0 Milestone Stack
omit 1830625ce [SUREFIRE-2161] Align Mojo class names and output names
add c0784ab18 Bump org.apache.commons:commons-compress from 1.27.0 to 1.27.1
new 5e14d4fb4 [SUREFIRE-2161] Align Mojo class names and output names
new f1a419a14 [SUREFIRE-2228] Upgrade to Doxia 2.0.0 Milestone Stack
new 05e4681f3 [SUREFIRE-2227] Dynamically calculate xrefTestLocation
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 (2f14a7ee1)
\
N -- N -- N refs/heads/doxia-2.0.0 (05e4681f3)
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 3 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:
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(maven-surefire) 03/03: [SUREFIRE-2227] Dynamically calculate xrefTestLocation
Posted by mi...@apache.org.
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 05e4681f38f53c2a54b7671291ca02dc63586a98
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Nov 16 21:39:41 2023 +0100
[SUREFIRE-2227] Dynamically calculate xrefTestLocation
---
.../surefire/report/AbstractSurefireReport.java | 50 ++++++++++++----------
.../surefire/report/SurefireReportRenderer.java | 12 +++---
.../surefire/report/SurefireReportTest.java | 4 +-
.../surefire/report/stubs/EnclosedStub.java | 33 ++++++++++++++
.../report/stubs/EnclosedTrimStackTraceStub.java | 33 ++++++++++++++
.../surefire/report/stubs/NestedClassStub.java | 33 ++++++++++++++
.../stubs/NestedClassTrimStackTraceStub.java | 33 ++++++++++++++
.../surefire/report/stubs/SingleErrorStub.java | 33 ++++++++++++++
.../stubs/SurefireReportMavenProjectStub.java | 16 -------
.../plugin-config.xml | 2 +-
.../plugin-config.xml | 10 ++++-
.../plugin-config.xml | 10 ++++-
.../plugin-config.xml | 10 ++++-
.../basic-surefire-report-test/plugin-config.xml | 10 ++++-
.../plugin-config.xml | 10 ++++-
.../surefire-report-enclosed/plugin-config.xml | 10 ++++-
.../plugin-config.xml | 10 ++++-
.../surefire-report-nestedClass/plugin-config.xml | 10 ++++-
.../surefire-report-single-error/plugin-config.xml | 10 ++++-
19 files changed, 282 insertions(+), 57 deletions(-)
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
index d6f141f74..7025da05a 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
@@ -25,6 +25,7 @@ import java.net.URL;
import java.net.URLClassLoader;
import java.text.MessageFormat;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -32,6 +33,7 @@ import java.util.MissingResourceException;
import java.util.ResourceBundle;
import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.Reporting;
import org.apache.maven.plugin.surefire.log.api.ConsoleLogger;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
@@ -77,23 +79,19 @@ public abstract class AbstractSurefireReport extends AbstractMavenReport {
private File reportsDirectory;
/**
- * The projects in the reactor for aggregation report.
+ * Link the violation line numbers to the (Test) Source XRef. Links will be created automatically if the JXR plugin is
+ * being used.
*/
- @Parameter(defaultValue = "${reactorProjects}", readonly = true)
- private List<MavenProject> reactorProjects;
-
- /**
- * Link the failed tests line numbers to the source xref. Will link
- * automatically if Maven JXR plugin is being used.
- */
- @Parameter(defaultValue = "true", property = "linkXRef")
+ @Parameter(property = "linkXRef", defaultValue = "true")
private boolean linkXRef;
/**
- * Location of the Xrefs to link.
+ * Location where Test Source XRef is generated for this project.
+ * <br>
+ * <strong>Default</strong>: {@link #getReportOutputDirectory()} + {@code /xref-test}
*/
- @Parameter(defaultValue = "${project.reporting.outputDirectory}/xref-test")
- private File xrefLocation;
+ @Parameter
+ private File xrefTestLocation;
/**
* Whether to build an aggregated report at the root, or build individual reports.
@@ -156,7 +154,7 @@ public abstract class AbstractSurefireReport extends AbstractMavenReport {
locale,
getConsoleLogger(),
getReportsDirectories(),
- determineXrefLocation(),
+ constructXrefTestLocation(),
showSuccess);
r.render();
}
@@ -258,26 +256,28 @@ public abstract class AbstractSurefireReport extends AbstractMavenReport {
return result;
}
- private String determineXrefLocation() {
+ private String constructXrefTestLocation() {
String location = null;
-
if (linkXRef) {
+ File xrefTestLocation = getXrefTestLocation();
+
String relativePath = PathTool.getRelativePath(
- getReportOutputDirectory().getAbsolutePath(), xrefLocation.getAbsolutePath());
+ getReportOutputDirectory().getAbsolutePath(), xrefTestLocation.getAbsolutePath());
if (relativePath == null || relativePath.isEmpty()) {
relativePath = ".";
}
- relativePath = relativePath + "/" + xrefLocation.getName();
- if (xrefLocation.exists()) {
+ relativePath = relativePath + "/" + xrefTestLocation.getName();
+ if (xrefTestLocation.exists()) {
// XRef was already generated by manual execution of a lifecycle binding
location = relativePath;
} else {
// Not yet generated - check if the report is on its way
- for (Object o : project.getReportPlugins()) {
- ReportPlugin report = (ReportPlugin) o;
-
- String artifactId = report.getArtifactId();
- if ("maven-jxr-plugin".equals(artifactId) || "jxr-maven-plugin".equals(artifactId)) {
+ Reporting reporting = project.getModel().getReporting();
+ List<ReportPlugin> reportPlugins =
+ reporting != null ? reporting.getPlugins() : Collections.<ReportPlugin>emptyList();
+ for (ReportPlugin plugin : reportPlugins) {
+ String artifactId = plugin.getArtifactId();
+ if ("maven-jxr-plugin".equals(artifactId)) {
location = relativePath;
}
}
@@ -290,6 +290,10 @@ public abstract class AbstractSurefireReport extends AbstractMavenReport {
return location;
}
+ private File getXrefTestLocation() {
+ return xrefTestLocation != null ? xrefTestLocation : new File(getReportOutputDirectory(), "xref-test");
+ }
+
/**
* @param locale The locale
* @param key The key to search for
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 c9dafe73f..971902bd7 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
@@ -51,7 +51,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer {
private final SurefireReportParser parser;
private final List<ReportTestSuite> testSuites;
- private final String xrefLocation;
+ private final String xrefTestLocation;
private final boolean showSuccess;
public SurefireReportRenderer(
@@ -61,7 +61,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer {
Locale locale,
ConsoleLogger consoleLogger,
List<File> reportsDirectories,
- String xrefLocation,
+ String xrefTestLocation,
boolean showSuccess) {
super(sink);
this.i18n = i18n;
@@ -70,7 +70,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer {
parser = new SurefireReportParser(reportsDirectories, consoleLogger);
testSuites = parser.parseXMLReportFiles();
this.showSuccess = showSuccess;
- this.xrefLocation = xrefLocation;
+ this.xrefTestLocation = xrefTestLocation;
}
@Override
@@ -507,13 +507,13 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer {
String fullClassName = testCase.getFullClassName();
String errorLineNumber = testCase.getFailureErrorLine();
- if (xrefLocation != null) {
+ if (xrefTestLocation != null) {
String path = fullClassName.replace('.', '/');
- sink.link(xrefLocation + "/" + path + ".html#L" + errorLineNumber);
+ sink.link(xrefTestLocation + "/" + path + ".html#L" + errorLineNumber);
}
sink.text(fullClassName + ":" + errorLineNumber);
- if (xrefLocation != null) {
+ if (xrefTestLocation != null) {
sink.link_();
}
sink.unknown("div", TAG_TYPE_END, null);
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 df12fbedc..88edc4fc9 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
@@ -91,7 +91,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
boolean showSuccess = (Boolean) getVariableValueFromObject(mojo, "showSuccess");
File reportsDir = (File) getVariableValueFromObject(mojo, "reportsDirectory");
String outputName = (String) getVariableValueFromObject(mojo, "outputName");
- File xrefLocation = (File) getVariableValueFromObject(mojo, "xrefLocation");
+ File xrefTestLocation = (File) getVariableValueFromObject(mojo, "xrefTestLocation");
boolean linkXRef = (Boolean) getVariableValueFromObject(mojo, "linkXRef");
assertEquals(new File(getBasedir() + "/target/site/unit/basic-surefire-report-test"), outputDir);
@@ -103,7 +103,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertEquals("surefire", outputName);
assertEquals(
new File(getBasedir() + "/target/site/unit/basic-surefire-report-test/xref-test").getAbsolutePath(),
- xrefLocation.getAbsolutePath());
+ xrefTestLocation.getAbsolutePath());
assertTrue(linkXRef);
mojo.execute();
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedStub.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedStub.java
index bdcce6b04..af41e63ef 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedStub.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedStub.java
@@ -18,7 +18,40 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
public class EnclosedStub extends SurefireReportMavenProjectStub {
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
+
+ public EnclosedStub() {
+ MavenXpp3Reader pomReader = new MavenXpp3Reader();
+ Model model = null;
+
+ try (InputStream is = new FileInputStream(getFile())) {
+ model = pomReader.read(is);
+ setModel(model);
+ } catch (Exception e) {
+ }
+
+ setReportPlugins(model.getReporting().getPlugins());
+ }
+
+ public void setReportPlugins(List<ReportPlugin> plugins) {
+ this.reportPlugins = plugins;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public List<ReportPlugin> getReportPlugins() {
+ return reportPlugins;
+ }
@Override
protected String getProjectDirName() {
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedTrimStackTraceStub.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedTrimStackTraceStub.java
index f5ba0e74b..a4fb0169c 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedTrimStackTraceStub.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedTrimStackTraceStub.java
@@ -18,7 +18,40 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
public class EnclosedTrimStackTraceStub extends SurefireReportMavenProjectStub {
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
+
+ public EnclosedTrimStackTraceStub() {
+ MavenXpp3Reader pomReader = new MavenXpp3Reader();
+ Model model = null;
+
+ try (InputStream is = new FileInputStream(getFile())) {
+ model = pomReader.read(is);
+ setModel(model);
+ } catch (Exception e) {
+ }
+
+ setReportPlugins(model.getReporting().getPlugins());
+ }
+
+ public void setReportPlugins(List<ReportPlugin> plugins) {
+ this.reportPlugins = plugins;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public List<ReportPlugin> getReportPlugins() {
+ return reportPlugins;
+ }
@Override
protected String getProjectDirName() {
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassStub.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassStub.java
index 6f1547b37..2b80adc72 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassStub.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassStub.java
@@ -18,7 +18,40 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
public class NestedClassStub extends SurefireReportMavenProjectStub {
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
+
+ public NestedClassStub() {
+ MavenXpp3Reader pomReader = new MavenXpp3Reader();
+ Model model = null;
+
+ try (InputStream is = new FileInputStream(getFile())) {
+ model = pomReader.read(is);
+ setModel(model);
+ } catch (Exception e) {
+ }
+
+ setReportPlugins(model.getReporting().getPlugins());
+ }
+
+ public void setReportPlugins(List<ReportPlugin> plugins) {
+ this.reportPlugins = plugins;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public List<ReportPlugin> getReportPlugins() {
+ return reportPlugins;
+ }
@Override
protected String getProjectDirName() {
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassTrimStackTraceStub.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassTrimStackTraceStub.java
index 1a30076f5..1cebc2015 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassTrimStackTraceStub.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassTrimStackTraceStub.java
@@ -18,7 +18,40 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
public class NestedClassTrimStackTraceStub extends SurefireReportMavenProjectStub {
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
+
+ public NestedClassTrimStackTraceStub() {
+ MavenXpp3Reader pomReader = new MavenXpp3Reader();
+ Model model = null;
+
+ try (InputStream is = new FileInputStream(getFile())) {
+ model = pomReader.read(is);
+ setModel(model);
+ } catch (Exception e) {
+ }
+
+ setReportPlugins(model.getReporting().getPlugins());
+ }
+
+ public void setReportPlugins(List<ReportPlugin> plugins) {
+ this.reportPlugins = plugins;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public List<ReportPlugin> getReportPlugins() {
+ return reportPlugins;
+ }
@Override
protected String getProjectDirName() {
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SingleErrorStub.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SingleErrorStub.java
index 60e83182e..8bff72dc4 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SingleErrorStub.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SingleErrorStub.java
@@ -18,7 +18,40 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+
public class SingleErrorStub extends SurefireReportMavenProjectStub {
+ private List<ReportPlugin> reportPlugins = new ArrayList<>();
+
+ public SingleErrorStub() {
+ MavenXpp3Reader pomReader = new MavenXpp3Reader();
+ Model model = null;
+
+ try (InputStream is = new FileInputStream(getFile())) {
+ model = pomReader.read(is);
+ setModel(model);
+ } catch (Exception e) {
+ }
+
+ setReportPlugins(model.getReporting().getPlugins());
+ }
+
+ public void setReportPlugins(List<ReportPlugin> plugins) {
+ this.reportPlugins = plugins;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public List<ReportPlugin> getReportPlugins() {
+ return reportPlugins;
+ }
@Override
protected String getProjectDirName() {
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
index 952b6ff39..9f5606292 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
@@ -47,22 +47,6 @@ public abstract class SurefireReportMavenProjectStub extends MavenProjectStub {
return new File(getBasedir(), "plugin-config.xml");
}
- /**
- * {@inheritDoc}
- */
- @Override
- public List<ReportPlugin> getReportPlugins() {
- Reporting reporting = new Reporting();
-
- ReportPlugin reportPlugin = new ReportPlugin();
- reportPlugin.setGroupId("org.apache.maven.plugins");
- reportPlugin.setArtifactId("maven-jxr-plugin");
- reportPlugin.setVersion("2.0-SNAPSHOT");
- reporting.addPlugin(reportPlugin);
-
- return reporting.getPlugins();
- }
-
@Override
public List<ArtifactRepository> getRemoteArtifactRepositories() {
ArtifactRepository repository = new MavenArtifactRepository(
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
index 2e31083fc..9d7ec6d19 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
@@ -29,7 +29,7 @@
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-anchor-test-cases/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
- <xrefLocation>${basedir}/target/site/unit/basic-surefire-report-anchor-test-cases/xref-test</xrefLocation>
+ <xrefTestLocation>${basedir}/target/site/unit/basic-surefire-report-anchor-test-cases/xref-test</xrefTestLocation>
</configuration>
</plugin>
</plugins>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
index e4e34dede..d2526ef91 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-linkxref-false/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
- <xrefLocation>${basedir}/target/site/unit/basic-surefire-report-linkxref-false/xref-test</xrefLocation>
+ <xrefTestLocation>${basedir}/target/site/unit/basic-surefire-report-linkxref-false/xref-test</xrefTestLocation>
<linkXRef>false</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
index 76f2af455..a3d1cd244 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-reporting-null/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
- <xrefLocation>${basedir}/target/site/unit/basic-surefire-report-test/xref-test</xrefLocation>
+ <xrefTestLocation>${basedir}/target/site/unit/basic-surefire-report-test/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
index e00d008fd..bdc5e0503 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-success-false/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
- <xrefLocation>${basedir}/target/site/unit/basic-surefire-report-success-false/xref-test</xrefLocation>
+ <xrefTestLocation>${basedir}/target/site/unit/basic-surefire-report-success-false/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
index 1d469a52e..7a0491175 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-test/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
- <xrefLocation>${basedir}/target/site/unit/basic-surefire-report-test/xref-test</xrefLocation>
+ <xrefTestLocation>${basedir}/target/site/unit/basic-surefire-report-test/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
index fddf49aaa..b17f2e797 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
- <xrefLocation>${basedir}/target/site/unit/surefire-report-enclosed-trimStackTrace/xref-test</xrefLocation>
+ <xrefTestLocation>${basedir}/target/site/unit/surefire-report-enclosed-trimStackTrace/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
index 092107a52..c13c724b6 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-enclosed/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
- <xrefLocation>${basedir}/target/site/unit/surefire-report-enclosed/xref-test</xrefLocation>
+ <xrefTestLocation>${basedir}/target/site/unit/surefire-report-enclosed/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
index d4bf13fa7..873289b05 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
- <xrefLocation>${basedir}/target/site/unit/surefire-report-nestedClass-trimStackTrace/xref-test</xrefLocation>
+ <xrefTestLocation>${basedir}/target/site/unit/surefire-report-nestedClass-trimStackTrace/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
index 542475533..5940c18b9 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-nestedClass/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
- <xrefLocation>${basedir}/target/site/unit/surefire-report-nestedClass/xref-test</xrefLocation>
+ <xrefTestLocation>${basedir}/target/site/unit/surefire-report-nestedClass/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
index 045f0d93d..f097b1ad7 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
@@ -29,10 +29,18 @@
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-single-error/surefire-reports
</reportsDirectory>
<outputName>surefire</outputName>
- <xrefLocation>${basedir}/target/site/unit/surefire-report-single-error/xref-test</xrefLocation>
+ <xrefTestLocation>${basedir}/target/site/unit/surefire-report-single-error/xref-test</xrefTestLocation>
<linkXRef>true</linkXRef>
</configuration>
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
(maven-surefire) 01/03: [SUREFIRE-2161] Align Mojo class names and output names
Posted by mi...@apache.org.
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 5e14d4fb4ddf6e4ce4af0f6632398c7ba8df2325
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jan 2 15:23:55 2024 +0100
[SUREFIRE-2161] Align Mojo class names and output names
---
.../plugin/surefire/AbstractSurefireMojo.java | 1 -
.../{SurefirePlugin.java => SurefireMojo.java} | 2 +-
...refirePluginTest.java => SurefireMojoTest.java} | 52 +++++++++---------
...ReportMojo.java => AbstractSurefireReport.java} | 2 +-
...safeReportMojo.java => FailsafeOnlyReport.java} | 4 +-
...ReportOnlyMojo.java => SurefireOnlyReport.java} | 2 +-
...SurefireReportMojo.java => SurefireReport.java} | 4 +-
.../site/apt/examples/changing-report-name.apt.vm | 2 +-
.../plugins/surefire/report/JUnit4SuiteTest.java | 2 +-
...ReportMojoTest.java => SurefireReportTest.java} | 61 ++++++++++------------
...ub.java => SurefireReportMavenProjectStub.java} | 2 +-
...2.java => SurefireReportMavenProjectStub2.java} | 2 +-
.../plugin-config.xml | 4 +-
.../plugin-config.xml | 4 +-
.../plugin-config.xml | 4 +-
.../plugin-config.xml | 4 +-
.../basic-surefire-report-test/plugin-config.xml | 4 +-
.../resources/unit/surefire-1183/plugin-config.xml | 4 +-
.../plugin-config.xml | 4 +-
.../surefire-report-enclosed/plugin-config.xml | 4 +-
.../plugin-config.xml | 4 +-
.../surefire-report-nestedClass/plugin-config.xml | 4 +-
.../surefire-report-single-error/plugin-config.xml | 4 +-
.../maven/surefire/its/AggregateReportIT.java | 2 +-
.../surefire/its/CheckTestNgReportTestIT.java | 2 +-
.../Surefire1490ReportTitleDescriptionIT.java | 8 +--
.../jiras/Surefire260TestWithIdenticalNamesIT.java | 2 +-
.../Surefire570MultipleReportDirectoriesIT.java | 4 +-
.../its/jiras/Surefire740TruncatedCommaIT.java | 2 +-
.../its/jiras/Surefire772BothReportsIT.java | 12 ++---
.../its/jiras/Surefire772NoFailsafeReportsIT.java | 6 +--
.../its/jiras/Surefire772NoSurefireReportsIT.java | 16 +++---
.../its/jiras/Surefire772SpecifiedReportsIT.java | 12 ++---
33 files changed, 120 insertions(+), 126 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 094843123..aaa1cf2fb 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -160,7 +160,6 @@ import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.remov
* Abstract base class for running tests using Surefire.
*
* @author Stephen Connolly
- * @version $Id: SurefirePlugin.java 945065 2010-05-17 10:26:22Z stephenc $
*/
public abstract class AbstractSurefireMojo extends AbstractMojo implements SurefireExecutionParameters {
private static final Map<String, String> JAVA_9_MATCHER_OLD_NOTATION = singletonMap("version", "[1.9,)");
diff --git a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefireMojo.java
similarity index 99%
rename from maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
rename to maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefireMojo.java
index e2d9789f4..07406c557 100644
--- a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
+++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefireMojo.java
@@ -45,7 +45,7 @@ import static org.apache.maven.plugin.surefire.SurefireHelper.reportExecution;
defaultPhase = LifecyclePhase.TEST,
threadSafe = true,
requiresDependencyResolution = ResolutionScope.TEST)
-public class SurefirePlugin extends AbstractSurefireMojo implements SurefireReportParameters {
+public class SurefireMojo extends AbstractSurefireMojo implements SurefireReportParameters {
/**
* The directory containing generated classes of the project being tested. This will be included after the test
diff --git a/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java b/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefireMojoTest.java
similarity index 68%
rename from maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java
rename to maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefireMojoTest.java
index c5a0c3e63..74cc03802 100644
--- a/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefirePluginTest.java
+++ b/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefireMojoTest.java
@@ -31,26 +31,26 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
*
*/
-public class SurefirePluginTest extends TestCase {
+public class SurefireMojoTest extends TestCase {
@Rule
public final ExpectedException e = ExpectedException.none();
public void testDefaultIncludes() {
- assertThat(new SurefirePlugin().getDefaultIncludes())
+ assertThat(new SurefireMojo().getDefaultIncludes())
.containsOnly("**/Test*.java", "**/*Test.java", "**/*Tests.java", "**/*TestCase.java");
}
public void testReportSchemaLocation() {
- assertThat(new SurefirePlugin().getReportSchemaLocation())
+ assertThat(new SurefireMojo().getReportSchemaLocation())
.isEqualTo("https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report.xsd");
}
public void testFailIfNoTests() throws Exception {
RunResult runResult = new RunResult(0, 0, 0, 0);
try {
- SurefirePlugin plugin = new SurefirePlugin();
- plugin.setFailIfNoTests(true);
- plugin.handleSummary(runResult, null);
+ SurefireMojo mojo = new SurefireMojo();
+ mojo.setFailIfNoTests(true);
+ mojo.handleSummary(runResult, null);
} catch (MojoFailureException e) {
assertThat(e.getLocalizedMessage())
.isEqualTo("No tests were executed! (Set -DfailIfNoTests=false to ignore this error.)");
@@ -63,8 +63,8 @@ public class SurefirePluginTest extends TestCase {
public void testTestFailure() throws Exception {
RunResult runResult = new RunResult(1, 0, 1, 0);
try {
- SurefirePlugin plugin = new SurefirePlugin();
- plugin.handleSummary(runResult, null);
+ SurefireMojo mojo = new SurefireMojo();
+ mojo.handleSummary(runResult, null);
} catch (MojoFailureException e) {
assertThat(e.getLocalizedMessage())
.isEqualTo("There are test failures.\n\nPlease refer to null "
@@ -79,47 +79,47 @@ public class SurefirePluginTest extends TestCase {
}
public void testPluginName() {
- assertThat(new SurefirePlugin().getPluginName()).isEqualTo("surefire");
+ assertThat(new SurefireMojo().getPluginName()).isEqualTo("surefire");
}
public void testShouldGetNullEnv() {
- SurefirePlugin plugin = new SurefirePlugin();
- assertThat(plugin.getExcludedEnvironmentVariables()).hasSize(0);
+ SurefireMojo mojo = new SurefireMojo();
+ assertThat(mojo.getExcludedEnvironmentVariables()).hasSize(0);
}
public void testShouldGetEnv() {
- SurefirePlugin plugin = new SurefirePlugin();
- plugin.setExcludedEnvironmentVariables(new String[] {"ABC", "KLM"});
- assertThat(plugin.getExcludedEnvironmentVariables()).hasSize(2).contains("ABC", "KLM");
+ SurefireMojo mojo = new SurefireMojo();
+ mojo.setExcludedEnvironmentVariables(new String[] {"ABC", "KLM"});
+ assertThat(mojo.getExcludedEnvironmentVariables()).hasSize(2).contains("ABC", "KLM");
}
public void testShouldGetPropertyFile() {
- SurefirePlugin plugin = new SurefirePlugin();
- plugin.setSystemPropertiesFile(new File("testShouldGetPropertyFile"));
- assertThat(plugin.getSystemPropertiesFile()).isEqualTo(new File("testShouldGetPropertyFile"));
+ SurefireMojo mojo = new SurefireMojo();
+ mojo.setSystemPropertiesFile(new File("testShouldGetPropertyFile"));
+ assertThat(mojo.getSystemPropertiesFile()).isEqualTo(new File("testShouldGetPropertyFile"));
}
public void testNegativeFailOnFlakeCount() {
- SurefirePlugin plugin = new SurefirePlugin();
- plugin.setFailOnFlakeCount(-1);
+ SurefireMojo mojo = new SurefireMojo();
+ mojo.setFailOnFlakeCount(-1);
e.expect(MojoFailureException.class);
e.expectMessage("Parameter \"failOnFlakeCount\" should not be negative.");
}
public void testFailOnFlakeCountWithoutRerun() {
- SurefirePlugin plugin = new SurefirePlugin();
- plugin.setFailOnFlakeCount(1);
+ SurefireMojo mojo = new SurefireMojo();
+ mojo.setFailOnFlakeCount(1);
e.expect(MojoFailureException.class);
e.expectMessage("\"failOnFlakeCount\" requires rerunFailingTestsCount to be at least 1.");
}
public void testShouldHaveJUnit5EnginesFilter() {
- SurefirePlugin plugin = new SurefirePlugin();
+ SurefireMojo mojo = new SurefireMojo();
- plugin.setIncludeJUnit5Engines(new String[] {"e1", "e2"});
- assertThat(plugin.getIncludeJUnit5Engines()).isEqualTo(new String[] {"e1", "e2"});
+ mojo.setIncludeJUnit5Engines(new String[] {"e1", "e2"});
+ assertThat(mojo.getIncludeJUnit5Engines()).isEqualTo(new String[] {"e1", "e2"});
- plugin.setExcludeJUnit5Engines(new String[] {"e1", "e2"});
- assertThat(plugin.getExcludeJUnit5Engines()).isEqualTo(new String[] {"e1", "e2"});
+ mojo.setExcludeJUnit5Engines(new String[] {"e1", "e2"});
+ assertThat(mojo.getExcludeJUnit5Engines()).isEqualTo(new String[] {"e1", "e2"});
}
}
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
similarity index 99%
rename from maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
rename to maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
index ad0b22dea..5ad5dc663 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReportMojo.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
@@ -55,7 +55,7 @@ import static org.apache.maven.plugins.surefire.report.SurefireReportParser.hasR
*
* @author Stephen Connolly
*/
-public abstract class AbstractSurefireReportMojo extends AbstractMavenReport {
+public abstract class AbstractSurefireReport extends AbstractMavenReport {
/**
* If set to false, only failures are shown.
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeOnlyReport.java
similarity index 94%
rename from maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
rename to maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeOnlyReport.java
index 9e889cd66..7e6b20840 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeReportMojo.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeOnlyReport.java
@@ -35,12 +35,12 @@ import org.apache.maven.project.MavenProject;
*/
@Mojo(name = "failsafe-report-only")
@SuppressWarnings("unused")
-public class FailsafeReportMojo extends AbstractSurefireReportMojo {
+public class FailsafeOnlyReport extends AbstractSurefireReport {
/**
* The filename to use for the report.
*/
- @Parameter(defaultValue = "failsafe-report", property = "outputName", required = true)
+ @Parameter(defaultValue = "failsafe", property = "outputName", required = true)
private String outputName;
/**
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireOnlyReport.java
similarity index 95%
rename from maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java
rename to maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireOnlyReport.java
index ec60196e3..d523e9769 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportOnlyMojo.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireOnlyReport.java
@@ -34,4 +34,4 @@ import org.apache.maven.plugins.annotations.Mojo;
@Mojo(name = "report-only")
@Execute(phase = LifecyclePhase.NONE)
@SuppressWarnings("unused")
-public class SurefireReportOnlyMojo extends SurefireReportMojo {}
+public class SurefireOnlyReport extends SurefireReport {}
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReport.java
similarity index 94%
rename from maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
rename to maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReport.java
index 78a096fd7..1405ba9c9 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReport.java
@@ -34,12 +34,12 @@ import org.apache.maven.project.MavenProject;
@Mojo(name = "report", inheritByDefault = false)
@Execute(lifecycle = "surefire", phase = LifecyclePhase.TEST)
@SuppressWarnings("unused")
-public class SurefireReportMojo extends AbstractSurefireReportMojo {
+public class SurefireReport extends AbstractSurefireReport {
/**
* The filename to use for the report.
*/
- @Parameter(defaultValue = "surefire-report", property = "outputName", required = true)
+ @Parameter(defaultValue = "surefire", property = "outputName", required = true)
private String outputName;
/**
diff --git a/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt.vm b/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt.vm
index de9e8b5e2..59b404d23 100644
--- a/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt.vm
+++ b/maven-surefire-report-plugin/src/site/apt/examples/changing-report-name.apt.vm
@@ -26,7 +26,7 @@
Changing the Report Name
In order to configure the file name of the generated report (which is
- "<surefire-report>" by default), the <<outputName>> property should
+ "<<<surefire>>>" by default), the <<<outputName>>> property should
be set to the desired name.
+----+
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/JUnit4SuiteTest.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/JUnit4SuiteTest.java
index 74df21fec..fc1eaefd3 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/JUnit4SuiteTest.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/JUnit4SuiteTest.java
@@ -34,7 +34,7 @@ public class JUnit4SuiteTest extends TestCase {
TestSuite suite = new TestSuite();
suite.addTest(new JUnit4TestAdapter(Surefire597Test.class));
suite.addTest(new JUnit4TestAdapter(SurefireSchemaValidationTest.class));
- suite.addTestSuite(SurefireReportMojoTest.class);
+ suite.addTestSuite(SurefireReportTest.class);
return suite;
}
}
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/SurefireReportTest.java
similarity index 94%
rename from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java
rename to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportTest.java
index 8dab21e86..3da193a92 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/SurefireReportTest.java
@@ -42,7 +42,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
*/
@SuppressWarnings("checkstyle:linelength")
-public class SurefireReportMojoTest extends AbstractMojoTestCase {
+public class SurefireReportTest extends AbstractMojoTestCase {
private ArtifactStubFactory artifactStubFactory;
// Can be removed with Doxia 2.0.0
@@ -64,8 +64,8 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
super.tearDown();
}
- protected SurefireReportMojo createReportMojo(File pluginXmlFile) throws Exception {
- SurefireReportMojo mojo = (SurefireReportMojo) lookupMojo("report", pluginXmlFile);
+ protected SurefireReport createReportMojo(File pluginXmlFile) throws Exception {
+ SurefireReport mojo = (SurefireReport) lookupMojo("report", pluginXmlFile);
assertNotNull("Mojo found.", mojo);
LegacySupport legacySupport = lookup(LegacySupport.class);
@@ -82,7 +82,7 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
public void testBasicSurefireReport() throws Exception {
File testPom = new File(getUnitBaseDir(), "basic-surefire-report-test/plugin-config.xml");
- SurefireReportMojo mojo = createReportMojo(testPom);
+ SurefireReport mojo = createReportMojo(testPom);
File outputDir = (File) getVariableValueFromObject(mojo, "outputDirectory");
boolean showSuccess = (Boolean) getVariableValueFromObject(mojo, "showSuccess");
File reportsDir = (File) getVariableValueFromObject(mojo, "reportsDirectory");
@@ -96,14 +96,14 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
new File(getBasedir() + "/src/test/resources/unit/basic-surefire-report-test/surefire-reports")
.getAbsolutePath(),
reportsDir.getAbsolutePath());
- assertEquals("surefire-report", outputName);
+ assertEquals("surefire", outputName);
assertEquals(
new File(getBasedir() + "/target/site/unit/basic-surefire-report-test/xref-test").getAbsolutePath(),
xrefLocation.getAbsolutePath());
assertTrue(linkXRef);
mojo.execute();
- File report = new File(getBasedir(), "target/site/unit/basic-surefire-report-test/surefire-report.html");
+ File report = new File(getBasedir(), "target/site/unit/basic-surefire-report-test/surefire.html");
assertTrue(report.exists());
String htmlContent = FileUtils.fileRead(report);
@@ -119,12 +119,11 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
public void testBasicSurefireReportIfShowSuccessIsFalse() throws Exception {
File testPom = new File(getUnitBaseDir(), "basic-surefire-report-success-false/plugin-config.xml");
- SurefireReportMojo mojo = createReportMojo(testPom);
+ SurefireReport mojo = createReportMojo(testPom);
boolean showSuccess = (Boolean) getVariableValueFromObject(mojo, "showSuccess");
assertFalse(showSuccess);
mojo.execute();
- File report =
- new File(getBasedir(), "target/site/unit/basic-surefire-report-success-false/surefire-report.html");
+ File report = new File(getBasedir(), "target/site/unit/basic-surefire-report-success-false/surefire.html");
assertTrue(report.exists());
String htmlContent = FileUtils.fileRead(report);
@@ -134,12 +133,11 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
public void testBasicSurefireReportIfLinkXrefIsFalse() throws Exception {
File testPom = new File(getUnitBaseDir(), "basic-surefire-report-linkxref-false/plugin-config.xml");
- SurefireReportMojo mojo = createReportMojo(testPom);
+ SurefireReport mojo = createReportMojo(testPom);
boolean linkXRef = (Boolean) getVariableValueFromObject(mojo, "linkXRef");
assertFalse(linkXRef);
mojo.execute();
- File report =
- new File(getBasedir(), "target/site/unit/basic-surefire-report-linkxref-false/surefire-report.html");
+ File report = new File(getBasedir(), "target/site/unit/basic-surefire-report-linkxref-false/surefire.html");
assertTrue(report.exists());
String htmlContent = FileUtils.fileRead(report);
@@ -149,10 +147,9 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
public void testBasicSurefireReportIfReportingIsNull() throws Exception {
File testPom = new File(getUnitBaseDir(), "basic-surefire-report-reporting-null/plugin-config.xml");
- SurefireReportMojo mojo = createReportMojo(testPom);
+ SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
- File report =
- new File(getBasedir(), "target/site/unit/basic-surefire-report-reporting-null/surefire-report.html");
+ File report = new File(getBasedir(), "target/site/unit/basic-surefire-report-reporting-null/surefire.html");
assertTrue(report.exists());
String htmlContent = FileUtils.fileRead(report);
@@ -163,10 +160,9 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
@SuppressWarnings("checkstyle:methodname")
public void testBasicSurefireReport_AnchorTestCases() throws Exception {
File testPom = new File(getUnitBaseDir(), "basic-surefire-report-anchor-test-cases/plugin-config.xml");
- SurefireReportMojo mojo = createReportMojo(testPom);
+ SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
- File report =
- new File(getBasedir(), "target/site/unit/basic-surefire-report-anchor-test-cases/surefire-report.html");
+ File report = new File(getBasedir(), "target/site/unit/basic-surefire-report-anchor-test-cases/surefire.html");
assertTrue(report.exists());
String htmlContent = FileUtils.fileRead(report);
@@ -180,9 +176,9 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
public void testSurefireReportSingleError() throws Exception {
File testPom = new File(getUnitBaseDir(), "surefire-report-single-error/plugin-config.xml");
- SurefireReportMojo mojo = createReportMojo(testPom);
+ SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
- File report = new File(getBasedir(), "target/site/unit/surefire-report-single-error/surefire-report.html");
+ File report = new File(getBasedir(), "target/site/unit/surefire-report-single-error/surefire.html");
assertTrue(report.exists());
String htmlContent = FileUtils.fileRead(report);
@@ -267,10 +263,10 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
public void testSurefireReportNestedClassTrimStackTrace() throws Exception {
File testPom = new File(getUnitBaseDir(), "surefire-report-nestedClass-trimStackTrace/plugin-config.xml");
- SurefireReportMojo mojo = createReportMojo(testPom);
+ SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
- File report = new File(
- getBasedir(), "target/site/unit/surefire-report-nestedClass-trimStackTrace/surefire-report.html");
+ File report =
+ new File(getBasedir(), "target/site/unit/surefire-report-nestedClass-trimStackTrace/surefire.html");
assertTrue(report.exists());
String htmlContent = FileUtils.fileRead(report);
@@ -331,9 +327,9 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
public void testSurefireReportNestedClass() throws Exception {
File testPom = new File(getUnitBaseDir(), "surefire-report-nestedClass/plugin-config.xml");
- SurefireReportMojo mojo = createReportMojo(testPom);
+ SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
- File report = new File(getBasedir(), "target/site/unit/surefire-report-nestedClass/surefire-report.html");
+ File report = new File(getBasedir(), "target/site/unit/surefire-report-nestedClass/surefire.html");
assertTrue(report.exists());
String htmlContent = FileUtils.fileRead(report);
@@ -418,10 +414,9 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
public void testSurefireReportEnclosedTrimStackTrace() throws Exception {
File testPom = new File(getUnitBaseDir(), "surefire-report-enclosed-trimStackTrace/plugin-config.xml");
- SurefireReportMojo mojo = createReportMojo(testPom);
+ SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
- File report =
- new File(getBasedir(), "target/site/unit/surefire-report-enclosed-trimStackTrace/surefire-report.html");
+ File report = new File(getBasedir(), "target/site/unit/surefire-report-enclosed-trimStackTrace/surefire.html");
assertTrue(report.exists());
String htmlContent = FileUtils.fileRead(report);
@@ -482,9 +477,9 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
public void testSurefireReportEnclosed() throws Exception {
File testPom = new File(getUnitBaseDir(), "surefire-report-enclosed/plugin-config.xml");
- SurefireReportMojo mojo = createReportMojo(testPom);
+ SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
- File report = new File(getBasedir(), "target/site/unit/surefire-report-enclosed/surefire-report.html");
+ File report = new File(getBasedir(), "target/site/unit/surefire-report-enclosed/surefire.html");
assertTrue(report.exists());
String htmlContent = FileUtils.fileRead(report);
@@ -579,7 +574,7 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
public void testCustomTitleAndDescriptionReport() throws Exception {
File testPom = new File(getUnitBaseDir(), "surefire-1183/plugin-config.xml");
- SurefireReportMojo mojo = createReportMojo(testPom);
+ SurefireReport mojo = createReportMojo(testPom);
File outputDir = (File) getVariableValueFromObject(mojo, "outputDirectory");
String outputName = (String) getVariableValueFromObject(mojo, "outputName");
@@ -590,11 +585,11 @@ public class SurefireReportMojoTest extends AbstractMojoTestCase {
new File(getBasedir() + "/src/test/resources/unit/surefire-1183/acceptancetest-reports")
.getAbsolutePath(),
reportsDir.getAbsolutePath());
- assertEquals("acceptance-test-report", outputName);
+ assertEquals("acceptance-test", outputName);
mojo.execute();
- File report = new File(getBasedir(), "target/site/unit/surefire-1183/acceptance-test-report.html");
+ File report = new File(getBasedir(), "target/site/unit/surefire-1183/acceptance-test.html");
assertTrue(report.exists());
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
similarity index 97%
rename from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java
rename to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
index bd4497c24..de27f52f8 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
@@ -33,7 +33,7 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
*/
-public class SurefireRepMavenProjectStub extends MavenProjectStub {
+public class SurefireReportMavenProjectStub extends MavenProjectStub {
/**
* {@inheritDoc}
*/
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
similarity index 94%
rename from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java
rename to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
index 9365879e4..1e4a58d6e 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireRepMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
@@ -27,7 +27,7 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
*/
-public class SurefireRepMavenProjectStub2 extends MavenProjectStub {
+public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
/**
* {@inheritDoc}
*/
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
index 3045dce6d..e94305364 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
@@ -25,11 +25,11 @@
<configuration>
<outputDirectory>${basedir}/target/site/unit/basic-surefire-report-anchor-test-cases</outputDirectory>
<localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireRepMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-anchor-test-cases/surefire-reports
</reportsDirectory>
- <outputName>surefire-report</outputName>
+ <outputName>surefire</outputName>
<xrefLocation>${basedir}/target/site/unit/basic-surefire-report-anchor-test-cases/xref-test</xrefLocation>
</configuration>
</plugin>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
index e0586aad1..d175839c6 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
@@ -25,11 +25,11 @@
<configuration>
<outputDirectory>${basedir}/target/site/unit/basic-surefire-report-linkxref-false</outputDirectory>
<localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireRepMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-linkxref-false/surefire-reports
</reportsDirectory>
- <outputName>surefire-report</outputName>
+ <outputName>surefire</outputName>
<xrefLocation>${basedir}/target/site/unit/basic-surefire-report-linkxref-false/xref-test</xrefLocation>
<linkXRef>false</linkXRef>
</configuration>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
index 8aca877bd..dfe6b6767 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
@@ -25,11 +25,11 @@
<configuration>
<outputDirectory>${basedir}/target/site/unit/basic-surefire-report-reporting-null</outputDirectory>
<localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireRepMavenProjectStub2"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub2"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-reporting-null/surefire-reports
</reportsDirectory>
- <outputName>surefire-report</outputName>
+ <outputName>surefire</outputName>
<xrefLocation>${basedir}/target/site/unit/basic-surefire-report-test/xref-test</xrefLocation>
<linkXRef>true</linkXRef>
</configuration>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
index c79859112..eae36a008 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
@@ -25,11 +25,11 @@
<configuration>
<outputDirectory>${basedir}/target/site/unit/basic-surefire-report-success-false</outputDirectory>
<localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireRepMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
<showSuccess>false</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-success-false/surefire-reports
</reportsDirectory>
- <outputName>surefire-report</outputName>
+ <outputName>surefire</outputName>
<xrefLocation>${basedir}/target/site/unit/basic-surefire-report-success-false/xref-test</xrefLocation>
<linkXRef>true</linkXRef>
</configuration>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
index 81e59caf1..08cc7a39e 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
@@ -25,11 +25,11 @@
<configuration>
<outputDirectory>${basedir}/target/site/unit/basic-surefire-report-test</outputDirectory>
<localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireRepMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-test/surefire-reports
</reportsDirectory>
- <outputName>surefire-report</outputName>
+ <outputName>surefire</outputName>
<xrefLocation>${basedir}/target/site/unit/basic-surefire-report-test/xref-test</xrefLocation>
<linkXRef>true</linkXRef>
</configuration>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-1183/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-1183/plugin-config.xml
index 108f58350..2a4c04a0b 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-1183/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-1183/plugin-config.xml
@@ -25,8 +25,8 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<project
- implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireRepMavenProjectStub"/>
- <outputName>acceptance-test-report</outputName>
+ implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
+ <outputName>acceptance-test</outputName>
<localRepository>${localRepository}</localRepository>
<customBundle>${basedir}/src/test/resources/unit/surefire-1183/src/site/custom/surefire-report.properties</customBundle>
<outputDirectory>${basedir}/target/site/unit/surefire-1183</outputDirectory>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
index 981bb1882..492c62a3b 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
@@ -25,11 +25,11 @@
<configuration>
<outputDirectory>${basedir}/target/site/unit/surefire-report-enclosed-trimStackTrace</outputDirectory>
<localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireRepMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/surefire-reports
</reportsDirectory>
- <outputName>surefire-report</outputName>
+ <outputName>surefire</outputName>
<xrefLocation>${basedir}/target/site/unit/surefire-report-enclosed-trimStackTrace/xref-test</xrefLocation>
<linkXRef>true</linkXRef>
</configuration>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
index 26bae34ab..25527c370 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
@@ -25,11 +25,11 @@
<configuration>
<outputDirectory>${basedir}/target/site/unit/surefire-report-enclosed</outputDirectory>
<localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireRepMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-enclosed/surefire-reports
</reportsDirectory>
- <outputName>surefire-report</outputName>
+ <outputName>surefire</outputName>
<xrefLocation>${basedir}/target/site/unit/surefire-report-enclosed/xref-test</xrefLocation>
<linkXRef>true</linkXRef>
</configuration>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
index dcf6a9a72..ce9bc4971 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
@@ -25,11 +25,11 @@
<configuration>
<outputDirectory>${basedir}/target/site/unit/surefire-report-nestedClass-trimStackTrace</outputDirectory>
<localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireRepMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/surefire-reports
</reportsDirectory>
- <outputName>surefire-report</outputName>
+ <outputName>surefire</outputName>
<xrefLocation>${basedir}/target/site/unit/surefire-report-nestedClass-trimStackTrace/xref-test</xrefLocation>
<linkXRef>true</linkXRef>
</configuration>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
index 86ff4639b..27302b0a9 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
@@ -25,11 +25,11 @@
<configuration>
<outputDirectory>${basedir}/target/site/unit/surefire-report-nestedClass</outputDirectory>
<localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireRepMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-nestedClass/surefire-reports
</reportsDirectory>
- <outputName>surefire-report</outputName>
+ <outputName>surefire</outputName>
<xrefLocation>${basedir}/target/site/unit/surefire-report-nestedClass/xref-test</xrefLocation>
<linkXRef>true</linkXRef>
</configuration>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
index e8a3f5889..70767d4b4 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
@@ -25,11 +25,11 @@
<configuration>
<outputDirectory>${basedir}/target/site/unit/surefire-report-single-error</outputDirectory>
<localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireRepMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-single-error/surefire-reports
</reportsDirectory>
- <outputName>surefire-report</outputName>
+ <outputName>surefire</outputName>
<xrefLocation>${basedir}/target/site/unit/surefire-report-single-error/xref-test</xrefLocation>
<linkXRef>true</linkXRef>
</configuration>
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
index 68676a807..8a5293faa 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
@@ -42,7 +42,7 @@ public class AggregateReportIT extends SurefireJUnit4IntegrationTestCase {
public void aggregateReport() {
OutputValidator outputValidator =
unpack("/aggregate-report").addSurefireReportGoal().executeCurrentGoals();
- TestFile surefireReportHtml = outputValidator.getSiteFile("surefire-report.html");
+ TestFile surefireReportHtml = outputValidator.getSiteFile("surefire.html");
assertTrue("surefire report missing: " + surefireReportHtml.getAbsolutePath(), surefireReportHtml.exists());
// TODO HtmlUnit tests on the surefire report
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
index ddf01f500..30aaefcf3 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
@@ -38,7 +38,7 @@ public class CheckTestNgReportTestIT extends SurefireJUnit4IntegrationTestCase {
.addSurefireReportGoal()
.executeCurrentGoals()
.verifyErrorFree(3)
- .getSiteFile("surefire-report.html")
+ .getSiteFile("surefire.html")
.assertFileExists();
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1490ReportTitleDescriptionIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1490ReportTitleDescriptionIT.java
index 903a2e55f..e49aa4624 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1490ReportTitleDescriptionIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1490ReportTitleDescriptionIT.java
@@ -42,12 +42,12 @@ public class Surefire1490ReportTitleDescriptionIT extends SurefireJUnit4Integrat
.assertContainsText("Report on the integration test results of the project.");
validator
- .getSiteFile("failsafe-report.html")
+ .getSiteFile("failsafe.html")
.assertContainsText("Failsafe Report")
.assertContainsText("Surefire1490IT");
validator
- .getSiteFile("surefire-report.html")
+ .getSiteFile("surefire.html")
.assertContainsText("Surefire Report")
.assertContainsText("Surefire1490Test");
}
@@ -65,12 +65,12 @@ public class Surefire1490ReportTitleDescriptionIT extends SurefireJUnit4Integrat
.assertContainsText("failsafe desc");
validator
- .getSiteFile("failsafe-report.html")
+ .getSiteFile("failsafe.html")
.assertContainsText("failsafe title")
.assertContainsText("Surefire1490IT");
validator
- .getSiteFile("surefire-report.html")
+ .getSiteFile("surefire.html")
.assertContainsText("surefire title")
.assertContainsText("Surefire1490Test");
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
index 981bfd02c..07e6da39c 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
@@ -50,7 +50,7 @@ public class Surefire260TestWithIdenticalNamesIT extends SurefireJUnit4Integrati
.addSurefireReportGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile("surefire.html");
final URI uri = siteFile.toURI();
try (WebClient webClient = new WebClient()) {
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
index 25b76e2ca..95a980930 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
@@ -38,7 +38,7 @@ public class Surefire570MultipleReportDirectoriesIT extends SurefireJUnit4Integr
surefireLauncher.executeTest();
surefireLauncher.addGoal("-Daggregate=true");
OutputValidator validator = surefireLauncher.executeSurefireReport();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile("surefire.html");
siteFile.assertContainsText("MyModule1ClassTest");
siteFile.assertContainsText("MyModule2ClassTest");
siteFile.assertContainsText("MyDummyClassM1Test");
@@ -51,7 +51,7 @@ public class Surefire570MultipleReportDirectoriesIT extends SurefireJUnit4Integr
surefireLauncher.reset();
surefireLauncher.executeSurefireReport();
OutputValidator module1 = surefireLauncher.getSubProjectValidator("module1");
- TestFile siteFile = module1.getSiteFile("surefire-report.html");
+ TestFile siteFile = module1.getSiteFile("surefire.html");
siteFile.assertContainsText("MyModule1ClassTest");
siteFile.assertContainsText("MyDummyClassM1Test");
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
index a74ed027e..78340ce3b 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
@@ -39,7 +39,7 @@ public class Surefire740TruncatedCommaIT extends SurefireJUnit4IntegrationTestCa
.addSurefireReportGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile("surefire.html");
assertTrue("Expecting file", siteFile.exists());
siteFile.assertContainsText("027"); // Avoid asserting with the "," or "." ;)
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
index 10bf88dce..5042988ad 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
@@ -45,10 +45,10 @@ public class Surefire772BothReportsIT extends SurefireJUnit4IntegrationTestCase
OutputValidator outputValidator =
unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = outputValidator.getSiteFile("surefire-report.html");
+ TestFile siteFile = outputValidator.getSiteFile("surefire.html");
assertTrue("Expecting surefire report file", siteFile.isFile());
- siteFile = outputValidator.getSiteFile("failsafe-report.html");
+ siteFile = outputValidator.getSiteFile("failsafe.html");
assertTrue("Expecting failsafe report file", siteFile.isFile());
}
@@ -59,10 +59,10 @@ public class Surefire772BothReportsIT extends SurefireJUnit4IntegrationTestCase
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile("surefire.html");
assertTrue("Expecting surefire report file", siteFile.isFile());
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile("failsafe.html");
assertFalse("Expecting no failsafe report file", siteFile.isFile());
}
@@ -74,10 +74,10 @@ public class Surefire772BothReportsIT extends SurefireJUnit4IntegrationTestCase
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile("surefire.html");
assertFalse("Expecting no surefire report file", siteFile.isFile());
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile("failsafe.html");
assertTrue("Expecting failsafe report file", siteFile.isFile());
}
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
index adce8ef2f..aa4bd21b6 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
@@ -77,17 +77,17 @@ public class Surefire772NoFailsafeReportsIT extends SurefireJUnit4IntegrationTes
}
private void assertNoFailsefeReport(OutputValidator site) {
- TestFile siteFile = site.getSiteFile("failsafe-report.html");
+ TestFile siteFile = site.getSiteFile("failsafe.html");
assertFalse("Expecting no failsafe report file", siteFile.isFile());
}
private void assertFailsafeReport(OutputValidator site) {
- TestFile siteFile = site.getSiteFile("failsafe-report.html");
+ TestFile siteFile = site.getSiteFile("failsafe.html");
assertTrue("Expecting no failsafe report file", siteFile.isFile());
}
private void assertSurefireReportPresent(OutputValidator site) {
- TestFile siteFile = site.getSiteFile("surefire-report.html");
+ TestFile siteFile = site.getSiteFile("surefire.html");
assertTrue("Expecting surefire report file", siteFile.isFile());
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
index a34bd5112..845909210 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
@@ -38,10 +38,10 @@ public class Surefire772NoSurefireReportsIT extends SurefireJUnit4IntegrationTes
OutputValidator validator =
unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile("surefire.html");
assertTrue("Expecting surefire report file", siteFile.isFile());
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile("failsafe.html");
assertTrue("Expecting failsafe report file", siteFile.isFile());
}
@@ -52,10 +52,10 @@ public class Surefire772NoSurefireReportsIT extends SurefireJUnit4IntegrationTes
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile("surefire.html");
assertFalse("Expecting no surefire report file", siteFile.isFile());
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile("failsafe.html");
assertTrue("Expecting failsafe report file", siteFile.isFile());
}
@@ -66,10 +66,10 @@ public class Surefire772NoSurefireReportsIT extends SurefireJUnit4IntegrationTes
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile("surefire.html");
assertFalse("Expecting no surefire report file", siteFile.isFile());
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile("failsafe.html");
assertTrue("Expecting failsafe report file", siteFile.isFile());
}
@@ -81,10 +81,10 @@ public class Surefire772NoSurefireReportsIT extends SurefireJUnit4IntegrationTes
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile("surefire.html");
assertFalse("Expecting no surefire report file", siteFile.isFile());
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile("failsafe.html");
assertTrue("Expecting failsafe report file", siteFile.isFile());
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
index 6c57ae8c2..fc37d7b6f 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
@@ -38,10 +38,10 @@ public class Surefire772SpecifiedReportsIT extends SurefireJUnit4IntegrationTest
OutputValidator validator =
unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile("surefire.html");
assertTrue("Expecting surefire report file", siteFile.isFile());
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile("failsafe.html");
assertTrue("Expecting failsafe report file", siteFile.isFile());
}
@@ -52,10 +52,10 @@ public class Surefire772SpecifiedReportsIT extends SurefireJUnit4IntegrationTest
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile("surefire.html");
assertTrue("Expecting surefire report file", siteFile.isFile());
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile("failsafe.html");
assertFalse("Expecting no failsafe report file", siteFile.isFile());
}
@@ -66,10 +66,10 @@ public class Surefire772SpecifiedReportsIT extends SurefireJUnit4IntegrationTest
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire-report.html");
+ TestFile siteFile = validator.getSiteFile("surefire.html");
assertFalse("Expecting no surefire report file", siteFile.isFile());
- siteFile = validator.getSiteFile("failsafe-report.html");
+ siteFile = validator.getSiteFile("failsafe.html");
assertTrue("Expecting failsafe report file", siteFile.isFile());
}
(maven-surefire) 02/03: [SUREFIRE-2228] Upgrade to Doxia 2.0.0 Milestone Stack
Posted by mi...@apache.org.
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 f1a419a1457e5a83f9deb07a700a1376487f72ed
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 7 01:34:04 2023 +0200
[SUREFIRE-2228] Upgrade to Doxia 2.0.0 Milestone Stack
This closes #629
---
maven-surefire-report-plugin/pom.xml | 7 +-
.../surefire/report/AbstractSurefireReport.java | 14 ++-
.../surefire/report/FailsafeOnlyReport.java | 2 +-
.../surefire/report/SurefireReportRenderer.java | 66 ++++-------
.../src/site/apt/usage.apt.vm | 2 +-
.../plugins/surefire/report/Surefire597Test.java | 22 ++--
.../surefire/report/SurefireReportTest.java | 122 ++++++++++++---------
...nProjectStub2.java => AnchorTestCasesStub.java} | 17 +--
...ortMavenProjectStub2.java => EnclosedStub.java} | 17 +--
...tStub2.java => EnclosedTrimStackTraceStub.java} | 17 +--
...venProjectStub2.java => LinkXrefFalseStub.java} | 17 +--
...MavenProjectStub2.java => NestedClassStub.java} | 17 +--
...ub2.java => NestedClassTrimStackTraceStub.java} | 17 +--
...tMavenProjectStub2.java => ReportTestStub.java} | 17 +--
...venProjectStub2.java => ReportingNullStub.java} | 8 +-
...MavenProjectStub2.java => SingleErrorStub.java} | 17 +--
...avenProjectStub2.java => SuccessFalseStub.java} | 17 +--
...avenProjectStub2.java => Surefire1183Stub.java} | 17 +--
.../stubs/SurefireReportMavenProjectStub.java | 30 +++--
.../plugin-config.xml | 3 +-
.../plugin-config.xml | 3 +-
.../plugin-config.xml | 3 +-
.../plugin-config.xml | 3 +-
.../basic-surefire-report-test/plugin-config.xml | 3 +-
.../resources/unit/surefire-1183/plugin-config.xml | 31 +++---
.../plugin-config.xml | 3 +-
.../surefire-report-enclosed/plugin-config.xml | 3 +-
.../plugin-config.xml | 3 +-
.../surefire-report-nestedClass/plugin-config.xml | 3 +-
.../surefire-report-single-error/plugin-config.xml | 3 +-
pom.xml | 20 ----
.../maven/surefire/its/AggregateReportIT.java | 4 +-
.../surefire/its/CheckTestNgReportTestIT.java | 2 +-
.../maven/surefire/its/fixture/MavenLauncher.java | 4 +-
.../surefire/its/fixture/OutputValidator.java | 5 +
.../surefire/its/fixture/SurefireLauncher.java | 2 +-
.../jiras/Surefire260TestWithIdenticalNamesIT.java | 5 +-
.../Surefire570MultipleReportDirectoriesIT.java | 14 +--
.../its/jiras/Surefire740TruncatedCommaIT.java | 6 +-
.../its/jiras/Surefire772BothReportsIT.java | 26 ++---
.../its/jiras/Surefire772NoFailsafeReportsIT.java | 26 ++---
.../its/jiras/Surefire772NoSurefireReportsIT.java | 34 +++---
.../its/jiras/Surefire772SpecifiedReportsIT.java | 26 ++---
.../test/resources/surefire-1490-custom/pom.xml | 4 +-
.../test/resources/surefire-1490-default/pom.xml | 4 +-
.../surefire-260-testWithIdenticalNames/pom.xml | 4 +-
.../surefire-570-multipleReportDirectories/pom.xml | 2 +-
47 files changed, 281 insertions(+), 411 deletions(-)
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index ddf9c29c8..b38cf2479 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -46,7 +46,7 @@
</prerequisites>
<properties>
- <doxiaVersion>1.12.0</doxiaVersion>
+ <doxiaVersion>2.0.0-M12</doxiaVersion>
</properties>
<dependencies>
@@ -111,13 +111,10 @@
<artifactId>doxia-core</artifactId>
<version>${doxiaVersion}</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
+ <version>4.0.0-M15</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
index 5ad5dc663..d6f141f74 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/AbstractSurefireReport.java
@@ -37,7 +37,6 @@ import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
-import org.apache.maven.reporting.MavenReportException;
import org.apache.maven.settings.Settings;
import org.apache.maven.shared.utils.PathTool;
import org.codehaus.plexus.i18n.I18N;
@@ -149,16 +148,16 @@ public abstract class AbstractSurefireReport extends AbstractMavenReport {
* {@inheritDoc}
*/
@Override
- public void executeReport(Locale locale) throws MavenReportException {
+ public void executeReport(Locale locale) {
SurefireReportRenderer r = new SurefireReportRenderer(
getSink(),
getI18N(locale),
getI18Nsection(),
locale,
getConsoleLogger(),
- showSuccess,
getReportsDirectories(),
- determineXrefLocation());
+ determineXrefLocation(),
+ showSuccess);
r.render();
}
@@ -263,7 +262,8 @@ public abstract class AbstractSurefireReport extends AbstractMavenReport {
String location = null;
if (linkXRef) {
- String relativePath = PathTool.getRelativePath(getOutputDirectory(), xrefLocation.getAbsolutePath());
+ String relativePath = PathTool.getRelativePath(
+ getReportOutputDirectory().getAbsolutePath(), xrefLocation.getAbsolutePath());
if (relativePath == null || relativePath.isEmpty()) {
relativePath = ".";
}
@@ -346,6 +346,10 @@ public abstract class AbstractSurefireReport extends AbstractMavenReport {
return project;
}
+ protected List<MavenProject> getReactorProjects() {
+ return reactorProjects;
+ }
+
// TODO Review, especially Locale.getDefault()
private static class CustomI18N implements I18N {
private final MavenProject project;
diff --git a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeOnlyReport.java b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeOnlyReport.java
index 7e6b20840..ae2b62078 100644
--- a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeOnlyReport.java
+++ b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/FailsafeOnlyReport.java
@@ -61,7 +61,7 @@ public class FailsafeOnlyReport extends AbstractSurefireReport {
@Override
protected File getSurefireReportsDirectory(MavenProject subProject) {
String buildDir = subProject.getBuild().getDirectory();
- return new File(buildDir + "/failsafe-reports");
+ return new File(buildDir, "failsafe-reports");
}
@Override
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 e19c2bca2..c9dafe73f 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
@@ -50,9 +50,9 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer {
private final Locale locale;
private final SurefireReportParser parser;
- private final boolean showSuccess;
- private final String xrefLocation;
private final List<ReportTestSuite> testSuites;
+ private final String xrefLocation;
+ private final boolean showSuccess;
public SurefireReportRenderer(
Sink sink,
@@ -60,9 +60,9 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer {
String i18nSection,
Locale locale,
ConsoleLogger consoleLogger,
- boolean showSuccess,
List<File> reportsDirectories,
- String xrefLocation) {
+ String xrefLocation,
+ boolean showSuccess) {
super(sink);
this.i18n = i18n;
this.i18nSection = i18nSection;
@@ -112,11 +112,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();
@@ -125,16 +121,14 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer {
renderSectionTestCases();
renderSectionFailureDetails();
+
+ endSection();
}
private void renderSectionSummary() {
Map<String, Object> summary = parser.getSummary(testSuites);
- sink.section1();
- sinkAnchor("Summary");
- sink.sectionTitle1();
- sink.text(getI18nString("surefire", "label.summary"));
- sink.sectionTitle1_();
+ startSection(getI18nString("surefire", "label.summary"), "Summary");
constructHotLinks();
@@ -168,7 +162,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer {
sink.lineBreak();
- sink.section1_();
+ endSection();
}
private void renderSectionPackages() {
@@ -177,11 +171,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer {
return;
}
- sink.section1();
- sinkAnchor("Package_List");
- sink.sectionTitle1();
- sink.text(getI18nString("surefire", "label.packagelist"));
- sink.sectionTitle1_();
+ startSection(getI18nString("surefire", "label.packagelist"), "Package_List");
constructHotLinks();
@@ -227,11 +217,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;
@@ -266,12 +252,12 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer {
endTable();
}
- sink.section2_();
+ endSection();
}
sink.lineBreak();
- sink.section1_();
+ endSection();
}
private void renderSectionTestSuite(ReportTestSuite suite) {
@@ -320,11 +306,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();
@@ -332,11 +314,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;
@@ -360,13 +338,13 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer {
endTable();
}
- sink.section2_();
+ endSection();
}
}
sink.lineBreak();
- sink.section1_();
+ endSection();
}
private void constructTestCaseSection(ReportTestCase testCase) {
@@ -469,7 +447,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() {
@@ -478,11 +456,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();
@@ -554,7 +528,7 @@ public class SurefireReportRenderer extends AbstractMavenReportRenderer {
sink.lineBreak();
- sink.section1_();
+ endSection();
}
private void constructHotLinks() {
diff --git a/maven-surefire-report-plugin/src/site/apt/usage.apt.vm b/maven-surefire-report-plugin/src/site/apt/usage.apt.vm
index 969d441d7..a6d93a70a 100644
--- a/maven-surefire-report-plugin/src/site/apt/usage.apt.vm
+++ b/maven-surefire-report-plugin/src/site/apt/usage.apt.vm
@@ -59,7 +59,7 @@ Usage
mvn surefire-report:report
+---+
- A HTML report should be generated in <<<$\{basedir\}/target/site/surefire-report.html>>>.
+ An HTML report should be generated in <<<$\{basedir\}/target/reports/surefire.html>>>.
[images/surefire-sample2.png] Sample standalone surefire-report
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 598c91678..b1a9ddb89 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
@@ -48,12 +48,12 @@ public class Surefire597Test extends TestCase {
i18n.initialize();
ConsoleLogger consoleLogger = new NullConsoleLogger();
SurefireReportRenderer r = new SurefireReportRenderer(
- sink, i18n, "surefire", SiteTool.DEFAULT_LOCALE, consoleLogger, true, singletonList(report), null);
+ sink, i18n, "surefire", SiteTool.DEFAULT_LOCALE, consoleLogger, singletonList(report), null, true);
r.render();
String xml = writer.toString();
assertThat(
xml,
- containsString(toSystemNewLine("<table border=\"0\" class=\"bodyTable\">\n"
+ containsString(toSystemNewLine("<table class=\"bodyTable\">\n"
+ "<tr class=\"a\">\n"
+ "<th>Tests</th>\n"
+ "<th>Errors</th>\n"
@@ -62,7 +62,7 @@ public class Surefire597Test extends TestCase {
+ "<th>Success Rate</th>\n"
+ "<th>Time</th></tr>\n"
+ "<tr class=\"b\">\n"
- + "<td align=\"left\">1</td>\n"
+ + "<td>1</td>\n"
+ "<td>1</td>\n"
+ "<td>0</td>\n"
+ "<td>0</td>\n"
@@ -72,7 +72,7 @@ public class Surefire597Test extends TestCase {
+ "</table>")));
assertThat(
xml,
- containsString(toSystemNewLine("<table border=\"0\" class=\"bodyTable\">\n"
+ containsString(toSystemNewLine("<table class=\"bodyTable\">\n"
+ "<tr class=\"a\">\n"
+ "<th>Package</th>\n"
+ "<th>Tests</th>\n"
@@ -82,7 +82,7 @@ public class Surefire597Test extends TestCase {
+ "<th>Success Rate</th>\n"
+ "<th>Time</th></tr>\n"
+ "<tr class=\"b\">\n"
- + "<td align=\"left\"><a href=\"#surefire\">surefire</a></td>\n"
+ + "<td><a href=\"#surefire\">surefire</a></td>\n"
+ "<td>1</td>\n"
+ "<td>1</td>\n"
+ "<td>0</td>\n"
@@ -91,7 +91,7 @@ public class Surefire597Test extends TestCase {
+ "<td>0 s</td></tr></table>")));
assertThat(
xml,
- containsString(toSystemNewLine("<table border=\"0\" class=\"bodyTable\">\n"
+ containsString(toSystemNewLine("<table class=\"bodyTable\">\n"
+ "<tr class=\"a\">\n"
+ "<th>-</th>\n"
+ "<th>Class</th>\n"
@@ -102,7 +102,7 @@ public class Surefire597Test extends TestCase {
+ "<th>Success Rate</th>\n"
+ "<th>Time</th></tr>\n"
+ "<tr class=\"b\">\n"
- + "<td align=\"left\"><a href=\"#surefire.MyTest\"><img src=\"images/icon_error_sml.gif\" alt=\"\" /></a></td>\n"
+ + "<td><a href=\"#surefire.MyTest\"><img src=\"images/icon_error_sml.gif\" /></a></td>\n"
+ "<td><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
+ "<td>1</td>\n"
+ "<td>1</td>\n"
@@ -112,15 +112,15 @@ public class Surefire597Test extends TestCase {
+ "<td>0 s</td></tr></table>")));
assertThat(
xml,
- containsString(toSystemNewLine("<table border=\"0\" class=\"bodyTable\">\n"
+ containsString(toSystemNewLine("<table class=\"bodyTable\">\n"
+ "<tr class=\"a\">\n"
- + "<td align=\"left\"><img src=\"images/icon_error_sml.gif\" alt=\"\" /></td>\n"
+ + "<td><img src=\"images/icon_error_sml.gif\" /></td>\n"
+ "<td><a id=\"surefire.MyTest.test\"></a>test</td></tr>\n"
+ "<tr class=\"b\">\n"
- + "<td align=\"left\">-</td>\n"
+ + "<td>-</td>\n"
+ "<td>java.lang.RuntimeException: java.lang.IndexOutOfBoundsException: msg</td></tr>\n"
+ "<tr class=\"a\">\n"
- + "<td align=\"left\">-</td>\n"
+ + "<td>-</td>\n"
+ "<td>\n"
+ "<div id=\"test-error\">surefire.MyTest:13</div></td></tr></table>")));
}
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 3da193a92..df12fbedc 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
@@ -19,16 +19,19 @@
package org.apache.maven.plugins.surefire.report;
import java.io.File;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.util.Locale;
+import java.util.Collections;
+import java.util.List;
+import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.LegacySupport;
+import org.apache.maven.plugin.MojoExecution;
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.plugin.testing.ArtifactStubFactory;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.plugins.surefire.report.stubs.DependencyArtifactStubFactory;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.utils.io.FileUtils;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
@@ -45,28 +48,20 @@ import static org.hamcrest.MatcherAssert.assertThat;
public class SurefireReportTest extends AbstractMojoTestCase {
private ArtifactStubFactory artifactStubFactory;
- // Can be removed with Doxia 2.0.0
- private Locale origLocale;
-
@Override
protected void setUp() throws Exception {
super.setUp();
artifactStubFactory = new DependencyArtifactStubFactory(getTestFile("target"), true, false);
artifactStubFactory.getWorkingDir().mkdirs();
-
- origLocale = Locale.getDefault();
- Locale.setDefault(Locale.ROOT);
}
- @Override
- protected void tearDown() throws Exception {
- Locale.setDefault(origLocale);
- super.tearDown();
+ protected File getPluginXmlFile(String projectDirName) {
+ return new File(getBasedir(), "src/test/resources/unit/" + projectDirName + "/plugin-config.xml");
}
protected SurefireReport createReportMojo(File pluginXmlFile) throws Exception {
SurefireReport mojo = (SurefireReport) lookupMojo("report", pluginXmlFile);
- assertNotNull("Mojo found.", mojo);
+ assertNotNull("Mojo not found.", mojo);
LegacySupport legacySupport = lookup(LegacySupport.class);
legacySupport.setSession(newMavenSession(new MavenProjectStub()));
@@ -75,13 +70,22 @@ public class SurefireReportTest extends AbstractMojoTestCase {
repoSession.setLocalRepositoryManager(new SimpleLocalRepositoryManagerFactory()
.newInstance(repoSession, new LocalRepository(artifactStubFactory.getWorkingDir())));
- // setVariableValueToObject( mojo, "session", legacySupport.getSession() );
- setVariableValueToObject(mojo, "remoteRepositories", mojo.getProject().getRemoteArtifactRepositories());
+ List<MavenProject> reactorProjects =
+ mojo.getReactorProjects() != null ? mojo.getReactorProjects() : Collections.emptyList();
+
+ setVariableValueToObject(mojo, "mojoExecution", getMockMojoExecution());
+ // setVariableValueToObject(mojo, "session", legacySupport.getSession());
+ setVariableValueToObject(mojo, "repoSession", legacySupport.getRepositorySession());
+ setVariableValueToObject(mojo, "reactorProjects", reactorProjects);
+ setVariableValueToObject(
+ mojo, "remoteProjectRepositories", mojo.getProject().getRemoteProjectRepositories());
+ setVariableValueToObject(
+ mojo, "siteDirectory", new File(mojo.getProject().getBasedir(), "src/site"));
return mojo;
}
public void testBasicSurefireReport() throws Exception {
- File testPom = new File(getUnitBaseDir(), "basic-surefire-report-test/plugin-config.xml");
+ File testPom = getPluginXmlFile("basic-surefire-report-test");
SurefireReport mojo = createReportMojo(testPom);
File outputDir = (File) getVariableValueFromObject(mojo, "outputDirectory");
boolean showSuccess = (Boolean) getVariableValueFromObject(mojo, "showSuccess");
@@ -111,14 +115,24 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertTrue(idx >= 0);
}
- private File getUnitBaseDir() throws UnsupportedEncodingException {
- URL resource = getClass().getResource("/unit");
- // URLDecoder.decode necessary for JDK 1.5+, where spaces are escaped to %20
- return new File(URLDecoder.decode(resource.getPath(), "UTF-8")).getAbsoluteFile();
+ private MojoExecution getMockMojoExecution() {
+ MojoDescriptor md = new MojoDescriptor();
+ md.setGoal("report");
+
+ MojoExecution me = new MojoExecution(md);
+
+ PluginDescriptor pd = new PluginDescriptor();
+ Plugin p = new Plugin();
+ p.setGroupId("org.apache.maven.plugins");
+ p.setArtifactId("maven-surefire-report-plugin");
+ pd.setPlugin(p);
+ md.setPluginDescriptor(pd);
+
+ return me;
}
public void testBasicSurefireReportIfShowSuccessIsFalse() throws Exception {
- File testPom = new File(getUnitBaseDir(), "basic-surefire-report-success-false/plugin-config.xml");
+ File testPom = getPluginXmlFile("basic-surefire-report-success-false");
SurefireReport mojo = createReportMojo(testPom);
boolean showSuccess = (Boolean) getVariableValueFromObject(mojo, "showSuccess");
assertFalse(showSuccess);
@@ -132,7 +146,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
}
public void testBasicSurefireReportIfLinkXrefIsFalse() throws Exception {
- File testPom = new File(getUnitBaseDir(), "basic-surefire-report-linkxref-false/plugin-config.xml");
+ File testPom = getPluginXmlFile("basic-surefire-report-linkxref-false");
SurefireReport mojo = createReportMojo(testPom);
boolean linkXRef = (Boolean) getVariableValueFromObject(mojo, "linkXRef");
assertFalse(linkXRef);
@@ -146,7 +160,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
}
public void testBasicSurefireReportIfReportingIsNull() throws Exception {
- File testPom = new File(getUnitBaseDir(), "basic-surefire-report-reporting-null/plugin-config.xml");
+ File testPom = getPluginXmlFile("basic-surefire-report-reporting-null");
SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
File report = new File(getBasedir(), "target/site/unit/basic-surefire-report-reporting-null/surefire.html");
@@ -159,7 +173,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
@SuppressWarnings("checkstyle:methodname")
public void testBasicSurefireReport_AnchorTestCases() throws Exception {
- File testPom = new File(getUnitBaseDir(), "basic-surefire-report-anchor-test-cases/plugin-config.xml");
+ File testPom = getPluginXmlFile("basic-surefire-report-anchor-test-cases");
SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
File report = new File(getBasedir(), "target/site/unit/basic-surefire-report-anchor-test-cases/surefire.html");
@@ -175,7 +189,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
}
public void testSurefireReportSingleError() throws Exception {
- File testPom = new File(getUnitBaseDir(), "surefire-report-single-error/plugin-config.xml");
+ File testPom = getPluginXmlFile("surefire-report-single-error");
SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
File report = new File(getBasedir(), "target/site/unit/surefire-report-single-error/surefire.html");
@@ -185,7 +199,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\">1</td>\n"
+ + "<td>1</td>\n"
+ "<td>1</td>\n"
+ "<td>0</td>\n"
+ "<td>0</td>\n"
@@ -195,7 +209,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\"><a href=\"#surefire\">surefire</a></td>\n"
+ + "<td><a href=\"#surefire\">surefire</a></td>\n"
+ "<td>1</td>\n"
+ "<td>1</td>\n"
+ "<td>0</td>\n"
@@ -205,9 +219,9 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\">"
+ + "<td>"
+ "<a href=\"#surefire.MyTest\">"
- + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
+ + "<img src=\"images/icon_error_sml.gif\" />"
+ "</a>"
+ "</td>\n"
+ "<td><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
@@ -262,7 +276,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
}
public void testSurefireReportNestedClassTrimStackTrace() throws Exception {
- File testPom = new File(getUnitBaseDir(), "surefire-report-nestedClass-trimStackTrace/plugin-config.xml");
+ File testPom = getPluginXmlFile("surefire-report-nestedClass-trimStackTrace");
SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
File report =
@@ -273,7 +287,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\">1</td>\n"
+ + "<td>1</td>\n"
+ "<td>1</td>\n"
+ "<td>0</td>\n"
+ "<td>0</td>\n"
@@ -283,7 +297,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\"><a href=\"#surefire\">surefire</a></td>\n"
+ + "<td><a href=\"#surefire\">surefire</a></td>\n"
+ "<td>1</td>\n"
+ "<td>1</td>\n"
+ "<td>0</td>\n"
@@ -293,9 +307,9 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\">"
+ + "<td>"
+ "<a href=\"#surefire.MyTest\">"
- + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
+ + "<img src=\"images/icon_error_sml.gif\" />"
+ "</a>"
+ "</td>\n"
+ "<td><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
@@ -326,7 +340,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
}
public void testSurefireReportNestedClass() throws Exception {
- File testPom = new File(getUnitBaseDir(), "surefire-report-nestedClass/plugin-config.xml");
+ File testPom = getPluginXmlFile("surefire-report-nestedClass");
SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
File report = new File(getBasedir(), "target/site/unit/surefire-report-nestedClass/surefire.html");
@@ -336,7 +350,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\">1</td>\n"
+ + "<td>1</td>\n"
+ "<td>1</td>\n"
+ "<td>0</td>\n"
+ "<td>0</td>\n"
@@ -346,7 +360,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\"><a href=\"#surefire\">surefire</a></td>\n"
+ + "<td><a href=\"#surefire\">surefire</a></td>\n"
+ "<td>1</td>\n"
+ "<td>1</td>\n"
+ "<td>0</td>\n"
@@ -356,9 +370,9 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\">"
+ + "<td>"
+ "<a href=\"#surefire.MyTest\">"
- + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
+ + "<img src=\"images/icon_error_sml.gif\" />"
+ "</a>"
+ "</td>\n"
+ "<td><a href=\"#surefire.MyTest\">MyTest</a></td>\n"
@@ -413,7 +427,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
}
public void testSurefireReportEnclosedTrimStackTrace() throws Exception {
- File testPom = new File(getUnitBaseDir(), "surefire-report-enclosed-trimStackTrace/plugin-config.xml");
+ File testPom = getPluginXmlFile("surefire-report-enclosed-trimStackTrace");
SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
File report = new File(getBasedir(), "target/site/unit/surefire-report-enclosed-trimStackTrace/surefire.html");
@@ -423,7 +437,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\">1</td>\n"
+ + "<td>1</td>\n"
+ "<td>1</td>\n"
+ "<td>0</td>\n"
+ "<td>0</td>\n"
@@ -433,7 +447,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\"><a href=\"#surefire\">surefire</a></td>\n"
+ + "<td><a href=\"#surefire\">surefire</a></td>\n"
+ "<td>1</td>\n"
+ "<td>1</td>\n"
+ "<td>0</td>\n"
@@ -443,9 +457,9 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\">"
+ + "<td>"
+ "<a href=\"#surefire.MyTest$A\">"
- + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
+ + "<img src=\"images/icon_error_sml.gif\" />"
+ "</a>"
+ "</td>\n"
+ "<td><a href=\"#surefire.MyTest$A\">MyTest$A</a></td>\n"
@@ -476,7 +490,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
}
public void testSurefireReportEnclosed() throws Exception {
- File testPom = new File(getUnitBaseDir(), "surefire-report-enclosed/plugin-config.xml");
+ File testPom = getPluginXmlFile("surefire-report-enclosed");
SurefireReport mojo = createReportMojo(testPom);
mojo.execute();
File report = new File(getBasedir(), "target/site/unit/surefire-report-enclosed/surefire.html");
@@ -486,7 +500,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\">1</td>\n"
+ + "<td>1</td>\n"
+ "<td>1</td>\n"
+ "<td>0</td>\n"
+ "<td>0</td>\n"
@@ -496,7 +510,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\"><a href=\"#surefire\">surefire</a></td>\n"
+ + "<td><a href=\"#surefire\">surefire</a></td>\n"
+ "<td>1</td>\n"
+ "<td>1</td>\n"
+ "<td>0</td>\n"
@@ -506,9 +520,9 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertThat(
htmlContent,
containsString(toSystemNewLine("<tr class=\"b\">\n"
- + "<td align=\"left\">"
+ + "<td>"
+ "<a href=\"#surefire.MyTest$A\">"
- + "<img src=\"images/icon_error_sml.gif\" alt=\"\" />"
+ + "<img src=\"images/icon_error_sml.gif\" />"
+ "</a>"
+ "</td>\n"
+ "<td><a href=\"#surefire.MyTest$A\">MyTest$A</a></td>\n"
@@ -573,7 +587,7 @@ public class SurefireReportTest extends AbstractMojoTestCase {
}
public void testCustomTitleAndDescriptionReport() throws Exception {
- File testPom = new File(getUnitBaseDir(), "surefire-1183/plugin-config.xml");
+ File testPom = getPluginXmlFile("surefire-1183");
SurefireReport mojo = createReportMojo(testPom);
File outputDir = (File) getVariableValueFromObject(mojo, "outputDirectory");
@@ -594,6 +608,8 @@ public class SurefireReportTest extends AbstractMojoTestCase {
assertTrue(report.exists());
String htmlContent = FileUtils.fileRead(report);
- assertTrue(htmlContent.contains("<h2><a name=\"Acceptance_Test\"></a>Acceptance Test</h2></section>"));
+ assertThat(
+ htmlContent,
+ containsString(toSystemNewLine("<section><a id=\"Acceptance_Test\"></a>\n<h1>Acceptance Test</h1>")));
}
}
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/AnchorTestCasesStub.java
similarity index 67%
copy from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
copy to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/AnchorTestCasesStub.java
index 1e4a58d6e..3b69f4ba8 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/AnchorTestCasesStub.java
@@ -18,21 +18,10 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
-import java.util.ArrayList;
-import java.util.List;
+public class AnchorTestCasesStub extends SurefireReportMavenProjectStub {
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
-/**
- * @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
- */
-public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
- /**
- * {@inheritDoc}
- */
@Override
- public List<ReportPlugin> getReportPlugins() {
- return new ArrayList<>();
+ protected String getProjectDirName() {
+ return "basic-surefire-report-anchor-test-cases";
}
}
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedStub.java
similarity index 67%
copy from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
copy to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedStub.java
index 1e4a58d6e..bdcce6b04 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedStub.java
@@ -18,21 +18,10 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
-import java.util.ArrayList;
-import java.util.List;
+public class EnclosedStub extends SurefireReportMavenProjectStub {
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
-/**
- * @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
- */
-public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
- /**
- * {@inheritDoc}
- */
@Override
- public List<ReportPlugin> getReportPlugins() {
- return new ArrayList<>();
+ protected String getProjectDirName() {
+ return "surefire-report-enclosed";
}
}
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedTrimStackTraceStub.java
similarity index 67%
copy from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
copy to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedTrimStackTraceStub.java
index 1e4a58d6e..f5ba0e74b 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/EnclosedTrimStackTraceStub.java
@@ -18,21 +18,10 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
-import java.util.ArrayList;
-import java.util.List;
+public class EnclosedTrimStackTraceStub extends SurefireReportMavenProjectStub {
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
-/**
- * @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
- */
-public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
- /**
- * {@inheritDoc}
- */
@Override
- public List<ReportPlugin> getReportPlugins() {
- return new ArrayList<>();
+ protected String getProjectDirName() {
+ return "surefire-report-enclosed-trimStackTrace";
}
}
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/LinkXrefFalseStub.java
similarity index 68%
copy from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
copy to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/LinkXrefFalseStub.java
index 1e4a58d6e..7bf7cf44b 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/LinkXrefFalseStub.java
@@ -18,21 +18,10 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
-import java.util.ArrayList;
-import java.util.List;
+public class LinkXrefFalseStub extends SurefireReportMavenProjectStub {
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
-/**
- * @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
- */
-public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
- /**
- * {@inheritDoc}
- */
@Override
- public List<ReportPlugin> getReportPlugins() {
- return new ArrayList<>();
+ protected String getProjectDirName() {
+ return "basic-surefire-report-linkxref-false";
}
}
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassStub.java
similarity index 67%
copy from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
copy to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassStub.java
index 1e4a58d6e..6f1547b37 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassStub.java
@@ -18,21 +18,10 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
-import java.util.ArrayList;
-import java.util.List;
+public class NestedClassStub extends SurefireReportMavenProjectStub {
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
-/**
- * @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
- */
-public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
- /**
- * {@inheritDoc}
- */
@Override
- public List<ReportPlugin> getReportPlugins() {
- return new ArrayList<>();
+ protected String getProjectDirName() {
+ return "surefire-report-nestedClass";
}
}
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassTrimStackTraceStub.java
similarity index 67%
copy from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
copy to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassTrimStackTraceStub.java
index 1e4a58d6e..1a30076f5 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/NestedClassTrimStackTraceStub.java
@@ -18,21 +18,10 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
-import java.util.ArrayList;
-import java.util.List;
+public class NestedClassTrimStackTraceStub extends SurefireReportMavenProjectStub {
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
-/**
- * @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
- */
-public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
- /**
- * {@inheritDoc}
- */
@Override
- public List<ReportPlugin> getReportPlugins() {
- return new ArrayList<>();
+ protected String getProjectDirName() {
+ return "surefire-report-nestedClass-trimStackTrace";
}
}
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/ReportTestStub.java
similarity index 67%
copy from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
copy to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/ReportTestStub.java
index 1e4a58d6e..d04125a72 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/ReportTestStub.java
@@ -18,21 +18,10 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
-import java.util.ArrayList;
-import java.util.List;
+public class ReportTestStub extends SurefireReportMavenProjectStub {
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
-/**
- * @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
- */
-public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
- /**
- * {@inheritDoc}
- */
@Override
- public List<ReportPlugin> getReportPlugins() {
- return new ArrayList<>();
+ protected String getProjectDirName() {
+ return "basic-surefire-report-test";
}
}
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/ReportingNullStub.java
similarity index 86%
copy from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
copy to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/ReportingNullStub.java
index 1e4a58d6e..86b557ab0 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/ReportingNullStub.java
@@ -22,12 +22,11 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
*/
-public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
+public class ReportingNullStub extends SurefireReportMavenProjectStub {
/**
* {@inheritDoc}
*/
@@ -35,4 +34,9 @@ public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
public List<ReportPlugin> getReportPlugins() {
return new ArrayList<>();
}
+
+ @Override
+ protected String getProjectDirName() {
+ return "basic-surefire-report-reporting-null";
+ }
}
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SingleErrorStub.java
similarity index 67%
copy from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
copy to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SingleErrorStub.java
index 1e4a58d6e..60e83182e 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SingleErrorStub.java
@@ -18,21 +18,10 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
-import java.util.ArrayList;
-import java.util.List;
+public class SingleErrorStub extends SurefireReportMavenProjectStub {
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
-/**
- * @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
- */
-public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
- /**
- * {@inheritDoc}
- */
@Override
- public List<ReportPlugin> getReportPlugins() {
- return new ArrayList<>();
+ protected String getProjectDirName() {
+ return "surefire-report-single-error";
}
}
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SuccessFalseStub.java
similarity index 67%
copy from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
copy to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SuccessFalseStub.java
index 1e4a58d6e..afe355951 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SuccessFalseStub.java
@@ -18,21 +18,10 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
-import java.util.ArrayList;
-import java.util.List;
+public class SuccessFalseStub extends SurefireReportMavenProjectStub {
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
-/**
- * @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
- */
-public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
- /**
- * {@inheritDoc}
- */
@Override
- public List<ReportPlugin> getReportPlugins() {
- return new ArrayList<>();
+ protected String getProjectDirName() {
+ return "basic-surefire-report-success-false";
}
}
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/Surefire1183Stub.java
similarity index 67%
rename from maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
rename to maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/Surefire1183Stub.java
index 1e4a58d6e..e39849618 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub2.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/Surefire1183Stub.java
@@ -18,21 +18,10 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
-import java.util.ArrayList;
-import java.util.List;
+public class Surefire1183Stub extends SurefireReportMavenProjectStub {
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-
-/**
- * @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
- */
-public class SurefireReportMavenProjectStub2 extends MavenProjectStub {
- /**
- * {@inheritDoc}
- */
@Override
- public List<ReportPlugin> getReportPlugins() {
- return new ArrayList<>();
+ protected String getProjectDirName() {
+ return "surefire-1183";
}
}
diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
index de27f52f8..952b6ff39 100644
--- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
+++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/SurefireReportMavenProjectStub.java
@@ -18,22 +18,35 @@
*/
package org.apache.maven.plugins.surefire.report.stubs;
+import java.io.File;
import java.util.Collections;
import java.util.List;
+import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.MavenArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.ReportPlugin;
-import org.apache.maven.model.Reporting;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.eclipse.aether.repository.RemoteRepository;
/**
* @author <a href="mailto:aramirez@apache.org">Allan Ramirez</a>
*/
-public class SurefireReportMavenProjectStub extends MavenProjectStub {
+public abstract class SurefireReportMavenProjectStub extends MavenProjectStub {
+
+ protected abstract String getProjectDirName();
+
+ @Override
+ public File getBasedir() {
+ return new File(super.getBasedir() + "/src/test/resources/unit/" + getProjectDirName());
+ }
+
+ @Override
+ public File getFile() {
+ return new File(getBasedir(), "plugin-config.xml");
+ }
+
/**
* {@inheritDoc}
*/
@@ -47,10 +60,6 @@ public class SurefireReportMavenProjectStub extends MavenProjectStub {
reportPlugin.setVersion("2.0-SNAPSHOT");
reporting.addPlugin(reportPlugin);
- Model model = new Model();
-
- model.setReporting(reporting);
-
return reporting.getPlugins();
}
@@ -65,4 +74,9 @@ public class SurefireReportMavenProjectStub extends MavenProjectStub {
return Collections.singletonList(repository);
}
+
+ @Override
+ public List<RemoteRepository> getRemoteProjectRepositories() {
+ return RepositoryUtils.toRepos(getRemoteArtifactRepositories());
+ }
}
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
index e94305364..2e31083fc 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-anchor-test-cases/plugin-config.xml
@@ -24,8 +24,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<outputDirectory>${basedir}/target/site/unit/basic-surefire-report-anchor-test-cases</outputDirectory>
- <localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.AnchorTestCasesStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-anchor-test-cases/surefire-reports
</reportsDirectory>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
index d175839c6..e4e34dede 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-linkxref-false/plugin-config.xml
@@ -24,8 +24,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<outputDirectory>${basedir}/target/site/unit/basic-surefire-report-linkxref-false</outputDirectory>
- <localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.LinkXrefFalseStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-linkxref-false/surefire-reports
</reportsDirectory>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
index dfe6b6767..76f2af455 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-reporting-null/plugin-config.xml
@@ -24,8 +24,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<outputDirectory>${basedir}/target/site/unit/basic-surefire-report-reporting-null</outputDirectory>
- <localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub2"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.ReportingNullStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-reporting-null/surefire-reports
</reportsDirectory>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
index eae36a008..e00d008fd 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-success-false/plugin-config.xml
@@ -24,8 +24,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<outputDirectory>${basedir}/target/site/unit/basic-surefire-report-success-false</outputDirectory>
- <localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.SuccessFalseStub"/>
<showSuccess>false</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-success-false/surefire-reports
</reportsDirectory>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
index 08cc7a39e..1d469a52e 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/basic-surefire-report-test/plugin-config.xml
@@ -24,8 +24,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<outputDirectory>${basedir}/target/site/unit/basic-surefire-report-test</outputDirectory>
- <localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.ReportTestStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/basic-surefire-report-test/surefire-reports
</reportsDirectory>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-1183/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-1183/plugin-config.xml
index 2a4c04a0b..ebf5dc8fd 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-1183/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-1183/plugin-config.xml
@@ -18,21 +18,18 @@
-->
<project>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
- <project
- implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
- <outputName>acceptance-test</outputName>
- <localRepository>${localRepository}</localRepository>
- <customBundle>${basedir}/src/test/resources/unit/surefire-1183/src/site/custom/surefire-report.properties</customBundle>
- <outputDirectory>${basedir}/target/site/unit/surefire-1183</outputDirectory>
- <reportsDirectory>${basedir}/src/test/resources/unit/surefire-1183/acceptancetest-reports</reportsDirectory>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <configuration>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.Surefire1183Stub"/>
+ <outputName>acceptance-test</outputName>
+ <customBundle>${basedir}/src/test/resources/unit/surefire-1183/src/site/custom/surefire-report.properties</customBundle>
+ <outputDirectory>${basedir}/target/site/unit/surefire-1183</outputDirectory>
+ <reportsDirectory>${basedir}/src/test/resources/unit/surefire-1183/acceptancetest-reports</reportsDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
index 492c62a3b..fddf49aaa 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/plugin-config.xml
@@ -24,8 +24,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<outputDirectory>${basedir}/target/site/unit/surefire-report-enclosed-trimStackTrace</outputDirectory>
- <localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.EnclosedTrimStackTraceStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/surefire-reports
</reportsDirectory>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
index 25527c370..092107a52 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-enclosed/plugin-config.xml
@@ -24,8 +24,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<outputDirectory>${basedir}/target/site/unit/surefire-report-enclosed</outputDirectory>
- <localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.EnclosedStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-enclosed/surefire-reports
</reportsDirectory>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
index ce9bc4971..d4bf13fa7 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/plugin-config.xml
@@ -24,8 +24,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<outputDirectory>${basedir}/target/site/unit/surefire-report-nestedClass-trimStackTrace</outputDirectory>
- <localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.NestedClassTrimStackTraceStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/surefire-reports
</reportsDirectory>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
index 27302b0a9..542475533 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-nestedClass/plugin-config.xml
@@ -24,8 +24,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<outputDirectory>${basedir}/target/site/unit/surefire-report-nestedClass</outputDirectory>
- <localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.NestedClassStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-nestedClass/surefire-reports
</reportsDirectory>
diff --git a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
index 70767d4b4..045f0d93d 100644
--- a/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
+++ b/maven-surefire-report-plugin/src/test/resources/unit/surefire-report-single-error/plugin-config.xml
@@ -24,8 +24,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<outputDirectory>${basedir}/target/site/unit/surefire-report-single-error</outputDirectory>
- <localRepository>${localRepository}</localRepository>
- <project implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.surefire.report.stubs.SingleErrorStub"/>
<showSuccess>true</showSuccess>
<reportsDirectory>${basedir}/src/test/resources/unit/surefire-report-single-error/surefire-reports
</reportsDirectory>
diff --git a/pom.xml b/pom.xml
index cc5f9f38a..a5ab02108 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,11 +126,6 @@
<artifactId>commons-io</artifactId>
<version>${commonsIoVersion}</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
- <version>3.1.1</version>
- </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
@@ -169,21 +164,6 @@
<artifactId>maven-shared-utils</artifactId>
<version>${mavenSharedUtilsVersion}</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>3.2.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
index 8a5293faa..920f1da1d 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
@@ -42,8 +42,8 @@ public class AggregateReportIT extends SurefireJUnit4IntegrationTestCase {
public void aggregateReport() {
OutputValidator outputValidator =
unpack("/aggregate-report").addSurefireReportGoal().executeCurrentGoals();
- TestFile surefireReportHtml = outputValidator.getSiteFile("surefire.html");
- assertTrue("surefire report missing: " + surefireReportHtml.getAbsolutePath(), surefireReportHtml.exists());
+ TestFile reportFile = outputValidator.getReportsFile("surefire.html");
+ assertTrue("surefire report missing: " + reportFile.getAbsolutePath(), reportFile.exists());
// TODO HtmlUnit tests on the surefire report
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
index 30aaefcf3..3b364e306 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgReportTestIT.java
@@ -38,7 +38,7 @@ public class CheckTestNgReportTestIT extends SurefireJUnit4IntegrationTestCase {
.addSurefireReportGoal()
.executeCurrentGoals()
.verifyErrorFree(3)
- .getSiteFile("surefire.html")
+ .getReportsFile("surefire.html")
.assertFileExists();
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
index 55cc0b6b4..05c8d8c96 100755
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/MavenLauncher.java
@@ -307,9 +307,9 @@ public final class MavenLauncher {
return this;
}
- public MavenLauncher deleteSiteDir() {
+ public MavenLauncher deleteReportsDir() {
try {
- FileUtils.deleteDirectory(getValidator().getSubFile("site"));
+ FileUtils.deleteDirectory(getValidator().getSubFile("reports"));
} catch (IOException e) {
throw new SurefireVerifierException(e);
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
index 42819c5d8..87596dd76 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/OutputValidator.java
@@ -178,6 +178,11 @@ public class OutputValidator {
return new TestFile(new File(targetDir, fileName), this);
}
+ public TestFile getReportsFile(String fileName) {
+ File targetDir = getSubFile("target/reports");
+ return new TestFile(new File(targetDir, fileName), this);
+ }
+
public File getBaseDir() {
return baseDir;
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index 2df39a478..f691f4bfc 100755
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -329,7 +329,7 @@ public final class SurefireLauncher {
}
public SurefireLauncher addFailsafeReportOnlyGoal() {
- mavenLauncher.addGoal(getReportPluginGoal(":failsafe-report-only"));
+ mavenLauncher.addGoal(getReportPluginGoal("failsafe-report-only"));
return this;
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
index 07e6da39c..995ec3561 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire260TestWithIdenticalNamesIT.java
@@ -46,12 +46,11 @@ public class Surefire260TestWithIdenticalNamesIT extends SurefireJUnit4Integrati
public void testWithIdenticalNames() throws IOException {
OutputValidator validator = unpack("surefire-260-testWithIdenticalNames")
.failNever()
- .addGoal("site")
.addSurefireReportGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire.html");
- final URI uri = siteFile.toURI();
+ TestFile reportsFile = validator.getReportsFile("surefire.html");
+ final URI uri = reportsFile.toURI();
try (WebClient webClient = new WebClient()) {
HtmlPage page = webClient.getPage(uri.toURL());
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
index 95a980930..516153e0d 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire570MultipleReportDirectoriesIT.java
@@ -38,10 +38,10 @@ public class Surefire570MultipleReportDirectoriesIT extends SurefireJUnit4Integr
surefireLauncher.executeTest();
surefireLauncher.addGoal("-Daggregate=true");
OutputValidator validator = surefireLauncher.executeSurefireReport();
- TestFile siteFile = validator.getSiteFile("surefire.html");
- siteFile.assertContainsText("MyModule1ClassTest");
- siteFile.assertContainsText("MyModule2ClassTest");
- siteFile.assertContainsText("MyDummyClassM1Test");
+ TestFile reportFile = validator.getReportsFile("surefire.html");
+ reportFile.assertContainsText("MyModule1ClassTest");
+ reportFile.assertContainsText("MyModule2ClassTest");
+ reportFile.assertContainsText("MyDummyClassM1Test");
}
@Test
@@ -51,9 +51,9 @@ public class Surefire570MultipleReportDirectoriesIT extends SurefireJUnit4Integr
surefireLauncher.reset();
surefireLauncher.executeSurefireReport();
OutputValidator module1 = surefireLauncher.getSubProjectValidator("module1");
- TestFile siteFile = module1.getSiteFile("surefire.html");
- siteFile.assertContainsText("MyModule1ClassTest");
- siteFile.assertContainsText("MyDummyClassM1Test");
+ TestFile reportFile = module1.getReportsFile("surefire.html");
+ reportFile.assertContainsText("MyModule1ClassTest");
+ reportFile.assertContainsText("MyDummyClassM1Test");
}
public SurefireLauncher unpack() {
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
index 78340ce3b..e0137ac68 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire740TruncatedCommaIT.java
@@ -39,8 +39,8 @@ public class Surefire740TruncatedCommaIT extends SurefireJUnit4IntegrationTestCa
.addSurefireReportGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire.html");
- assertTrue("Expecting file", siteFile.exists());
- siteFile.assertContainsText("027"); // Avoid asserting with the "," or "." ;)
+ TestFile reportFile = validator.getReportsFile("surefire.html");
+ assertTrue("Expecting file", reportFile.exists());
+ reportFile.assertContainsText("027"); // Avoid asserting with the "," or "." ;)
}
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
index 5042988ad..8fbfa01dc 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772BothReportsIT.java
@@ -36,7 +36,7 @@ public class Surefire772BothReportsIT extends SurefireJUnit4IntegrationTestCase
public SurefireLauncher unpack() {
SurefireLauncher unpack = unpack("/surefire-772-both-reports");
- unpack.maven().deleteSiteDir().skipClean().failNever();
+ unpack.maven().deleteReportsDir().skipClean().failNever();
return unpack;
}
@@ -45,11 +45,11 @@ public class Surefire772BothReportsIT extends SurefireJUnit4IntegrationTestCase
OutputValidator outputValidator =
unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = outputValidator.getSiteFile("surefire.html");
- assertTrue("Expecting surefire report file", siteFile.isFile());
+ TestFile reportFile = outputValidator.getReportsFile("surefire.html");
+ assertTrue("Expecting surefire report file", reportFile.isFile());
- siteFile = outputValidator.getSiteFile("failsafe.html");
- assertTrue("Expecting failsafe report file", siteFile.isFile());
+ reportFile = outputValidator.getReportsFile("failsafe.html");
+ assertTrue("Expecting failsafe report file", reportFile.isFile());
}
@Test
@@ -59,11 +59,11 @@ public class Surefire772BothReportsIT extends SurefireJUnit4IntegrationTestCase
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire.html");
- assertTrue("Expecting surefire report file", siteFile.isFile());
+ TestFile reportFile = validator.getReportsFile("surefire.html");
+ assertTrue("Expecting surefire report file", reportFile.isFile());
- siteFile = validator.getSiteFile("failsafe.html");
- assertFalse("Expecting no failsafe report file", siteFile.isFile());
+ reportFile = validator.getReportsFile("failsafe.html");
+ assertFalse("Expecting no failsafe report file", reportFile.isFile());
}
@Test
@@ -74,10 +74,10 @@ public class Surefire772BothReportsIT extends SurefireJUnit4IntegrationTestCase
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire.html");
- assertFalse("Expecting no surefire report file", siteFile.isFile());
+ TestFile reportFile = validator.getReportsFile("surefire.html");
+ assertFalse("Expecting no surefire report file", reportFile.isFile());
- siteFile = validator.getSiteFile("failsafe.html");
- assertTrue("Expecting failsafe report file", siteFile.isFile());
+ reportFile = validator.getReportsFile("failsafe.html");
+ assertTrue("Expecting failsafe report file", reportFile.isFile());
}
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
index aa4bd21b6..6aa685e74 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoFailsafeReportsIT.java
@@ -41,7 +41,7 @@ public class Surefire772NoFailsafeReportsIT extends SurefireJUnit4IntegrationTes
unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
assertSurefireReportPresent(site);
- assertNoFailsefeReport(site);
+ assertNoFailsafeReport(site);
}
@Test
@@ -51,7 +51,7 @@ public class Surefire772NoFailsafeReportsIT extends SurefireJUnit4IntegrationTes
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
assertSurefireReportPresent(validator);
- assertNoFailsefeReport(validator);
+ assertNoFailsafeReport(validator);
}
@Test
@@ -73,27 +73,27 @@ public class Surefire772NoFailsafeReportsIT extends SurefireJUnit4IntegrationTes
.executeCurrentGoals();
assertSurefireReportPresent(validator);
- assertNoFailsefeReport(validator);
+ assertNoFailsafeReport(validator);
}
- private void assertNoFailsefeReport(OutputValidator site) {
- TestFile siteFile = site.getSiteFile("failsafe.html");
- assertFalse("Expecting no failsafe report file", siteFile.isFile());
+ private void assertNoFailsafeReport(OutputValidator validator) {
+ TestFile reportFile = validator.getReportsFile("failsafe.html");
+ assertFalse("Expecting no failsafe report file", reportFile.isFile());
}
- private void assertFailsafeReport(OutputValidator site) {
- TestFile siteFile = site.getSiteFile("failsafe.html");
- assertTrue("Expecting no failsafe report file", siteFile.isFile());
+ private void assertFailsafeReport(OutputValidator validator) {
+ TestFile reportFile = validator.getReportsFile("failsafe.html");
+ assertTrue("Expecting no failsafe report file", reportFile.isFile());
}
- private void assertSurefireReportPresent(OutputValidator site) {
- TestFile siteFile = site.getSiteFile("surefire.html");
- assertTrue("Expecting surefire report file", siteFile.isFile());
+ private void assertSurefireReportPresent(OutputValidator validator) {
+ TestFile reportFile = validator.getReportsFile("surefire.html");
+ assertTrue("Expecting surefire report file", reportFile.isFile());
}
private SurefireLauncher unpack() throws VerificationException {
final SurefireLauncher unpack = unpack("surefire-772-no-failsafe-reports");
- unpack.maven().deleteSiteDir().skipClean().failNever().verifyFileNotPresent("site");
+ unpack.maven().deleteReportsDir().skipClean().failNever().verifyFileNotPresent("reports");
return unpack;
}
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
index 845909210..4ca1b4366 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772NoSurefireReportsIT.java
@@ -38,11 +38,11 @@ public class Surefire772NoSurefireReportsIT extends SurefireJUnit4IntegrationTes
OutputValidator validator =
unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire.html");
- assertTrue("Expecting surefire report file", siteFile.isFile());
+ TestFile reportFile = validator.getReportsFile("surefire.html");
+ assertTrue("Expecting surefire report file", reportFile.isFile());
- siteFile = validator.getSiteFile("failsafe.html");
- assertTrue("Expecting failsafe report file", siteFile.isFile());
+ reportFile = validator.getReportsFile("failsafe.html");
+ assertTrue("Expecting failsafe report file", reportFile.isFile());
}
@Test
@@ -52,11 +52,11 @@ public class Surefire772NoSurefireReportsIT extends SurefireJUnit4IntegrationTes
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire.html");
- assertFalse("Expecting no surefire report file", siteFile.isFile());
+ TestFile reportFile = validator.getReportsFile("surefire.html");
+ assertFalse("Expecting no surefire report file", reportFile.isFile());
- siteFile = validator.getSiteFile("failsafe.html");
- assertTrue("Expecting failsafe report file", siteFile.isFile());
+ reportFile = validator.getReportsFile("failsafe.html");
+ assertTrue("Expecting failsafe report file", reportFile.isFile());
}
@Test
@@ -66,11 +66,11 @@ public class Surefire772NoSurefireReportsIT extends SurefireJUnit4IntegrationTes
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire.html");
- assertFalse("Expecting no surefire report file", siteFile.isFile());
+ TestFile reportFile = validator.getReportsFile("surefire.html");
+ assertFalse("Expecting no surefire report file", reportFile.isFile());
- siteFile = validator.getSiteFile("failsafe.html");
- assertTrue("Expecting failsafe report file", siteFile.isFile());
+ reportFile = validator.getReportsFile("failsafe.html");
+ assertTrue("Expecting failsafe report file", reportFile.isFile());
}
@Test
@@ -81,16 +81,16 @@ public class Surefire772NoSurefireReportsIT extends SurefireJUnit4IntegrationTes
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire.html");
- assertFalse("Expecting no surefire report file", siteFile.isFile());
+ TestFile reportFile = validator.getReportsFile("surefire.html");
+ assertFalse("Expecting no surefire report file", reportFile.isFile());
- siteFile = validator.getSiteFile("failsafe.html");
- assertTrue("Expecting failsafe report file", siteFile.isFile());
+ reportFile = validator.getReportsFile("failsafe.html");
+ assertTrue("Expecting failsafe report file", reportFile.isFile());
}
public SurefireLauncher unpack() {
SurefireLauncher unpack = unpack("/surefire-772-no-surefire-reports");
- unpack.maven().failNever().deleteSiteDir().skipClean();
+ unpack.maven().failNever().deleteReportsDir().skipClean();
return unpack;
}
}
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
index fc37d7b6f..405fd452b 100644
--- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
+++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire772SpecifiedReportsIT.java
@@ -38,11 +38,11 @@ public class Surefire772SpecifiedReportsIT extends SurefireJUnit4IntegrationTest
OutputValidator validator =
unpack().addFailsafeReportOnlyGoal().addSurefireReportOnlyGoal().executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire.html");
- assertTrue("Expecting surefire report file", siteFile.isFile());
+ TestFile reportFile = validator.getReportsFile("surefire.html");
+ assertTrue("Expecting surefire report file", reportFile.isFile());
- siteFile = validator.getSiteFile("failsafe.html");
- assertTrue("Expecting failsafe report file", siteFile.isFile());
+ reportFile = validator.getReportsFile("failsafe.html");
+ assertTrue("Expecting failsafe report file", reportFile.isFile());
}
@Test
@@ -52,11 +52,11 @@ public class Surefire772SpecifiedReportsIT extends SurefireJUnit4IntegrationTest
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire.html");
- assertTrue("Expecting surefire report file", siteFile.isFile());
+ TestFile reportFile = validator.getReportsFile("surefire.html");
+ assertTrue("Expecting surefire report file", reportFile.isFile());
- siteFile = validator.getSiteFile("failsafe.html");
- assertFalse("Expecting no failsafe report file", siteFile.isFile());
+ reportFile = validator.getReportsFile("failsafe.html");
+ assertFalse("Expecting no failsafe report file", reportFile.isFile());
}
@Test
@@ -66,16 +66,16 @@ public class Surefire772SpecifiedReportsIT extends SurefireJUnit4IntegrationTest
.addSurefireReportOnlyGoal()
.executeCurrentGoals();
- TestFile siteFile = validator.getSiteFile("surefire.html");
- assertFalse("Expecting no surefire report file", siteFile.isFile());
+ TestFile reportFile = validator.getReportsFile("surefire.html");
+ assertFalse("Expecting no surefire report file", reportFile.isFile());
- siteFile = validator.getSiteFile("failsafe.html");
- assertTrue("Expecting failsafe report file", siteFile.isFile());
+ reportFile = validator.getReportsFile("failsafe.html");
+ assertTrue("Expecting failsafe report file", reportFile.isFile());
}
public SurefireLauncher unpack() {
SurefireLauncher unpack = unpack("/surefire-772-specified-reports");
- unpack.maven().deleteSiteDir().skipClean().failNever();
+ unpack.maven().deleteReportsDir().skipClean().failNever();
return unpack;
}
}
diff --git a/surefire-its/src/test/resources/surefire-1490-custom/pom.xml b/surefire-its/src/test/resources/surefire-1490-custom/pom.xml
index 4fda5847f..e74cc7a47 100644
--- a/surefire-its/src/test/resources/surefire-1490-custom/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1490-custom/pom.xml
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
+ <version>3.20.0</version>
</plugin>
</plugins>
</pluginManagement>
@@ -93,7 +93,7 @@
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.7.0</version>
<reportSets>
<reportSet>
<reports>
diff --git a/surefire-its/src/test/resources/surefire-1490-default/pom.xml b/surefire-its/src/test/resources/surefire-1490-default/pom.xml
index 186063a9d..b059f65bf 100644
--- a/surefire-its/src/test/resources/surefire-1490-default/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1490-default/pom.xml
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
+ <version>3.20.0</version>
</plugin>
</plugins>
</pluginManagement>
@@ -93,7 +93,7 @@
</plugin>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.7.0</version>
<reportSets>
<reportSet>
<reports>
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 d6bfdf956..eee2fc04d 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.12.1</version>
+ <version>3.20.0</version>
</plugin>
</plugins>
</build>
@@ -67,7 +67,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.7.0</version>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
diff --git a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/pom.xml b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
index 9a9b1df35..4bca6f450 100644
--- a/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
+++ b/surefire-its/src/test/resources/surefire-570-multipleReportDirectories/pom.xml
@@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.12.1</version>
+ <version>3.20.0</version>
</plugin>
</plugins>
</pluginManagement>