CVS: junit/src/org/junit Assert.java,1.5,1.5.2.1

Update of /cvsroot/junit/junit/src/org/junit
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22827/src/org/junit

Modified Files:
      Tag: Version431
	Assert.java 
Log Message:
[Junit-trackers] [ junit-Bugs-1684562 ] assertEquals throws NPE while comparing null elements 


Index: Assert.java
===================================================================
RCS file: /cvsroot/junit/junit/src/org/junit/Assert.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- Assert.java	8 Feb 2007 22:45:21 -0000	1.5
+++ Assert.java	23 Mar 2007 23:04:39 -0000	1.5.2.1
@@ -455,8 +455,8 @@
 		String formatted= "";
 		if (message != null && ! message.equals(""))
 			formatted= message + " ";
-		String expectedString= expected.toString();
-		String actualString= actual.toString();
+		String expectedString= String.valueOf(expected);
+		String actualString= String.valueOf(actual);
 		if (expectedString.equals(actualString))
 			return formatted + "expected: " + expected.getClass().getName() + "<" + expectedString + "> but was: " + actual.getClass().getName() + "<" + actualString + ">";
 		else


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV