[jboss-cvs] jboss-ejb3/src/test/org/jboss/ejb3/test/cache ...

Ben Wang bwang at jboss.com
Fri Jul 21 04:09:44 EDT 2006


  User: bwang   
  Date: 06/07/21 04:09:44

  Modified:    src/test/org/jboss/ejb3/test/cache       Tag: Branch_4_0
                        SimpleStatefulBean.java StatefulBean.java
                        StatefulLocal.java StatefulRemote.java Tester.java
                        TesterMBean.java
  Log:
  Backport tests from head.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.10  +2 -2      jboss-ejb3/src/test/org/jboss/ejb3/test/cache/SimpleStatefulBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SimpleStatefulBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/cache/SimpleStatefulBean.java,v
  retrieving revision 1.5.2.9
  retrieving revision 1.5.2.10
  diff -u -b -r1.5.2.9 -r1.5.2.10
  --- SimpleStatefulBean.java	20 Mar 2006 20:07:12 -0000	1.5.2.9
  +++ SimpleStatefulBean.java	21 Jul 2006 08:09:44 -0000	1.5.2.10
  @@ -33,7 +33,7 @@
    * Comment
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.5.2.9 $
  + * @version $Revision: 1.5.2.10 $
    */
   @Stateful
   @CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
  @@ -62,7 +62,7 @@
   
      public void longRunning() throws Exception
      {
  -      Thread.sleep(5000);
  +      Thread.sleep(11000);
      }
   
      public boolean getPostActivate()
  
  
  
  1.6.2.11  +7 -2      jboss-ejb3/src/test/org/jboss/ejb3/test/cache/StatefulBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StatefulBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/cache/StatefulBean.java,v
  retrieving revision 1.6.2.10
  retrieving revision 1.6.2.11
  diff -u -b -r1.6.2.10 -r1.6.2.11
  --- StatefulBean.java	11 May 2006 18:29:25 -0000	1.6.2.10
  +++ StatefulBean.java	21 Jul 2006 08:09:44 -0000	1.6.2.11
  @@ -26,6 +26,7 @@
   import javax.ejb.PrePassivate;
   import javax.ejb.Remote;
   import javax.ejb.Stateful;
  +import javax.ejb.Remove;
   import javax.naming.InitialContext;
   import org.jboss.annotation.ejb.cache.Cache;
   import org.jboss.annotation.ejb.cache.tree.CacheConfig;
  @@ -34,7 +35,7 @@
    * Comment
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.6.2.10 $
  + * @version $Revision: 1.6.2.11 $
    */
   @Stateful
   @Cache(org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
  @@ -64,7 +65,11 @@
   
      public void longRunning() throws Exception
      {
  -      Thread.sleep(5000);
  +      Thread.sleep(11000);
  +   }
  +
  +   @Remove
  +   public void done() {
      }
   
      public boolean getPostActivate()
  
  
  
  1.2.2.10  +3 -1      jboss-ejb3/src/test/org/jboss/ejb3/test/cache/StatefulLocal.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StatefulLocal.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/cache/StatefulLocal.java,v
  retrieving revision 1.2.2.9
  retrieving revision 1.2.2.10
  diff -u -b -r1.2.2.9 -r1.2.2.10
  --- StatefulLocal.java	20 Mar 2006 20:07:12 -0000	1.2.2.9
  +++ StatefulLocal.java	21 Jul 2006 08:09:44 -0000	1.2.2.10
  @@ -27,7 +27,7 @@
    * Comment
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.2.2.9 $
  + * @version $Revision: 1.2.2.10 $
    */
   public interface StatefulLocal
   {
  @@ -40,4 +40,6 @@
      String getState();
   
      void reset();
  +
  +   void done();
   }
  
  
  
  1.3.2.10  +3 -1      jboss-ejb3/src/test/org/jboss/ejb3/test/cache/StatefulRemote.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StatefulRemote.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/cache/StatefulRemote.java,v
  retrieving revision 1.3.2.9
  retrieving revision 1.3.2.10
  diff -u -b -r1.3.2.9 -r1.3.2.10
  --- StatefulRemote.java	20 Mar 2006 20:07:12 -0000	1.3.2.9
  +++ StatefulRemote.java	21 Jul 2006 08:09:44 -0000	1.3.2.10
  @@ -27,7 +27,7 @@
    * Comment
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.3.2.9 $
  + * @version $Revision: 1.3.2.10 $
    */
   public interface StatefulRemote
   {
  @@ -44,4 +44,6 @@
      long bench(int iterations) throws Exception;
   
      void longRunning() throws Exception;
  +
  +   void done();
   }
  
  
  
  1.3.6.10  +19 -7     jboss-ejb3/src/test/org/jboss/ejb3/test/cache/Tester.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Tester.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/cache/Tester.java,v
  retrieving revision 1.3.6.9
  retrieving revision 1.3.6.10
  diff -u -b -r1.3.6.9 -r1.3.6.10
  --- Tester.java	20 Mar 2006 20:07:12 -0000	1.3.6.9
  +++ Tester.java	21 Jul 2006 08:09:44 -0000	1.3.6.10
  @@ -36,7 +36,7 @@
    * Comment
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.3.6.9 $
  + * @version $Revision: 1.3.6.10 $
    */
   public class Tester extends ServiceMBeanSupport implements TesterMBean
   {
  @@ -45,8 +45,8 @@
         ObjectName cacheON = new ObjectName("jboss.cache:service=EJB3TreeCache");
         TreeCacheMBean mbean = (TreeCacheMBean) MBeanProxy.get(TreeCacheMBean.class, cacheON, server);
         PassivationTreeCache cache = (PassivationTreeCache) mbean.getInstance();
  -      PassivationEvictionPolicy policy = (PassivationEvictionPolicy) cache.getEvictionPolicy();
  -      policy.createRegion("/mySFSB", 100, 1L);
  +//      PassivationEvictionPolicy policy = (PassivationEvictionPolicy) cache.getEvictionPolicy();
  +//      policy.createRegion("/mySFSB", 100, 1L);
   
         cache.put("/mySFSB/1234", "hello", "world");
         System.out.println("After PUT");
  @@ -62,14 +62,26 @@
         if (cache.exists("/mySFSB/1234"))
         {
            cache.remove("/mySFSB/1234");
  -         synchronized (policy)
  -         {
  -            policy.removeRegion("/mySFSB");
  -         }
  +//         synchronized (policy)
  +//         {
  +//            policy.removeRegion("/mySFSB");
  +//         }
            cache.remove("/mySFSB");
         }
      }
   
  +   public void testSimpleRemote() throws Exception
  +   {
  +      SimpleStatefulRemote remote = (SimpleStatefulRemote) new InitialContext().lookup("SimpleStatefulBean/remote");
  +      remote.reset();
  +      remote.setState("hello");
  +      remote.longRunning();
  +      if (!"hello".equals(remote.getState())) throw new RuntimeException("failed state");
  +      if (!remote.getPostActivate()) throw new RuntimeException("failed to postActivate");
  +      if (!remote.getPrePassivate()) throw new RuntimeException("failed to prePassivate");
  +
  +   }
  +
      public void testSimpleLocal() throws Exception
      {
         SimpleStatefulLocal local = (SimpleStatefulLocal) new InitialContext().lookup("SimpleStatefulBean/local");
  
  
  
  1.1.6.10  +3 -1      jboss-ejb3/src/test/org/jboss/ejb3/test/cache/TesterMBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TesterMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/cache/TesterMBean.java,v
  retrieving revision 1.1.6.9
  retrieving revision 1.1.6.10
  diff -u -b -r1.1.6.9 -r1.1.6.10
  --- TesterMBean.java	20 Mar 2006 20:07:12 -0000	1.1.6.9
  +++ TesterMBean.java	21 Jul 2006 08:09:44 -0000	1.1.6.10
  @@ -27,11 +27,13 @@
    * Comment
    *
    * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  - * @version $Revision: 1.1.6.9 $
  + * @version $Revision: 1.1.6.10 $
    */
   public interface TesterMBean extends ServiceMBean
   {
      void test() throws Exception;
   
      void testSimpleLocal() throws Exception;
  +
  +   void testSimpleRemote() throws Exception;
   }
  
  
  



More information about the jboss-cvs-commits mailing list