[jboss-cvs] JBossAS SVN: r60733 - branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception.

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

Author: epbernard
Date: 2007-02-20 16:03:09 -0500 (Tue, 20 Feb 2007)
New Revision: 60733

Modified:
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/ExceptionTestBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/Person.java
Log:
Fix testcases due to wrong expected exception

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/ExceptionTestBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/ExceptionTestBean.java	2007-02-20 20:43:19 UTC (rev 60732)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/ExceptionTestBean.java	2007-02-20 21:03:09 UTC (rev 60733)
@@ -31,6 +31,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import javax.persistence.TransactionRequiredException;
+import javax.persistence.NoResultException;
 
 /**
  *
@@ -256,20 +257,26 @@
       Query query = manager.createQuery("from Person");
       try
       {
+         System.out.println("Before query");
          query.getSingleResult();
+         System.out.println("After query");
          throw new RuntimeException("NonUniqueResultException not thrown for getSingleResult");
       }
       catch(NonUniqueResultException e)
       {
+
+         System.out.println("Actual exception");
+         e.printStackTrace( );
       }
-      
+
+      System.out.println("Second query");
       Query query2 = manager.createQuery("from Person where id=999");
       try
       {
          query2.getSingleResult();
-         throw new RuntimeException("EntityNotFoundException not thrown for getSingleResult returning no results");
+         throw new RuntimeException("NoResultException not thrown for getSingleResult returning no results");
       }
-      catch(EntityNotFoundException e)
+      catch(NoResultException e)
       {
       }
    }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/Person.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/Person.java	2007-02-20 20:43:19 UTC (rev 60732)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/entityexception/Person.java	2007-02-20 21:03:09 UTC (rev 60733)
@@ -24,8 +24,9 @@
 import java.io.Serializable;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue; import javax.persistence.GenerationType;
-import javax.persistence.Id;;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 /**
  *
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>