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/01/02 14:55:59 UTC
(maven-surefire) branch SUREFIRE-2161 created (now d1aec0284)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch SUREFIRE-2161
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
at d1aec0284 [SUREFIRE-2161] Align Mojo class names and output names
This branch includes the following new commits:
new d1aec0284 [SUREFIRE-2161] Align Mojo class names and output names
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(maven-surefire) 01/01: [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 SUREFIRE-2161
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit d1aec02847e5b77981b40ee73eed152e80f9de5e
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 +-
.../plugins/surefire/report/JUnit4SuiteTest.java | 2 +-
...ReportMojoTest.java => SurefireReportTest.java} | 28 ++++++------
...ub.java => SurefireReportMavenProjectStub.java} | 2 +-
...2.java => SurefireReportMavenProjectStub2.java} | 2 +-
.../plugin-config.xml | 2 +-
.../plugin-config.xml | 2 +-
.../plugin-config.xml | 2 +-
.../plugin-config.xml | 2 +-
.../basic-surefire-report-test/plugin-config.xml | 2 +-
.../resources/unit/surefire-1183/plugin-config.xml | 2 +-
.../plugin-config.xml | 2 +-
.../surefire-report-enclosed/plugin-config.xml | 2 +-
.../plugin-config.xml | 2 +-
.../surefire-report-nestedClass/plugin-config.xml | 2 +-
.../surefire-report-single-error/plugin-config.xml | 2 +-
22 files changed, 61 insertions(+), 62 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 6dff7cadc..c3741e507 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
@@ -162,7 +162,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 aa256b983..ac1d50221 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 a2ace0b77..4d08d7de9 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-3.0.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 3ec4928f9..847c29cb2 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/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 97%
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..5d38c0c46 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");
@@ -119,7 +119,7 @@ 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();
@@ -134,7 +134,7 @@ 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();
@@ -149,7 +149,7 @@ 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");
@@ -163,7 +163,7 @@ 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");
@@ -180,7 +180,7 @@ 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");
assertTrue(report.exists());
@@ -267,7 +267,7 @@ 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");
@@ -331,7 +331,7 @@ 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");
assertTrue(report.exists());
@@ -418,7 +418,7 @@ 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");
@@ -482,7 +482,7 @@ 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");
assertTrue(report.exists());
@@ -579,7 +579,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");
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..de261c2f9 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,7 +25,7 @@
<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>
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..636d7c296 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,7 +25,7 @@
<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>
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..961cf3757 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,7 +25,7 @@
<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>
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..8301318ff 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,7 +25,7 @@
<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>
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..808387752 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,7 +25,7 @@
<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>
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..eea0ee279 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,7 +25,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<configuration>
<project
- implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireRepMavenProjectStub"/>
+ implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/>
<outputName>acceptance-test-report</outputName>
<localRepository>${localRepository}</localRepository>
<customBundle>${basedir}/src/test/resources/unit/surefire-1183/src/site/custom/surefire-report.properties</customBundle>
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..86d893d69 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,7 +25,7 @@
<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>
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..2ee7e9fe5 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,7 +25,7 @@
<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>
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..ac3ee5db9 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,7 +25,7 @@
<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>
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..49cd79b7b 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,7 +25,7 @@
<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>
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..4dad64907 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,7 +25,7 @@
<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>