Updated Branches: refs/heads/master 12c37d634 -> bc2b31f90
o Fixed typo and olamys buffer underflow Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/bc2b31f9 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/bc2b31f9 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/bc2b31f9 Branch: refs/heads/master Commit: bc2b31f90580e3e8ac3f4a3200ba4ec2bb407836 Parents: 12c37d6 Author: Kristian Rosenvold <krosenv...@apache.org> Authored: Fri Dec 21 01:37:46 2012 +0100 Committer: Kristian Rosenvold <krosenv...@apache.org> Committed: Fri Dec 21 01:42:46 2012 +0100 ---------------------------------------------------------------------- .../surefire/report/SmartStackTraceParser.java | 9 +++- .../surefire/report/SmartStackTraceParserTest.java | 31 ++++++++++++++- 2 files changed, 35 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bc2b31f9/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java ---------------------------------------------------------------------- diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java index 754494f..a668806 100644 --- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java +++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java @@ -108,8 +108,11 @@ public class SmartStackTraceParser result.append( "->" ); } - result.deleteCharAt( result.length() - 1 ); - result.deleteCharAt( result.length() - 1 ); + if ( result.length() >= 2 ) + { + result.deleteCharAt( result.length() - 1 ); + result.deleteCharAt( result.length() - 1 ); + } Throwable target = throwable.getTarget(); if ( target instanceof AssertionError ) @@ -117,7 +120,7 @@ public class SmartStackTraceParser result.append( " " ); result.append( throwable.getMessage() ); } - else if ( "junit.framework.AssertiponFailedError".equals( target.getClass().getName() ) + else if ( "junit.framework.AssertionFailedError".equals( target.getClass().getName() ) || "junit.framework.ComparisonFailure".equals( target.getClass().getName() ) ) { result.append( " " ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/bc2b31f9/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java ---------------------------------------------------------------------- diff --git a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java index d332fd2..e7cc854 100644 --- a/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java +++ b/surefire-providers/common-java5/src/test/java/org/apache/maven/surefire/report/SmartStackTraceParserTest.java @@ -20,7 +20,9 @@ package org.apache.maven.surefire.report; import java.util.List; +import com.sun.deploy.uitoolkit.impl.text.TextWindowFactory; import junit.framework.Assert; +import junit.framework.AssertionFailedError; import junit.framework.ComparisonFailure; import junit.framework.TestCase; @@ -98,6 +100,15 @@ public class SmartStackTraceParserTest } } + static class FailWithFail + extends TestCase + { + public void testThatWillFail() + { + fail( "abc" ); + } + } + public void testGetString() throws Exception { @@ -213,7 +224,7 @@ public class SmartStackTraceParserTest { SmartStackTraceParser smartStackTraceParser = new SmartStackTraceParser( CaseThatWillFail.class, e ); String res = smartStackTraceParser.getString(); - assertEquals( "SmartStackTraceParserTest$CaseThatWillFail.testThatWillFail:62 expected:<abc> but was:<def>", + assertEquals( "SmartStackTraceParserTest$CaseThatWillFail.testThatWillFail:64 expected:<abc> but was:<def>", res ); } } @@ -256,7 +267,23 @@ public class SmartStackTraceParserTest SmartStackTraceParser smartStackTraceParser = new SmartStackTraceParser( AssertionNoMessage.class, e ); String res = smartStackTraceParser.getString(); assertEquals( - "SmartStackTraceParserTest$AssertionNoMessage.testThrowSomething:37 expected:<abc> but was:<xyz>", + "SmartStackTraceParserTest$AssertionNoMessage.testThrowSomething:39 expected:<abc> but was:<xyz>", + res ); + } + } + + public void testFailWithFail() + { + try + { + new FailWithFail().testThatWillFail(); + } + catch ( AssertionFailedError e ) + { + SmartStackTraceParser smartStackTraceParser = new SmartStackTraceParser( FailWithFail.class, e ); + String res = smartStackTraceParser.getString(); + assertEquals( + "SmartStackTraceParserTest$FailWithFail.testThatWillFail:108 abc", res ); } }
