[jboss-cvs] JBossAS SVN: r71003 - projects/test/trunk/src/main/java/org/jboss/test.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-03-19 10:49:22 -0400 (Wed, 19 Mar 2008)
New Revision: 71003

Modified:
   projects/test/trunk/src/main/java/org/jboss/test/AbstractTestCase.java
Log:
Fix assertInstanceOf to fail on allowNull == false and o == null.

Modified: projects/test/trunk/src/main/java/org/jboss/test/AbstractTestCase.java
===================================================================
--- projects/test/trunk/src/main/java/org/jboss/test/AbstractTestCase.java	2008-03-19 14:49:10 UTC (rev 71002)
+++ projects/test/trunk/src/main/java/org/jboss/test/AbstractTestCase.java	2008-03-19 14:49:22 UTC (rev 71003)
@@ -395,8 +395,13 @@
       if (expectedType == null)
          fail("Null expectedType");
 
-      if (o == null && allowNull)
-         return null;
+      if (o == null)
+      {
+         if (allowNull == false)
+            fail("Null object not allowed.");
+         else
+            return null;
+      }
 
       try
       {