Repository: maven-surefire Updated Branches: refs/heads/master 425078897 -> 30a0b99c9
[SUREFIRE-1017] Refactoring Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/30a0b99c Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/30a0b99c Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/30a0b99c Branch: refs/heads/master Commit: 30a0b99c9e93544576336cec6fbbca9b3d78a16c Parents: 4250788 Author: Tibor17 <tibo...@lycos.com> Authored: Fri Jul 3 01:26:01 2015 +0200 Committer: Tibor17 <tibo...@lycos.com> Committed: Fri Jul 3 01:26:01 2015 +0200 ---------------------------------------------------------------------- .../surefire/report/PojoStackTraceWriter.java | 35 ++++++-------------- .../common/junit4/JUnit4StackTraceWriter.java | 13 ++------ 2 files changed, 14 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/30a0b99c/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java ---------------------------------------------------------------------- diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java index b9fb250..3edef98 100644 --- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java +++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/PojoStackTraceWriter.java @@ -33,9 +33,9 @@ public class PojoStackTraceWriter { private final Throwable t; - protected final String testClass; + private final String testClass; - protected final String testMethod; + private final String testMethod; public PojoStackTraceWriter( String testClass, String testMethod, Throwable t ) { @@ -46,43 +46,30 @@ public class PojoStackTraceWriter public String writeTraceToString() { - StringWriter w = new StringWriter(); if ( t != null ) { - t.printStackTrace( new PrintWriter( w ) ); + StringWriter w = new StringWriter(); + PrintWriter stackTrace = new PrintWriter( w ); + t.printStackTrace( stackTrace ); + stackTrace.close(); w.flush(); + return w.toString(); } - return w.toString(); + return ""; } public String smartTrimmedStackTrace() { - if ( t == null ) - { - return ""; - } - - SmartStackTraceParser parser = new SmartStackTraceParser( testClass, t, testMethod ); - return parser.getString(); + return t == null ? "" : new SmartStackTraceParser( testClass, t, testMethod ).getString(); } public String writeTrimmedTraceToString() { - if ( t == null ) - { - return ""; - } - - return SmartStackTraceParser.stackTraceWithFocusOnClassAsString( t, testClass ); + return t == null ? "" : SmartStackTraceParser.stackTraceWithFocusOnClassAsString( t, testClass ); } public SafeThrowable getThrowable() { - if ( t == null ) - { - return null; - } - - return new SafeThrowable( t ); + return t == null ? null : new SafeThrowable( t ); } } http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/30a0b99c/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java ---------------------------------------------------------------------- diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java index 5f7cd97..52cd342 100644 --- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java +++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4StackTraceWriter.java @@ -72,16 +72,9 @@ public class JUnit4StackTraceWriter public String smartTrimmedStackTrace() { Throwable exception = junitFailure.getException(); - if ( exception != null ) - { - SmartStackTraceParser smartStackTraceParser = - new SmartStackTraceParser( getTestClassName(), exception, getTestMethodName() ); - return smartStackTraceParser.getString(); - } - else - { - return junitFailure.getMessage(); - } + return exception == null + ? junitFailure.getMessage() + : new SmartStackTraceParser( getTestClassName(), exception, getTestMethodName() ).getString(); } /**
