[Jboss-cvs] JBossAS SVN: r56003 - in trunk/ejb3/src/test/org/jboss/ejb3/test/stateful: . unit

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

Author: bdecoste
Date: 2006-08-16 15:49:15 -0400 (Wed, 16 Aug 2006)
New Revision: 56003

Modified:
   trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java
Log:
fixed SerializeConcurrentAccess test

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java	2006-08-16 19:36:30 UTC (rev 56002)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStateful.java	2006-08-16 19:49:15 UTC (rev 56003)
@@ -34,6 +34,4 @@
    String getState() throws Exception;
 
    void setState(String state) throws Exception;
-   
-   int getCount();
 }

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java	2006-08-16 19:36:30 UTC (rev 56002)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ConcurrentStatefulBean.java	2006-08-16 19:49:15 UTC (rev 56003)
@@ -41,28 +41,18 @@
 {
    private static final Logger log = Logger.getLogger(ConcurrentStatefulBean.class);
 
-   private static int count = 0;
-
    private String state;
 
    public String getState() throws Exception
    {
-      ++count;
-      log.info("getState " + count);
+      Thread.sleep(1000);
       return state;
    }
 
    public void setState(String state) throws Exception
    {
-      count = 0;
       this.state = state;
-      log.info("setState " + count);
       Thread.sleep(1000);
    }
 
-   public int getCount()
-   {
-      return count;
-   }
-
 }

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java	2006-08-16 19:36:30 UTC (rev 56002)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/Stateful.java	2006-08-16 19:49:15 UTC (rev 56003)
@@ -29,12 +29,8 @@
  * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
  * @version $Revision$
  */
-public interface Stateful
+public interface Stateful extends ConcurrentStateful
 {
-   String getState();
-
-   void setState(String state);
-   
    boolean interceptorAccessed();
 
    boolean testSessionContext();

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java	2006-08-16 19:36:30 UTC (rev 56002)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java	2006-08-16 19:49:15 UTC (rev 56003)
@@ -105,13 +105,15 @@
       ds.toString();
    }
 
-   public String getState()
+   public String getState() throws Exception
    {
+      Thread.sleep(1000);
       return state;
    }
 
-   public void setState(String state)
+   public void setState(String state) throws Exception
    {
+      Thread.sleep(1000);
       this.state = state;
    }
 

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java	2006-08-16 19:36:30 UTC (rev 56002)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/RemoteUnitTestCase.java	2006-08-16 19:49:15 UTC (rev 56003)
@@ -369,7 +369,7 @@
          invoker.start();
       }
       
-      Thread.sleep(5000);
+      Thread.sleep(10000);
       
       for (StatefulInvoker invoker: invokers)
       {
@@ -377,7 +377,29 @@
             throw invoker.getException();
       }
       
-      assertEquals(2, stateful.getCount());
+      stateful = (ConcurrentStateful) new InitialContext().lookup("Stateful");
+      
+      invokers = new StatefulInvoker[2];
+      for (int i = 0; i < 2 ; ++i)
+      {
+         invokers[i] = new StatefulInvoker(stateful);
+      }
+      
+      for (StatefulInvoker invoker: invokers)
+      {
+         invoker.start();
+      }
+      
+      Thread.sleep(10000);
+      
+      boolean wasConcurrentException = false;
+      for (StatefulInvoker invoker: invokers)
+      {
+         if (invoker.getException() != null)
+            wasConcurrentException = true;
+      }
+      
+      assertTrue(wasConcurrentException);
    }
    
    public void testOverrideConcurrentAccess() throws Exception