[SUREFIRE-1063] Fix typos and grammatical errors
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/4f97226d Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/4f97226d Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/4f97226d Branch: refs/heads/master Commit: 4f97226d279c67d480bf52eb326011060bddf0a0 Parents: aff2622 Author: Eric Dahl <eric.c.d...@gmail.com> Authored: Fri Feb 21 18:25:01 2014 -0600 Committer: Andreas Gudian <agud...@apache.org> Committed: Sun Mar 9 20:16:02 2014 +0100 ---------------------------------------------------------------------- .../maven/plugin/surefire/booterclient/ForkConfiguration.java | 2 +- .../apache/maven/plugin/surefire/booterclient/ForkStarter.java | 4 ++-- maven-surefire-plugin/src/site/fml/faq.fml | 2 +- .../org/apache/maven/surefire/booter/ForkingRunListener.java | 2 +- .../apache/maven/surefire/providerapi/ProviderParameters.java | 2 +- .../org/apache/maven/surefire/report/ConsoleOutputCapture.java | 2 +- .../java/org/apache/maven/surefire/booter/ProviderFactory.java | 2 +- .../src/test/resources/fork-mode-testng/pom.xml | 2 +- .../resources/testng-junit-together/src/test/java/JunitTest.java | 2 +- .../src/test/java/Junit4NoRunWithTest.java | 2 +- .../src/test/java/Junit4SimpleRunWithTest.java | 2 +- surefire-shadefire/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java index 079ee32..ca9bff1 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkConfiguration.java @@ -210,7 +210,7 @@ public class ForkConfiguration /** * Replaces expressions <pre>@{property-name}</pre> with the corresponding properties - * from the model. This allows late evaluation of property values when the plugin is exexcuted (as compared + * from the model. This allows late evaluation of property values when the plugin is executed (as compared * to evaluation when the pom is parsed as is done with <pre>${property-name}</pre> expressions). * * This allows other plugins to modify or set properties with the changes getting picked up by surefire. http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java index 95bc007..8861e51 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java @@ -483,8 +483,8 @@ public class ForkStarter { // noinspection ThrowFromFinallyBlock throw new RuntimeException( - "The forked VM terminated without saying properly goodbye. VM crash or System.exit called ?" - + "\nCommand was" + cli.toString() ); + "The forked VM terminated without properly saying goodbye. VM crash or System.exit called?" + + "\nCommand was " + cli.toString() ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/maven-surefire-plugin/src/site/fml/faq.fml ---------------------------------------------------------------------- diff --git a/maven-surefire-plugin/src/site/fml/faq.fml b/maven-surefire-plugin/src/site/fml/faq.fml index a518c57..8308a9a 100644 --- a/maven-surefire-plugin/src/site/fml/faq.fml +++ b/maven-surefire-plugin/src/site/fml/faq.fml @@ -51,7 +51,7 @@ under the License. </answer> </faq> <faq id="vm-termination"> - <question>Surefire fails with the message "The forked VM terminated without saying properly goodbye"</question> + <question>Surefire fails with the message "The forked VM terminated without properly saying goodbye"</question> <answer> <p> Surefire does not support tests or any referenced libraries calling System.exit() at any time. If http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java index 6bb2491..0af1e29 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java @@ -173,7 +173,7 @@ public class ForkingRunListener int i = StringUtils.escapeBytesToPrintable( content, 0, buf, off, len ); content[i++] = (byte) '\n'; - synchronized ( target ) // See notes about synhronization/thread safety in class javadoc + synchronized ( target ) // See notes about synchronization/thread safety in class javadoc { target.write( header, 0, header.length ); target.write( content, 0, i ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java index 94f0261..06048e9 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/providerapi/ProviderParameters.java @@ -76,7 +76,7 @@ public interface ProviderParameters /** * Gets a logger intended for console output. * <p/> - * This output is inteded for provider-oriented messages that are not attached to a single test-set + * This output is intended for provider-oriented messages that are not attached to a single test-set * and will normally be written to something console-like immediately. * * @return A console logger http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java index c7c6069..dd1d665 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ConsoleOutputCapture.java @@ -84,7 +84,7 @@ public class ConsoleOutputCapture { if ( s == null ) { - s = "null"; // Shamelessy taken from super.print + s = "null"; // Shamelessly taken from super.print } final byte[] bytes = s.getBytes(); final byte[] join = ByteBuffer.join( bytes, 0, bytes.length, newline, 0, 1 ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java ---------------------------------------------------------------------- diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java index e0c88bc..02454aa 100644 --- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java +++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java @@ -69,7 +69,7 @@ public class ProviderFactory { final PrintStream orgSystemOut = System.out; final PrintStream orgSystemErr = System.err; - // Note that System.out/System.err are also read in the "ReporterConfiguration" instatiation + // Note that System.out/System.err are also read in the "ReporterConfiguration" instantiation // in createProvider below. These are the same values as here. ProviderFactory providerFactory = http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml b/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml index 25b66f0..ec5d3c6 100644 --- a/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml +++ b/surefire-integration-tests/src/test/resources/fork-mode-testng/pom.xml @@ -41,7 +41,7 @@ <scope>test</scope> <exclusions> <exclusion> - <!-- NOTE: Deliberaty excluding junit to enforce TestNG only tests, cf. SUREFIRE-642 --> + <!-- NOTE: Deliberately excluding junit to enforce TestNG only tests, cf. SUREFIRE-642 --> <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/JunitTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/JunitTest.java b/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/JunitTest.java index 84287c0..58931a9 100644 --- a/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/JunitTest.java +++ b/surefire-integration-tests/src/test/resources/testng-junit-together/src/test/java/JunitTest.java @@ -29,7 +29,7 @@ public class JunitTest extends TestCase { Object testObject; /** - * Creats an object instance + * Creates an object instance */ public void setUp() { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4NoRunWithTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4NoRunWithTest.java b/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4NoRunWithTest.java index 8641825..a7b6934 100644 --- a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4NoRunWithTest.java +++ b/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4NoRunWithTest.java @@ -33,7 +33,7 @@ public class Junit4NoRunWithTest { Object testObject; /** - * Creats an object instance + * Creates an object instance */ @Before public void setUp() http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4SimpleRunWithTest.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4SimpleRunWithTest.java b/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4SimpleRunWithTest.java index 38f9215..d9a6420 100644 --- a/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4SimpleRunWithTest.java +++ b/surefire-integration-tests/src/test/resources/testng-junit4-together/src/test/java/Junit4SimpleRunWithTest.java @@ -36,7 +36,7 @@ public class Junit4SimpleRunWithTest { Object testObject; /** - * Creats an object instance + * Creates an object instance */ @Before public void setUp() http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4f97226d/surefire-shadefire/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml index d20208d..280da55 100644 --- a/surefire-shadefire/pom.xml +++ b/surefire-shadefire/pom.xml @@ -31,7 +31,7 @@ <name>ShadeFire JUnit3 Provider</name> <description>A super-shaded junit3 provider that is used by surefire to build itself, - that basically has ALL classes relocated to facilitate no API-conflict whatsover with ourself. + that basically has ALL classes relocated to facilitate no API-conflict whatsoever with ourself. The only remaining point of conflict is around the booter properties file format </description> <licenses>