[Junit-devel] CVS: junit/junit/framework Assert.java,1.13,1.14

[Erich G. <eg...@us...>]

Update of /cvsroot/junit/junit/junit/framework
In directory usw-pr-cvs1:/tmp/cvs-serv18067/junit/framework

Modified Files:
	Assert.java 
Log Message:
overloaded assertEquals for Strings so that string prefix/suffix compression is only done when comparing Strings 

Index: Assert.java
===================================================================
RCS file: /cvsroot/junit/junit/junit/framework/Assert.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Assert.java	24 Jun 2002 19:36:26 -0000	1.13
+++ Assert.java	25 Jun 2002 07:18:34 -0000	1.14
@@ -71,6 +71,22 @@
 	    assertEquals(null, expected, actual);
 	}
 	/**
+	 * Asserts that two Strings are equal. 
+	 */
+	static public void assertEquals(String message, String expected, String actual) {
+		if (expected == null && actual == null)
+			return;
+		if (expected != null && expected.equals(actual))
+			return;
+		throw new ComparisonFailure(message, expected, actual);
+	}
+	/**
+	 * Asserts that two Strings are equal. 
+	 */
+	static public void assertEquals(String expected, String actual) {
+	    assertEquals(null, expected, actual);
+	}
+	/**
 	 * Asserts that two doubles are equal concerning a delta.  If they are not
 	 * an AssertionFailedError is thrown with the given message.  If the expected
 	 * value is infinity then the delta value is ignored.
@@ -263,6 +279,9 @@
 	}
 
 	static private void failNotEquals(String message, Object expected, Object actual) {
-		throw new ComparisonFailure(message, expected.toString(), actual.toString());
+		String formatted= "";
+		if (message != null)
+			formatted= message+" ";
+		fail(formatted+"expected:<"+expected+"> but was:<"+actual+">");
 	}
 }