From: Erich G. <eg...@us...> - 2002-06-25 07:06:01
|
Update of /cvsroot/junit/junit/junit/framework In directory usw-pr-cvs1:/tmp/cvs-serv14575/junit/framework Modified Files: ComparisonFailure.java Log Message: simplified string prefix/suffix computation Index: ComparisonFailure.java =================================================================== RCS file: /cvsroot/junit/junit/junit/framework/ComparisonFailure.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ComparisonFailure.java 22 Jun 2002 00:28:03 -0000 1.1 +++ ComparisonFailure.java 25 Jun 2002 07:05:58 -0000 1.2 @@ -43,24 +43,17 @@ } int j= fExpected.length()-1; int k= fActual.length()-1; - for (; k >= 0 && j >= 0; k--,j--) { + for (; k >= i && j >= i; k--,j--) { if (fExpected.charAt(j) != fActual.charAt(k)) break; } String actual, expected; // equal strings - if (j == -1 && k == -1) { + if (j < i && k < i) { expected= fExpected; actual= fActual; - } - // handle overlapping matches - else if (j+1 < i || k+1 < i) { - expected= "..."+fExpected.substring(i, j+2)+"..."; - actual= "..."+fActual.substring(i, k+2)+"..."; - } - // otherwise replace common prefix and suffix - else { + } else { expected= fExpected.substring(i, j+1); actual= fActual.substring(i, k+1); if (i <= end && i > 0) { @@ -74,8 +67,7 @@ actual= actual+"..."; } if (message != null) - formatted= message+": "; - + formatted= message+": "; return formatted+"expected:<"+expected+"> but was:<"+actual+">"; } |