From 8b53feff3f7c40fccf41e8fa15f09f8df12e7a74 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Tue, 12 Apr 2011 15:09:49 -0700
Subject: [PATCH] Fixed: TESTNG-472: Better output for assertNull()

---
 CHANGES.txt                          |  1 +
 src/main/java/org/testng/Assert.java | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ab89f5c86e..f46272ea9d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ Current
 Added: @Factory(dataProvider / dataProviderClass) on constructors
 Added: assertNotEquals() to Assert
 Added: assertArrayEquals() to AssertJUnit
+Fixed: TESTNG-472: Better output for assertNull()
 Fixed: ConcurrentModificationException when using parallel data providers.
 Fixed: TESTNG-282: Problem when including+excluding packages (addicted)
 Fixed: TESTNG-471: assertEquals(Map, Map) fails if a map is a subset of the other
diff --git a/src/main/java/org/testng/Assert.java b/src/main/java/org/testng/Assert.java
index fa7aaa3fc1..2ab10dd4da 100644
--- a/src/main/java/org/testng/Assert.java
+++ b/src/main/java/org/testng/Assert.java
@@ -391,6 +391,13 @@ static public void assertNotNull(Object object) {
    * @param message the assertion error message
    */
   static public void assertNotNull(Object object, String message) {
+    if (object == null) {
+      String formatted = "";
+      if(message != null) {
+        formatted = message + " ";
+      }
+      fail(formatted + "expected object to not be null");
+    }
     assertTrue(object != null, message);
   }
 
@@ -410,7 +417,9 @@ static public void assertNull(Object object) {
    * @param message the assertion error message
    */
   static public void assertNull(Object object, String message) {
-    assertTrue(object == null, message);
+    if (object != null) {
+      failNotSame(object, null, message);
+    }
   }
 
   /**
@@ -473,7 +482,7 @@ static private void failNotSame(Object actual, Object expected, String message)
     if(message != null) {
       formatted = message + " ";
     }
-    fail(formatted + "expected same with:<" + expected + "> but was:<" + actual + ">");
+    fail(formatted + "expected:<" + expected + "> but was:<" + actual + ">");
   }
 
   static private void failNotEquals(Object actual , Object expected, String message ) {