[jboss-cvs] JBossAS SVN: r78707 - in projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful: unit and 1 other directory.

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

Author: wolfc
Date: 2008-09-19 08:05:35 -0400 (Fri, 19 Sep 2008)
New Revision: 78707

Modified:
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful/StatefulBean.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful/StatefulCommonBusiness.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful/unit/StatefulContainerTestCase.java
Log:
EJBTHREE-1496: unit test

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful/StatefulBean.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful/StatefulBean.java	2008-09-19 12:02:02 UTC (rev 78706)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful/StatefulBean.java	2008-09-19 12:05:35 UTC (rev 78707)
@@ -21,12 +21,16 @@
  */
 package org.jboss.ejb3.core.test.stateful;
 
+import javax.annotation.PreDestroy;
 import javax.ejb.Local;
 import javax.ejb.LocalHome;
 import javax.ejb.Remote;
 import javax.ejb.RemoteHome;
+import javax.ejb.Remove;
 import javax.ejb.Stateful;
 
+import org.jboss.logging.Logger;
+
 /**
  * StatefulBean
  * 
@@ -42,7 +46,10 @@
 @RemoteHome(StatefulRemoteHome.class)
 public class StatefulBean implements StatefulRemoteBusiness, StatefulLocalBusiness
 {
-
+   private static Logger log = Logger.getLogger(StatefulBean.class);
+   
+   public static int preDestroys = 0;
+   
    // --------------------------------------------------------------------------------||
    // Instance Members ---------------------------------------------------------------||
    // --------------------------------------------------------------------------------||
@@ -65,4 +72,16 @@
       return ++counter;
    }
 
+   @PreDestroy
+   public void preDestroy()
+   {
+      log.info("preDestroy");
+      preDestroys++;
+   }
+   
+   @Remove
+   public void remove()
+   {
+      log.info("remove");
+   }
 }

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful/StatefulCommonBusiness.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful/StatefulCommonBusiness.java	2008-09-19 12:02:02 UTC (rev 78706)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful/StatefulCommonBusiness.java	2008-09-19 12:05:35 UTC (rev 78707)
@@ -39,4 +39,6 @@
     * @return
     */
    int getNextCounter();
+   
+   void remove();
 }

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful/unit/StatefulContainerTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful/unit/StatefulContainerTestCase.java	2008-09-19 12:02:02 UTC (rev 78706)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/stateful/unit/StatefulContainerTestCase.java	2008-09-19 12:05:35 UTC (rev 78707)
@@ -33,6 +33,7 @@
 import org.jboss.ejb3.session.SessionContainer;
 import org.jboss.logging.Logger;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -150,6 +151,12 @@
    // --------------------------------------------------------------------------------||
    // Lifecycle Methods --------------------------------------------------------------||
    // --------------------------------------------------------------------------------||
+   @Before
+   public void before()
+   {
+      StatefulBean.preDestroys = 0;
+   }
+   
    @BeforeClass
    public static void beforeClass() throws Exception
    {
@@ -167,4 +174,13 @@
 
       AbstractEJB3TestCase.afterClass();
    }
+   
+   @Test
+   public void testPreDestroy() throws NamingException
+   {
+      StatefulLocalBusiness bean = lookupLocalSfsb();
+      bean.remove();
+      
+      assertEquals("Wrong number of PreDestroy invocations", 1, StatefulBean.preDestroys);
+   }
 }