[jboss-cvs] JBossAS SVN: r68135 - in trunk/testsuite/src/main/org/jboss/test/hibernate: ejb and 2 other directories.

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

Author: alesj
Date: 2007-12-11 07:41:43 -0500 (Tue, 11 Dec 2007)
New Revision: 68135

Modified:
   trunk/testsuite/src/main/org/jboss/test/hibernate/ProfileService.java
   trunk/testsuite/src/main/org/jboss/test/hibernate/ejb/ProfileBean.java
   trunk/testsuite/src/main/org/jboss/test/hibernate/ejb/interfaces/ProfileService.java
   trunk/testsuite/src/main/org/jboss/test/hibernate/test/HibernateIntgUnitTestCase.java
Log:
Fixing Hibernate tests.

Modified: trunk/testsuite/src/main/org/jboss/test/hibernate/ProfileService.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/hibernate/ProfileService.java	2007-12-11 09:43:24 UTC (rev 68134)
+++ trunk/testsuite/src/main/org/jboss/test/hibernate/ProfileService.java	2007-12-11 12:41:43 UTC (rev 68135)
@@ -21,13 +21,13 @@
   */
 package org.jboss.test.hibernate;
 
-import org.jboss.test.hibernate.model.User;
-import org.jboss.hibernate.session.HibernateContext;
+import java.util.List;
+
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
+import org.jboss.hibernate.session.HibernateContext;
+import org.jboss.test.hibernate.model.User;
 
-import java.util.List;
-
 /**
  * A service bean used to interact with a bound hibernate session for
  * testing purposes.
@@ -71,6 +71,13 @@
       return user;
    }
 
+   public void deleteUser(Long userId) throws HibernateException
+   {
+      User user = loadUser(userId);
+      getSession().delete(user);
+      getSession().flush();
+   }
+
    private Session getSession()
    {
       return HibernateContext.getSession(SESSION_FACTORY_NAME);

Modified: trunk/testsuite/src/main/org/jboss/test/hibernate/ejb/ProfileBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/hibernate/ejb/ProfileBean.java	2007-12-11 09:43:24 UTC (rev 68134)
+++ trunk/testsuite/src/main/org/jboss/test/hibernate/ejb/ProfileBean.java	2007-12-11 12:41:43 UTC (rev 68135)
@@ -21,16 +21,15 @@
   */
 package org.jboss.test.hibernate.ejb;
 
-import org.jboss.test.hibernate.model.User;
-import org.jboss.test.hibernate.ProfileService;
-
+import java.rmi.RemoteException;
+import java.util.List;
+import javax.ejb.EJBException;
 import javax.ejb.SessionBean;
-import javax.ejb.EJBException;
 import javax.ejb.SessionContext;
-import java.rmi.RemoteException;
-import java.util.List;
 
 import org.hibernate.HibernateException;
+import org.jboss.test.hibernate.ProfileService;
+import org.jboss.test.hibernate.model.User;
 
 /**
  * An ejb to test the ejb method interception style of transparent
@@ -52,6 +51,22 @@
     * @exception EJBException if an error occurs
     * @ejb:interface-method
     */
+   public void deleteUser(Long userId) throws EJBException
+   {
+      try
+      {
+         delegate.deleteUser(userId);
+      }
+      catch(HibernateException e)
+      {
+         throw new EJBException("Error performing delete", e);
+      }
+   }
+
+   /**
+    * @exception EJBException if an error occurs
+    * @ejb:interface-method
+    */
    public User storeUser(User user) throws EJBException
    {
       try

Modified: trunk/testsuite/src/main/org/jboss/test/hibernate/ejb/interfaces/ProfileService.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/hibernate/ejb/interfaces/ProfileService.java	2007-12-11 09:43:24 UTC (rev 68134)
+++ trunk/testsuite/src/main/org/jboss/test/hibernate/ejb/interfaces/ProfileService.java	2007-12-11 12:41:43 UTC (rev 68135)
@@ -28,6 +28,9 @@
    extends javax.ejb.EJBObject
 {
 
+   public void deleteUser( Long userId )
+      throws java.rmi.RemoteException;
+
    public org.jboss.test.hibernate.model.User storeUser( org.jboss.test.hibernate.model.User user )
       throws java.rmi.RemoteException;
 

Modified: trunk/testsuite/src/main/org/jboss/test/hibernate/test/HibernateIntgUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/hibernate/test/HibernateIntgUnitTestCase.java	2007-12-11 09:43:24 UTC (rev 68134)
+++ trunk/testsuite/src/main/org/jboss/test/hibernate/test/HibernateIntgUnitTestCase.java	2007-12-11 12:41:43 UTC (rev 68135)
@@ -42,19 +42,17 @@
   */
 package org.jboss.test.hibernate.test;
 
+import java.util.GregorianCalendar;
+import java.util.List;
+
+import junit.framework.Test;
 import org.jboss.test.JBossTestCase;
-import org.jboss.test.hibernate.model.User;
-import org.jboss.test.hibernate.model.Name;
 import org.jboss.test.hibernate.ejb.interfaces.ProfileService;
 import org.jboss.test.hibernate.ejb.interfaces.ProfileServiceHome;
 import org.jboss.test.hibernate.ejb.interfaces.ProfileServiceUtil;
+import org.jboss.test.hibernate.model.Name;
+import org.jboss.test.hibernate.model.User;
 
-import java.util.GregorianCalendar;
-import java.util.List;
-import java.util.Iterator;
-
-import junit.framework.Test;
-
 /**
  * Implementation of HibernateIntgUnitTestCase.
  *
@@ -151,11 +149,20 @@
          user.setHandle("myHandle");
 
          Long savedUserId = service.storeUser( user ).getId();
-         getLog().info("User created with id = " + savedUserId );
+         try
+         {
+            getLog().info("User created with id = " + savedUserId );
 
-         List users = service.listUsers();
-         assertNotNull( users );
-         assertEquals( "Incorrect result size", 1, users.size() );
+            List users = service.listUsers();
+            assertNotNull( users );
+            assertEquals( "Incorrect result size", 1, users.size() );
+         }
+         finally
+         {
+            getLog().info("About to delete user with id = " + savedUserId);
+            service.deleteUser(savedUserId);
+            getLog().info("User with id = " + savedUserId + " successfully deleted.");
+         }
       }
       catch( Throwable t )
       {