Repository: maven-surefire Updated Branches: refs/heads/master 303cc8acd -> bd75bac32
[SUREFIRE-1315] Fix stylistic errors in DefaultReporterFactory Label refinements based on discussion on maven-dev. Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/bd75bac3 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/bd75bac3 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/bd75bac3 Branch: refs/heads/master Commit: bd75bac320301db3fc4d8aec5b431f4d10171eb9 Parents: 303cc8a Author: Michael Osipov <[email protected]> Authored: Mon Dec 26 17:51:23 2016 +0100 Committer: Michael Osipov <[email protected]> Committed: Mon Dec 26 17:59:56 2016 +0100 ---------------------------------------------------------------------- .../plugin/surefire/report/DefaultReporterFactory.java | 12 ++++++------ .../surefire/report/DefaultReporterFactoryTest.java | 4 ++-- .../src/site/markdown/newerrorsummary.md | 4 ++-- .../maven/surefire/its/JUnit4RerunFailingTestsIT.java | 10 +++++----- .../jiras/Surefire1146RerunFailedAndParameterized.java | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bd75bac3/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java index 342e883..b4a6f30 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java @@ -427,12 +427,12 @@ public class DefaultReporterFactory enum TestResultType { - error( "Erroneous Tests: " ), - failure( "Failed Tests: " ), - flake( "Flaky Tests: " ), - success( "Success: " ), - skipped( "Skipped: " ), - unknown( "Unknown: " ); + error( "Errors: " ), + failure( "Failures: " ), + flake( "Flakes: " ), + success( "Success: " ), + skipped( "Skipped: " ), + unknown( "Unknown: " ); private final String logPrefix; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bd75bac3/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java index 98f97bd..fbe875d 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java @@ -120,7 +120,7 @@ public class DefaultReporterFactoryTest // Now test the result will be printed out correctly factory.printTestFailures( flake ); String[] expectedFlakeOutput = - { "Flaky Tests: ", TEST_FOUR, " Run 1: " + ASSERTION_FAIL, " Run 2: PASS", "", TEST_ONE, + { "Flakes: ", TEST_FOUR, " Run 1: " + ASSERTION_FAIL, " Run 2: PASS", "", TEST_ONE, " Run 1: " + ERROR, " Run 2: " + ASSERTION_FAIL, " Run 3: PASS", "", TEST_TWO, " Run 1: " + ERROR, " Run 2: PASS", "" }; assertEquals( asList( expectedFlakeOutput ), reporter.getMessages() ); @@ -128,7 +128,7 @@ public class DefaultReporterFactoryTest reporter.reset(); factory.printTestFailures( error ); String[] expectedFailureOutput = - { "Erroneous Tests: ", TEST_THREE, " Run 1: " + ASSERTION_FAIL, " Run 2: " + ERROR, " Run 3: " + ERROR, "" + { "Errors: ", TEST_THREE, " Run 1: " + ASSERTION_FAIL, " Run 2: " + ERROR, " Run 3: " + ERROR, "" }; assertEquals( asList( expectedFailureOutput ), reporter.getMessages() ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bd75bac3/maven-surefire-plugin/src/site/markdown/newerrorsummary.md ---------------------------------------------------------------------- diff --git a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md index 09537e3..88cd7c3 100644 --- a/maven-surefire-plugin/src/site/markdown/newerrorsummary.md +++ b/maven-surefire-plugin/src/site/markdown/newerrorsummary.md @@ -26,11 +26,11 @@ report of the run or the files on disk. ### Example output: - Failed Tests: + Failures: Test1.assertion1:59 Bending maths expected:<[123]> but was:<[312]> Test1.assertion2:64 True is false - Erroneous Tests: + Errors: Test1.nullPointerInLibrary:38 » NullPointer Test1.failInMethod:43->innerFailure:68 NullPointer Fail here Test1.failInLibInMethod:48 » NullPointer http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bd75bac3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java index f216e08..7d6f560 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RerunFailingTestsIT.java @@ -216,11 +216,11 @@ public class JUnit4RerunFailingTestsIT private void verifyFailuresOneRetry( OutputValidator outputValidator, int run, int failures, int errors, int flakes ) { - outputValidator.verifyTextInLog( "Failed Tests:" ); + outputValidator.verifyTextInLog( "Failures:" ); outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testFailingTestOne" ); outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testFailingTestOne" ); - outputValidator.verifyTextInLog( "Erroneous Tests:" ); + outputValidator.verifyTextInLog( "Errors:" ); outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testErrorTestOne" ); outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testErrorTestOne" ); @@ -230,7 +230,7 @@ public class JUnit4RerunFailingTestsIT private void verifyOnlyFailuresOneRetry( OutputValidator outputValidator, int run, int failures, int errors, int flakes ) { - outputValidator.verifyTextInLog( "Failed Tests:" ); + outputValidator.verifyTextInLog( "Failures:" ); outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testFailingTestOne" ); outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testFailingTestOne" ); @@ -240,7 +240,7 @@ public class JUnit4RerunFailingTestsIT private void verifyFailuresTwoRetry( OutputValidator outputValidator, int run, int failures, int errors, int flakes ) { - outputValidator.verifyTextInLog( "Flaky Tests:" ); + outputValidator.verifyTextInLog( "Flakes:" ); outputValidator.verifyTextInLog( "Run 1: FlakyFirstTimeTest.testFailingTestOne" ); outputValidator.verifyTextInLog( "Run 2: FlakyFirstTimeTest.testFailingTestOne" ); outputValidator.verifyTextInLog( "Run 3: PASS" ); @@ -253,7 +253,7 @@ public class JUnit4RerunFailingTestsIT private void verifyFailuresNoRetry( OutputValidator outputValidator, int run, int failures, int errors, int flakes ) { - outputValidator.verifyTextInLog( "Failed Tests:" ); + outputValidator.verifyTextInLog( "Failures:" ); outputValidator.verifyTextInLog( "testFailingTestOne(junit4.FlakyFirstTimeTest)" ); outputValidator.verifyTextInLog( "ERROR" ); outputValidator.verifyTextInLog( "testErrorTestOne(junit4.FlakyFirstTimeTest)" ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bd75bac3/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java index 8ebc6ec..84735a9 100644 --- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java +++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire1146RerunFailedAndParameterized.java @@ -39,7 +39,7 @@ public class Surefire1146RerunFailedAndParameterized private void verify( OutputValidator outputValidator, int run, int failures, int errors, int skipped, int flakes ) { - outputValidator.verifyTextInLog( "Flaky Tests:" ); + outputValidator.verifyTextInLog( "Flakes:" ); outputValidator.verifyTextInLog( "jiras.surefire1146.CustomDescriptionParameterizedTest.flakyTest[0: (Test11); Test12; Test13;](jiras.surefire1146.CustomDescriptionParameterizedTest)" ); outputValidator.verifyTextInLog( "Run 1: CustomDescriptionParameterizedTest.flakyTest:" ); outputValidator.verifyTextInLog( "Run 2: CustomDescriptionParameterizedTest.flakyTest:" );
