[SUREFIRE-968] Add test name to Test-Finished console message
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/35fc2cee Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/35fc2cee Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/35fc2cee Branch: refs/heads/master Commit: 35fc2ceec539049788575a64a110f996e30e6b29 Parents: 300d38b Author: Andreas Gudian <[email protected]> Authored: Thu Apr 4 21:12:21 2013 +0200 Committer: Kristian Rosenvold <[email protected]> Committed: Thu Apr 11 20:48:18 2013 +0200 ---------------------------------------------------------------------- .../plugin/surefire/report/ConsoleReporter.java | 13 +--------- .../maven/plugin/surefire/report/TestSetStats.java | 3 ++ .../plugin/surefire/report/WrappedReportEntry.java | 5 +++ .../surefire/report/CategorizedReportEntry.java | 20 +++++++++++++++ .../apache/maven/surefire/report/ReportEntry.java | 7 +++++ .../maven/surefire/report/SimpleReportEntry.java | 5 +++- 6 files changed, 40 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/35fc2cee/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java index 1fa55c9..14e8c67 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java @@ -41,10 +41,6 @@ public class ConsoleReporter private static final String TEST_SET_STARTING_PREFIX = "Running "; - private static final String TEST_SET_STARTING_GROUP_PREFIX = " (of "; - - private static final String TEST_SET_STARTING_GROUP_SUFIX = ")"; - private static final int BUFFER_SIZE = 4096; private final PrintWriter writer; @@ -116,14 +112,7 @@ public class ConsoleReporter { StringBuilder message = new StringBuilder(); message.append( TEST_SET_STARTING_PREFIX ); - message.append( report.getName() ); - - if ( report.getGroup() != null && !report.getName().equals( report.getGroup() ) ) - { - message.append( TEST_SET_STARTING_GROUP_PREFIX ); - message.append( report.getGroup() ); - message.append( TEST_SET_STARTING_GROUP_SUFIX ); - } + message.append( report.getNameWithGroup() ); message.append( "\n" ); return message.toString(); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/35fc2cee/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java index fd5fb27..ef253bf 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java @@ -188,6 +188,9 @@ public class TestSetStats { buf.append( " <<< FAILURE!" ); } + + buf.append( " - in " ); + buf.append( reportEntry.getNameWithGroup() ); buf.append( "\n" ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/35fc2cee/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java index fa941f7..028898f 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java @@ -171,4 +171,9 @@ public class WrappedReportEntry { return ReportEntryType.success == getReportEntryType(); } + + public String getNameWithGroup() + { + return original.getNameWithGroup(); + } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/35fc2cee/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java index a91174e..77cfaf3 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java @@ -26,6 +26,10 @@ public class CategorizedReportEntry extends SimpleReportEntry implements ReportEntry { + private static final String GROUP_PREFIX = " (of "; + + private static final String GROUP_SUFIX = ")"; + private final String group; public CategorizedReportEntry( String source, String name, String group ) @@ -60,6 +64,22 @@ public class CategorizedReportEntry return group; } + @Override + public String getNameWithGroup() + { + StringBuilder result = new StringBuilder(); + result.append( getName() ); + + if ( getGroup() != null && !getName().equals( getGroup() ) ) + { + result.append( GROUP_PREFIX ); + result.append( getGroup() ); + result.append( GROUP_SUFIX ); + } + + return result.toString(); + } + public boolean equals( Object o ) { if ( this == o ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/35fc2cee/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java index 8e87066..65bcb56 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/ReportEntry.java @@ -64,4 +64,11 @@ public interface ReportEntry * @return A string that explains an anomaly */ public String getMessage(); + + /** + * A name of the test case together with the group or category (if any exists). + * + * @return A string with the test case name and group/category, or just the name. + */ + public String getNameWithGroup(); } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/35fc2cee/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java index ed081fd..ca33a5f 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/SimpleReportEntry.java @@ -187,5 +187,8 @@ public class SimpleReportEntry return result; } - + public String getNameWithGroup() + { + return getName(); + } }
