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 4c5393fc7553728fbcd92917e0fc3e5c0a7839fd
Author: Michael Osipov <micha...@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 47d691a13..1e1a704c8 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
@@ -159,7 +159,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:arami...@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:arami...@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:arami...@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());
}
