From 833c034deba3ad618400675201492a79f7e3af7a Mon Sep 17 00:00:00 2001 From: Michael Osipov Date: Tue, 2 Jan 2024 15:23:55 +0100 Subject: [PATCH] [SUREFIRE-2161] Align Mojo class names and output names --- .../plugin/surefire/AbstractSurefireMojo.java | 1 - ...{SurefirePlugin.java => SurefireMojo.java} | 2 +- ...ePluginTest.java => SurefireMojoTest.java} | 52 ++++++++-------- ...tMojo.java => AbstractSurefireReport.java} | 2 +- ...eportMojo.java => FailsafeOnlyReport.java} | 4 +- ...tOnlyMojo.java => SurefireOnlyReport.java} | 2 +- ...ireReportMojo.java => SurefireReport.java} | 4 +- .../apt/examples/changing-report-name.apt.vm | 2 +- .../surefire/report/JUnit4SuiteTest.java | 2 +- ...tMojoTest.java => SurefireReportTest.java} | 61 +++++++++---------- ...va => SurefireReportMavenProjectStub.java} | 2 +- ...a => SurefireReportMavenProjectStub2.java} | 2 +- .../plugin-config.xml | 4 +- .../plugin-config.xml | 4 +- .../plugin-config.xml | 4 +- .../plugin-config.xml | 4 +- .../plugin-config.xml | 4 +- .../unit/surefire-1183/plugin-config.xml | 4 +- .../plugin-config.xml | 4 +- .../plugin-config.xml | 4 +- .../plugin-config.xml | 4 +- .../plugin-config.xml | 4 +- .../plugin-config.xml | 4 +- .../maven/surefire/its/AggregateReportIT.java | 2 +- .../surefire/its/CheckTestNgReportTestIT.java | 2 +- .../Surefire1490ReportTitleDescriptionIT.java | 8 +-- .../Surefire260TestWithIdenticalNamesIT.java | 2 +- ...urefire570MultipleReportDirectoriesIT.java | 4 +- .../jiras/Surefire740TruncatedCommaIT.java | 2 +- .../its/jiras/Surefire772BothReportsIT.java | 12 ++-- .../jiras/Surefire772NoFailsafeReportsIT.java | 6 +- .../jiras/Surefire772NoSurefireReportsIT.java | 16 ++--- .../jiras/Surefire772SpecifiedReportsIT.java | 12 ++-- 33 files changed, 120 insertions(+), 126 deletions(-) rename maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/{SurefirePlugin.java => SurefireMojo.java} (99%) rename maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/{SurefirePluginTest.java => SurefireMojoTest.java} (68%) rename maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/{AbstractSurefireReportMojo.java => AbstractSurefireReport.java} (99%) rename maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/{FailsafeReportMojo.java => FailsafeOnlyReport.java} (94%) rename maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/{SurefireReportOnlyMojo.java => SurefireOnlyReport.java} (95%) rename maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/{SurefireReportMojo.java => SurefireReport.java} (94%) rename maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/{SurefireReportMojoTest.java => SurefireReportTest.java} (94%) rename maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/{SurefireRepMavenProjectStub.java => SurefireReportMavenProjectStub.java} (97%) rename maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/stubs/{SurefireRepMavenProjectStub2.java => SurefireReportMavenProjectStub2.java} (94%) 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 6dff7cadc1..c3741e507c 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 @@ * 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 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 aa256b9831..ac1d50221a 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 @@ 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 a2ace0b770..4d08d7de9a 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 @@ /** * */ -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 void testFailIfNoTests() throws Exception { 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 void testTestFailure() throws Exception { } 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 3ec4928f93..847c29cb21 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 @@ * * @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 9e889cd664..7e6b208404 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 @@ */ @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 ec60196e33..d523e97697 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 @@ @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 78a096fd79..1405ba9c9c 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 @@ @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 de9e8b5e29..59b404d230 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 - "" by default), the <> property should + "<<>>" by default), the <<>> 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 74df21fec5..fc1eaefd35 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 static Test suite() { 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 8dab21e862..3da193a92d 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 @@ * @author Allan Ramirez */ @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 @@ protected void tearDown() throws Exception { 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 @@ protected SurefireReportMojo createReportMojo(File pluginXmlFile) throws Excepti 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 void testBasicSurefireReport() throws Exception { 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 @@ private File getUnitBaseDir() throws UnsupportedEncodingException { 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 void testBasicSurefireReportIfShowSuccessIsFalse() throws Exception { 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 void testBasicSurefireReportIfLinkXrefIsFalse() throws Exception { 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 void testBasicSurefireReportIfReportingIsNull() throws Exception { @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 void testBasicSurefireReport_AnchorTestCases() throws Exception { 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 void testSurefireReportSingleError() throws Exception { 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 void testSurefireReportNestedClassTrimStackTrace() throws Exception { 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 void testSurefireReportNestedClass() throws Exception { 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 void testSurefireReportEnclosedTrimStackTrace() throws Exception { 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 void testSurefireReportEnclosed() throws Exception { 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 void testCustomTitleAndDescriptionReport() throws Exception { 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 bd4497c243..de27f52f86 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 @@ /** * @author Allan Ramirez */ -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 9365879e4b..1e4a58d6ec 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 @@ /** * @author Allan Ramirez */ -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 3045dce6dc..e943053647 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 @@ ${basedir}/target/site/unit/basic-surefire-report-anchor-test-cases ${localRepository} - + true ${basedir}/src/test/resources/unit/basic-surefire-report-anchor-test-cases/surefire-reports - surefire-report + surefire ${basedir}/target/site/unit/basic-surefire-report-anchor-test-cases/xref-test 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 e0586aad1d..d175839c6e 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 @@ ${basedir}/target/site/unit/basic-surefire-report-linkxref-false ${localRepository} - + true ${basedir}/src/test/resources/unit/basic-surefire-report-linkxref-false/surefire-reports - surefire-report + surefire ${basedir}/target/site/unit/basic-surefire-report-linkxref-false/xref-test false 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 8aca877bd4..dfe6b6767a 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 @@ ${basedir}/target/site/unit/basic-surefire-report-reporting-null ${localRepository} - + true ${basedir}/src/test/resources/unit/basic-surefire-report-reporting-null/surefire-reports - surefire-report + surefire ${basedir}/target/site/unit/basic-surefire-report-test/xref-test true 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 c798591122..eae36a0080 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 @@ ${basedir}/target/site/unit/basic-surefire-report-success-false ${localRepository} - + false ${basedir}/src/test/resources/unit/basic-surefire-report-success-false/surefire-reports - surefire-report + surefire ${basedir}/target/site/unit/basic-surefire-report-success-false/xref-test true 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 81e59caf1a..08cc7a39ef 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 @@ ${basedir}/target/site/unit/basic-surefire-report-test ${localRepository} - + true ${basedir}/src/test/resources/unit/basic-surefire-report-test/surefire-reports - surefire-report + surefire ${basedir}/target/site/unit/basic-surefire-report-test/xref-test true 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 108f583508..2a4c04a0b7 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 @@ maven-surefire-report-plugin - acceptance-test-report + implementation="org.apache.maven.plugins.surefire.report.stubs.SurefireReportMavenProjectStub"/> + acceptance-test ${localRepository} ${basedir}/src/test/resources/unit/surefire-1183/src/site/custom/surefire-report.properties ${basedir}/target/site/unit/surefire-1183 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 981bb18824..492c62a3bc 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 @@ ${basedir}/target/site/unit/surefire-report-enclosed-trimStackTrace ${localRepository} - + true ${basedir}/src/test/resources/unit/surefire-report-enclosed-trimStackTrace/surefire-reports - surefire-report + surefire ${basedir}/target/site/unit/surefire-report-enclosed-trimStackTrace/xref-test true 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 26bae34abb..25527c3703 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 @@ ${basedir}/target/site/unit/surefire-report-enclosed ${localRepository} - + true ${basedir}/src/test/resources/unit/surefire-report-enclosed/surefire-reports - surefire-report + surefire ${basedir}/target/site/unit/surefire-report-enclosed/xref-test true 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 dcf6a9a723..ce9bc49718 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 @@ ${basedir}/target/site/unit/surefire-report-nestedClass-trimStackTrace ${localRepository} - + true ${basedir}/src/test/resources/unit/surefire-report-nestedClass-trimStackTrace/surefire-reports - surefire-report + surefire ${basedir}/target/site/unit/surefire-report-nestedClass-trimStackTrace/xref-test true 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 86ff4639b5..27302b0a9a 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 @@ ${basedir}/target/site/unit/surefire-report-nestedClass ${localRepository} - + true ${basedir}/src/test/resources/unit/surefire-report-nestedClass/surefire-reports - surefire-report + surefire ${basedir}/target/site/unit/surefire-report-nestedClass/xref-test true 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 e8a3f58895..70767d4b46 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 @@ ${basedir}/target/site/unit/surefire-report-single-error ${localRepository} - + true ${basedir}/src/test/resources/unit/surefire-report-single-error/surefire-reports - surefire-report + surefire ${basedir}/target/site/unit/surefire-report-single-error/xref-test true 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 68676a8079..8a5293faa4 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 ddf01f5000..30aaefcf3d 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 void testNgReport() { .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 903a2e55fb..e49aa46242 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 void shouldHaveDefaultReportTitleAndDescription() { .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 void shouldHaveCustomizedReportTitleAndDescription() { .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 981bfd02c4..07e6da39ce 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 void testWithIdenticalNames() throws IOException { .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 25b76e2cad..95a9809309 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 void testReportWithAggregate() { 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 void testReportWithoutAggregate() throws Exception { 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 a74ed027e4..78340ce3bc 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 void testRussianLocaleReport() { .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 10bf88dcea..5042988ad7 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 void testReportGeneration() { 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 void testSkippedFailsafeReportGeneration() { .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 void testSkippedSurefireReportGeneration() { .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 adce8ef2f0..aa4bd21b68 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 void testSkipForcedFailsafeReportGeneration() throws Exception { } 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 a34bd51123..845909210b 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 void testReportGeneration() { 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 void testSkippedSurefireReportGeneration() { .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 void testOptionalSurefireReportGeneration() { .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 void testSkipOptionalSurefireReportGeneration() { .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 6c57ae8c2d..fc37d7b6f9 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 void testReportGeneration() { 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 void testSkippedFailsafeReportGeneration() { .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 void testSkippedSurefireReportGeneration() { .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()); }