You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2024/10/16 12:15:31 UTC
(maven-surefire) branch master updated: [SUREFIRE-2278] Don't say please. (#792)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new f144b1302 [SUREFIRE-2278] Don't say please. (#792)
f144b1302 is described below
commit f144b13026fc25bfb99f535ac8be6f215bae1123
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Wed Oct 16 12:15:24 2024 +0000
[SUREFIRE-2278] Don't say please. (#792)
---
.../org/apache/maven/plugin/surefire/SurefireHelper.java | 4 ++--
.../org/apache/maven/plugin/surefire/SurefireHelperTest.java | 12 ++++++------
.../org/apache/maven/plugin/surefire/SurefireMojoTest.java | 8 ++++----
.../java/org/apache/maven/surefire/api/util/RunOrder.java | 2 +-
.../apache/maven/surefire/junitcore/AsynchronousRunner.java | 2 +-
.../surefire/junitcore/ConfigurableParallelComputer.java | 2 +-
.../apache/maven/surefire/junitcore/SynchronousRunner.java | 2 +-
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
index 03158be67..6285506c7 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java
@@ -270,11 +270,11 @@ public final class SurefireHelper {
.append(reportParameters.getFailOnFlakeCount())
.append(".");
}
- msg.append("\n\nPlease refer to ")
+ msg.append("\n\nSee ")
.append(reportParameters.getReportsDirectory())
.append(" for the individual test results.")
.append('\n')
- .append("Please refer to dump files (if any exist) ")
+ .append("See dump files (if any exist) ")
.append(DUMP_FILES_PRINT[0])
.append(", ")
.append(DUMP_FILES_PRINT[1])
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
index 7e3a64a43..88c609ea5 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java
@@ -163,8 +163,8 @@ public class SurefireHelperTest {
public void shouldHandleTestFailure() throws Exception {
RunResult summary = new RunResult(1, 0, 1, 0);
e.expect(MojoFailureException.class);
- e.expectMessage("There are test failures.\n\nPlease refer to null "
- + "for the individual test results.\nPlease refer to dump files (if any exist) "
+ e.expectMessage("There are test failures.\n\nSee null "
+ + "for the individual test results.\nSee dump files (if any exist) "
+ "[date].dump, [date]-jvmRun[N].dump and [date].dumpstream.");
reportExecution(new Mojo(), summary, null, null);
}
@@ -175,8 +175,8 @@ public class SurefireHelperTest {
Mojo reportParameters = new Mojo();
reportParameters.setFailOnFlakeCount(1);
e.expect(MojoFailureException.class);
- e.expectMessage("There is 1 flake and failOnFlakeCount is set to 1.\n\nPlease refer to null "
- + "for the individual test results.\nPlease refer to dump files (if any exist) "
+ e.expectMessage("There is 1 flake and failOnFlakeCount is set to 1.\n\nSee null "
+ + "for the individual test results.\nSee dump files (if any exist) "
+ "[date].dump, [date]-jvmRun[N].dump and [date].dumpstream.");
reportExecution(reportParameters, summary, null, null);
}
@@ -188,8 +188,8 @@ public class SurefireHelperTest {
reportParameters.setFailOnFlakeCount(1);
e.expect(MojoFailureException.class);
e.expectMessage("There are test failures.\nThere are 2 flakes and failOnFlakeCount is set to 1."
- + "\n\nPlease refer to null "
- + "for the individual test results.\nPlease refer to dump files (if any exist) "
+ + "\n\nSee null "
+ + "for the individual test results.\nSee dump files (if any exist) "
+ "[date].dump, [date]-jvmRun[N].dump and [date].dumpstream.");
reportExecution(reportParameters, summary, null, null);
}
diff --git a/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefireMojoTest.java b/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefireMojoTest.java
index 74cc03802..a0d3833f5 100644
--- a/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefireMojoTest.java
+++ b/maven-surefire-plugin/src/test/java/org/apache/maven/plugin/surefire/SurefireMojoTest.java
@@ -67,14 +67,14 @@ public class SurefireMojoTest extends TestCase {
mojo.handleSummary(runResult, null);
} catch (MojoFailureException e) {
assertThat(e.getLocalizedMessage())
- .isEqualTo("There are test failures.\n\nPlease refer to null "
- + "for the individual test results.\nPlease refer to dump files (if any exist) "
+ .isEqualTo("There are test failures.\n\nSee null "
+ + "for the individual test results.\nSee dump files (if any exist) "
+ "[date].dump, [date]-jvmRun[N].dump and [date].dumpstream.");
return;
}
fail("Expected MojoFailureException with message "
- + "'There are test failures.\n\nPlease refer to null "
- + "for the individual test results.\nPlease refer to dump files (if any exist) "
+ + "'There are test failures.\n\nSee null "
+ + "for the individual test results.\nSee dump files (if any exist) "
+ "[date].dump, [date]-jvmRun[N].dump and [date].dumpstream.'");
}
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/RunOrder.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/RunOrder.java
index 28334c3a0..263b31239 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/RunOrder.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/RunOrder.java
@@ -81,7 +81,7 @@ public class RunOrder {
RunOrder[] runOrders = values();
StringBuilder message = new StringBuilder("There's no RunOrder with the name ");
message.append(name);
- message.append(". Please use one of the following RunOrders: ");
+ message.append(". Use one of the following RunOrders: ");
for (int i = 0; i < runOrders.length; i++) {
if (i != 0) {
message.append(", ");
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
index e4f7df924..39a96b075 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
@@ -30,7 +30,7 @@ import org.junit.runners.model.RunnerScheduler;
/**
* Since SUREFIRE 2.18 this class is deprecated.
- * Please use {@link org.apache.maven.surefire.junitcore.pc.ParallelComputerBuilder} instead.
+ * Use {@link org.apache.maven.surefire.junitcore.pc.ParallelComputerBuilder} instead.
*
* @author <a href="mailto:kristian@zenior.no">Kristian Rosenvold</a>
*/
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
index 49c0037bd..c74021aa9 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
@@ -37,7 +37,7 @@ import org.junit.runners.model.RunnerScheduler;
/**
* Since SUREFIRE 2.18 this class is deprecated.
- * Please use {@link org.apache.maven.surefire.junitcore.pc.ParallelComputerBuilder} instead.
+ * Use {@link org.apache.maven.surefire.junitcore.pc.ParallelComputerBuilder} instead.
*
* @author Kristian Rosenvold
*/
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
index 6fd23b6d8..6d57ce864 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
@@ -22,7 +22,7 @@ import org.junit.runners.model.RunnerScheduler;
/**
* Since SUREFIRE 2.18 this class is deprecated.
- * Please use {@link org.apache.maven.surefire.junitcore.pc.ParallelComputerBuilder} instead.
+ * Use {@link org.apache.maven.surefire.junitcore.pc.ParallelComputerBuilder} instead.
*
* @author <a href="mailto:kristian@zenior.no">Kristian Rosenvold</a>
*/