[jboss-cvs] JBossAS SVN: r70882 - in projects/ejb3/trunk/core/src/test: java/org/jboss/ejb3/test/stateful/unit and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 14 16:42:59 EDT 2008
Author: bdecoste
Date: 2008-03-14 16:42:59 -0400 (Fri, 14 Mar 2008)
New Revision: 70882
Modified:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/Stateful.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/StatefulBean.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java
projects/ejb3/trunk/core/src/test/resources/test/stateful/META-INF/ejb-jar.xml
Log:
[EJBTHREE-1222] test for void remove() in a bean with an EJB 2.1 remote interface and a business remote interface
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/Stateful.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/Stateful.java 2008-03-14 17:47:48 UTC (rev 70881)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/Stateful.java 2008-03-14 20:42:59 UTC (rev 70882)
@@ -45,7 +45,8 @@
public void testExceptionCause() throws Exception;
public void testSerializedState(String state);
- public void removeBean();
+ public void remove();
+ public int beansRemoved();
void testResources() throws Exception;
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/StatefulBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/StatefulBean.java 2008-03-14 17:47:48 UTC (rev 70881)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/StatefulBean.java 2008-03-14 20:42:59 UTC (rev 70882)
@@ -66,6 +66,8 @@
{
private static final Logger log = Logger.getLogger(StatefulBean.class);
+ private static int beansRemoved = 0;
+
@Resource
private SessionContext sessionContext;
@@ -221,8 +223,14 @@
this.state=state;
}
+ public int beansRemoved()
+ {
+ return beansRemoved;
+ }
+
// @Remove from xml
- public void removeBean()
+ public void remove()
{
+ ++beansRemoved;
}
}
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java 2008-03-14 17:47:48 UTC (rev 70881)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java 2008-03-14 20:42:59 UTC (rev 70882)
@@ -64,6 +64,8 @@
public class TreeCacheStatefulBean implements org.jboss.ejb3.test.stateful.Stateful
{
private static final Logger log = Logger.getLogger(TreeCacheStatefulBean.class);
+
+ private static int beansRemoved = 0;
@Resource
private SessionContext sessionContext;
@@ -208,10 +210,15 @@
}
@Remove
- public void removeBean()
+ public void remove()
{
-
+ ++beansRemoved;
}
+
+ public int beansRemoved()
+ {
+ return beansRemoved;
+ }
public void lookupStateful() throws Exception
{
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java 2008-03-14 17:47:48 UTC (rev 70881)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java 2008-03-14 20:42:59 UTC (rev 70882)
@@ -45,6 +45,7 @@
import org.jboss.ejb3.test.stateful.SmallCacheStateful;
import org.jboss.ejb3.test.stateful.State;
import org.jboss.ejb3.test.stateful.Stateful;
+import org.jboss.ejb3.test.stateful.Stateful21;
import org.jboss.ejb3.test.stateful.StatefulHome;
import org.jboss.ejb3.test.stateful.StatefulInvoker;
import org.jboss.ejb3.test.stateful.StatefulLocal;
@@ -182,7 +183,7 @@
Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
assertNotNull(stateful);
stateful.setState("state");
- stateful.removeBean();
+ stateful.remove();
ObjectName deployment = new ObjectName("test.ejb3:name=Bill,service=EJB3");
@@ -193,7 +194,7 @@
stateful = (Stateful)getInitialContext().lookup("Stateful");
assertNotNull(stateful);
stateful.setState("state");
- stateful.removeBean();
+ stateful.remove();
}
public void testSmallCache() throws Exception
@@ -631,10 +632,22 @@
System.out.println("testPassivation");
Stateful stateful = (Stateful)getInitialContext().lookup("Stateful");
assertNotNull(stateful);
- // stateful.setState("state");
- stateful.removeBean();
+ stateful.remove();
+ try
+ {
+ stateful.getState();
+ fail("Bean should have been removed");
+ } catch (NoSuchEJBException e)
+ {
+
+ }
+ stateful = (Stateful)getInitialContext().lookup("Stateful");
+ assertNotNull(stateful);
+ stateful.setState("InMyTimeOfDying");
+
+ stateful.remove();
try
{
stateful.getState();
@@ -643,6 +656,25 @@
{
}
+
+ StatefulHome home = (StatefulHome)getInitialContext().lookup("StatefulBean/home");
+ assertNotNull(home);
+ Stateful21 stateful21 = (Stateful21)home.create();
+ assertNotNull(stateful21);
+ stateful21.remove();
+
+ try
+ {
+ stateful.getState();
+ fail("Bean should have been removed");
+ } catch (NoSuchEJBException e)
+ {
+
+ }
+
+ stateful = (Stateful)getInitialContext().lookup("Stateful");
+ int beansRemoved = stateful.beansRemoved();
+ assertEquals(3, beansRemoved);
}
public void testRemoveWithRollback() throws Exception
Modified: projects/ejb3/trunk/core/src/test/resources/test/stateful/META-INF/ejb-jar.xml
===================================================================
--- projects/ejb3/trunk/core/src/test/resources/test/stateful/META-INF/ejb-jar.xml 2008-03-14 17:47:48 UTC (rev 70881)
+++ projects/ejb3/trunk/core/src/test/resources/test/stateful/META-INF/ejb-jar.xml 2008-03-14 20:42:59 UTC (rev 70882)
@@ -14,7 +14,7 @@
<ejb-class>org.jboss.ejb3.test.stateful.StatefulBean</ejb-class>
<remove-method>
<bean-method>
- <method-name>removeBean</method-name>
+ <method-name>remove</method-name>
</bean-method>
<retain-if-exception>false</retain-if-exception>
</remove-method>
More information about the jboss-cvs-commits
mailing list