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

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

Author: ALRubinger
Date: 2009-01-14 02:14:18 -0500 (Wed, 14 Jan 2009)
New Revision: 82852

Modified:
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/StatefulBean.java
   projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java
Log:
[EJBTHREE-1241] Make the SFSB Metrics tests more stable, less transient failures

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/StatefulBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/StatefulBean.java	2009-01-14 06:52:18 UTC (rev 82851)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/StatefulBean.java	2009-01-14 07:14:18 UTC (rev 82852)
@@ -59,7 +59,7 @@
 @RemoteBinding(jndiBinding = "Stateful",
                interceptorStack="RemoteBindingStatefulSessionClientInterceptors",
                factory = RemoteBindingDefaults.PROXY_FACTORY_STATEFUL_REMOTE)
- at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 1)
+ at CacheConfig(maxSize = 1000, idleTimeoutSeconds = 5)
 @SecurityDomain("test")
 @Resources({@Resource(name="jdbc/ds", mappedName="java:/DefaultDS")})
 public class StatefulBean implements org.jboss.ejb3.test.stateful.Stateful

Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java	2009-01-14 06:52:18 UTC (rev 82851)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java	2009-01-14 07:14:18 UTC (rev 82852)
@@ -77,6 +77,9 @@
    {
       ObjectName testerName = new ObjectName(objectName);
       
+      // Get the start cache size 
+      int startCacheSize = (Integer)server.getAttribute(testerName, "CacheSize");
+      
       // Establish how many beans are already active
       int prevCount = (Integer)server.getAttribute(testerName, "CreateCount");
       System.out.println("prevCount = " + prevCount);
@@ -89,8 +92,9 @@
       int count = (Integer)server.getAttribute(testerName, "CreateCount");
       assertEquals(1, count - prevCount);
       
-      int size = (Integer)server.getAttribute(testerName, "CacheSize");
-      assertEquals(1, size);
+      // Ensure cache is incremented
+      int newCacheSize = (Integer)server.getAttribute(testerName, "CacheSize");
+      assertEquals(startCacheSize+1, newCacheSize);
       
       assertEquals("state", stateful.getState());
       stateful.testSerializedState("state");
@@ -100,8 +104,8 @@
       assertFalse(stateful.testSessionContext());
       Thread.sleep(10 * 1000);
       
-      size = (Integer)server.getAttribute(testerName, "CacheSize");
-      assertEquals(0, size);
+      int cacheSize = (Integer)server.getAttribute(testerName, "CacheSize");
+      assertEquals(0, cacheSize);
       
       count = (Integer)server.getAttribute(testerName, "PassivatedCount");
       assertEquals(1, count - prevCount);
@@ -125,27 +129,27 @@
       
       // the injected beans are passivated at this point in time
       
-      size = (Integer)server.getAttribute(testerName, "CacheSize");
-      assertEquals(2, size);
+      cacheSize = (Integer)server.getAttribute(testerName, "CacheSize");
+      assertEquals(2, cacheSize);
       
       // keep in mind, we're not removing already injected beans
       
-      size = (Integer)server.getAttribute(testerName, "RemoveCount");
-      assertEquals(0, size);
+      cacheSize = (Integer)server.getAttribute(testerName, "RemoveCount");
+      assertEquals(0, cacheSize);
       
       another.removeMe();
-      size = (Integer)server.getAttribute(testerName, "CacheSize");
-      assertEquals(1, size);
+      cacheSize = (Integer)server.getAttribute(testerName, "CacheSize");
+      assertEquals(1, cacheSize);
       
-      size = (Integer)server.getAttribute(testerName, "RemoveCount");
-      assertEquals(1, size);
+      cacheSize = (Integer)server.getAttribute(testerName, "RemoveCount");
+      assertEquals(1, cacheSize);
       
       stateful.removeMe();
-      size = (Integer)server.getAttribute(testerName, "CacheSize");
-      assertEquals(0, size);
+      cacheSize = (Integer)server.getAttribute(testerName, "CacheSize");
+      assertEquals(0, cacheSize);
       
-      size = (Integer)server.getAttribute(testerName, "RemoveCount");
-      assertEquals(2, size);
+      cacheSize = (Integer)server.getAttribute(testerName, "RemoveCount");
+      assertEquals(2, cacheSize);
       
    }