[jboss-cvs] JBossAS SVN: r58782 - branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/clusteredentity

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

Author: bstansberry at jboss.com
Date: 2006-11-30 18:12:21 -0500 (Thu, 30 Nov 2006)
New Revision: 58782

Modified:
   branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTest.java
   branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java
Log:
Add a db cleanup method so test can be repeated multiple times without restarting cluster

Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTest.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTest.java	2006-11-30 23:10:49 UTC (rev 58781)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTest.java	2006-11-30 23:12:21 UTC (rev 58782)
@@ -36,4 +36,6 @@
    Customer findByCustomerId(Integer id);
    
    void loadedFromCache();
+   
+   void cleanup();
 }

Modified: branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java
===================================================================
--- branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java	2006-11-30 23:10:49 UTC (rev 58781)
+++ branches/Branch_4_0/ejb3/src/test/org/jboss/ejb3/test/clusteredentity/EntityTestBean.java	2006-11-30 23:12:21 UTC (rev 58782)
@@ -22,9 +22,11 @@
 package org.jboss.ejb3.test.clusteredentity;
 
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
 
 import javax.ejb.Remote;
+import javax.ejb.Remove;
 import javax.ejb.Stateless;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
@@ -154,6 +156,20 @@
       }
       
    }
+   
+   @Remove
+   public void cleanup()
+   {
+      Customer c = findByCustomerId(1);
+      if (c != null)
+      {
+         Set contacts = c.getContacts();
+         for (Iterator it = contacts.iterator(); it.hasNext();)
+            manager.remove(it.next());
+         c.setContacts(null);
+         manager.remove(c);
+      }
+   }
 
    private TreeCache getCache() throws Exception
    {