This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch use-renderer in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/use-renderer by this push: new 394a470b3 Next fix 394a470b3 is described below commit 394a470b35b34bbd61bd513c7f403916a3081e5f Author: Michael Osipov <micha...@apache.org> AuthorDate: Mon May 1 22:21:49 2023 +0200 Next fix --- .../surefire/its/jiras/Surefire1490ReportTitleDescriptionIT.java | 8 ++++---- .../resources/{surefire-1490 => surefire-1490-custom}/pom.xml | 2 +- .../src/site/custom/surefire-report.properties | 0 .../src/test/java/it/Surefire1490IT.java | 0 .../src/test/java/it/Surefire1490Test.java | 0 .../resources/{surefire-1490 => surefire-1490-default}/pom.xml | 2 +- .../src/test/java/it/Surefire1490IT.java | 0 .../src/test/java/it/Surefire1490Test.java | 0 8 files changed, 6 insertions(+), 6 deletions(-) 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 71b85f7f4..95c42f1e2 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 @@ -31,7 +31,7 @@ import org.junit.Test; public class Surefire1490ReportTitleDescriptionIT extends SurefireJUnit4IntegrationTestCase { @Test public void shouldHaveDefaultReportTitleAndDescription() { - OutputValidator validator = unpack().addGoal("verify").execute("site").verifyErrorFreeLog(); + OutputValidator validator = prepare("default").addGoal("verify").execute("site").verifyErrorFreeLog(); validator .getSiteFile("project-reports.html") @@ -53,7 +53,7 @@ public class Surefire1490ReportTitleDescriptionIT extends SurefireJUnit4Integrat @Test public void shouldHaveCustomizedReportTitleAndDescription() { - OutputValidator validator = unpack().addGoal("verify").execute("site").verifyErrorFreeLog(); + OutputValidator validator = prepare("custom").addGoal("verify").execute("site").verifyErrorFreeLog(); validator .getSiteFile("project-reports.html") @@ -73,8 +73,8 @@ public class Surefire1490ReportTitleDescriptionIT extends SurefireJUnit4Integrat .assertContainsText("Surefire1490Test"); } - public SurefireLauncher unpack() { - SurefireLauncher unpack = unpack("surefire-1490"); + public SurefireLauncher prepare(String suffix) { + SurefireLauncher unpack = unpack("surefire-1490-" + suffix); unpack.sysProp("user.language", "en").maven().execute("clean"); return unpack; } diff --git a/surefire-its/src/test/resources/surefire-1490/pom.xml b/surefire-its/src/test/resources/surefire-1490-custom/pom.xml similarity index 98% copy from surefire-its/src/test/resources/surefire-1490/pom.xml copy to surefire-its/src/test/resources/surefire-1490-custom/pom.xml index 1a977cc41..981709a86 100644 --- a/surefire-its/src/test/resources/surefire-1490/pom.xml +++ b/surefire-its/src/test/resources/surefire-1490-custom/pom.xml @@ -29,7 +29,7 @@ </parent> <groupId>org.apache.maven.plugins.surefire</groupId> - <artifactId>surefire-1490</artifactId> + <artifactId>surefire-1490-custom</artifactId> <version>1.0</version> <dependencies> diff --git a/surefire-its/src/test/resources/surefire-1490/src/site/custom/surefire-report.properties b/surefire-its/src/test/resources/surefire-1490-custom/src/site/custom/surefire-report.properties similarity index 100% rename from surefire-its/src/test/resources/surefire-1490/src/site/custom/surefire-report.properties rename to surefire-its/src/test/resources/surefire-1490-custom/src/site/custom/surefire-report.properties diff --git a/surefire-its/src/test/resources/surefire-1490/src/test/java/it/Surefire1490IT.java b/surefire-its/src/test/resources/surefire-1490-custom/src/test/java/it/Surefire1490IT.java similarity index 100% copy from surefire-its/src/test/resources/surefire-1490/src/test/java/it/Surefire1490IT.java copy to surefire-its/src/test/resources/surefire-1490-custom/src/test/java/it/Surefire1490IT.java diff --git a/surefire-its/src/test/resources/surefire-1490/src/test/java/it/Surefire1490Test.java b/surefire-its/src/test/resources/surefire-1490-custom/src/test/java/it/Surefire1490Test.java similarity index 100% copy from surefire-its/src/test/resources/surefire-1490/src/test/java/it/Surefire1490Test.java copy to surefire-its/src/test/resources/surefire-1490-custom/src/test/java/it/Surefire1490Test.java diff --git a/surefire-its/src/test/resources/surefire-1490/pom.xml b/surefire-its/src/test/resources/surefire-1490-default/pom.xml similarity index 98% rename from surefire-its/src/test/resources/surefire-1490/pom.xml rename to surefire-its/src/test/resources/surefire-1490-default/pom.xml index 1a977cc41..ff16daf24 100644 --- a/surefire-its/src/test/resources/surefire-1490/pom.xml +++ b/surefire-its/src/test/resources/surefire-1490-default/pom.xml @@ -29,7 +29,7 @@ </parent> <groupId>org.apache.maven.plugins.surefire</groupId> - <artifactId>surefire-1490</artifactId> + <artifactId>surefire-1490-default</artifactId> <version>1.0</version> <dependencies> diff --git a/surefire-its/src/test/resources/surefire-1490/src/test/java/it/Surefire1490IT.java b/surefire-its/src/test/resources/surefire-1490-default/src/test/java/it/Surefire1490IT.java similarity index 100% rename from surefire-its/src/test/resources/surefire-1490/src/test/java/it/Surefire1490IT.java rename to surefire-its/src/test/resources/surefire-1490-default/src/test/java/it/Surefire1490IT.java diff --git a/surefire-its/src/test/resources/surefire-1490/src/test/java/it/Surefire1490Test.java b/surefire-its/src/test/resources/surefire-1490-default/src/test/java/it/Surefire1490Test.java similarity index 100% rename from surefire-its/src/test/resources/surefire-1490/src/test/java/it/Surefire1490Test.java rename to surefire-its/src/test/resources/surefire-1490-default/src/test/java/it/Surefire1490Test.java