[jboss-cvs] JBossAS SVN: r79615 - projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree786/unit.

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

Author: ALRubinger
Date: 2008-10-16 22:33:46 -0400 (Thu, 16 Oct 2008)
New Revision: 79615

Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree786/unit/RemoveMethodUnitTestCase.java
Log:
[EJBTHREE-786][EJBTHREE-1241] Fix the exception check in a Unit Test to look for expected exception of NoSuchObjectException instead of NoSuchEJBException on a remote EJB2.x call

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree786/unit/RemoveMethodUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree786/unit/RemoveMethodUnitTestCase.java	2008-10-17 02:22:23 UTC (rev 79614)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/ejbthree786/unit/RemoveMethodUnitTestCase.java	2008-10-17 02:33:46 UTC (rev 79615)
@@ -21,6 +21,8 @@
  */
 package org.jboss.ejb3.test.ejbthree786.unit;
 
+import java.rmi.NoSuchObjectException;
+
 import javax.ejb.EJBObject;
 import javax.ejb.NoSuchEJBException;
 import javax.rmi.PortableRemoteObject;
@@ -104,11 +106,19 @@
       {
          session.test();
       }
-      catch (NoSuchEJBException nsee)
+      catch (Exception e)
       {
-         removed = true;
+         Class<?> expectedCause = NoSuchObjectException.class;
+         if (e.getCause().getClass().getName().equals(expectedCause.getName()))
+         {
+            removed = true;
+         }
+         else
+         {
+            fail("Exception received, " + e + ", was not expected and should have had root cause of " + expectedCause);
+         }
       }
-      assertTrue(removed);
+      assertTrue("SFSB instance was not removed as expected",removed);
 
    }