[jboss-cvs] JBossAS SVN: r64917 - in branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test: statelesscreation/unit and 1 other directory.

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

Author: bdecoste
Date: 2007-08-28 12:46:26 -0400 (Tue, 28 Aug 2007)
New Revision: 64917

Modified:
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/unit/MetricsUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/unit/MetricsUnitTestCase.java
Log:
tests should now pass regardless of timing or machine speed - the tests were based on the pools reacing the max size

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/unit/MetricsUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/unit/MetricsUnitTestCase.java	2007-08-28 16:32:04 UTC (rev 64916)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/unit/MetricsUnitTestCase.java	2007-08-28 16:46:26 UTC (rev 64917)
@@ -107,7 +107,10 @@
       
       runConcurrentTests(20, 1);
       
-      checkMetrics(server, testerName, 3, 3, 3, 3, 0);
+      int currentSize = (Integer)server.getAttribute(testerName, "CurrentSize");
+      assertEquals(1, size);
+      
+      checkMetrics(server, testerName, currentSize, 3, 3, currentSize, 0);
      
       for (int i = 1 ; i <= 10 ; ++i)
       {
@@ -126,8 +129,11 @@
       
       runConcurrentTests(20, 1);
       
-      checkMetrics(server, testerName, 3, 3, 3, 13, 10);
+      currentSize = (Integer)server.getAttribute(testerName, "CurrentSize");
+      assertEquals(1, size);
       
+      checkMetrics(server, testerName, currentSize, 3, 3, currentSize + 10, 10);
+      
       Runnable r = new Runnable()
       {
          public void run()
@@ -148,14 +154,13 @@
       
       Thread.sleep(10 * 1000);
       
-      int currentSize = (Integer)server.getAttribute(testerName, "CurrentSize");
-      System.out.println("CurrentSize=" + currentSize);
+      int maxSize = (Integer)server.getAttribute(testerName, "MaxSize");
+      System.out.println("MaxSize=" + maxSize);
       
       int availableCount = (Integer)server.getAttribute(testerName, "AvailableCount");
       System.out.println("AvailableCount=" + availableCount);
-      
-      assertEquals(3, currentSize);
-      assertEquals(2, availableCount);
+     
+      assertEquals(maxSize - 1, availableCount);
    }
    
    protected void checkMetrics(MBeanServerConnection server, ObjectName testerName, int current, int available, int max, int create, int remove)
@@ -203,7 +208,7 @@
                try
                {
                   StatelessRemote stateless = (StatelessRemote)getInitialContext().lookup("StrictMaxPoolStatelessBean/remote");                              
-                  for (int i = 0 ; i < 20 ; ++i)
+                  for (int i = 0 ; i < 25 ; ++i)
                   {                  
                      stateless.test();     
                   }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/unit/MetricsUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/unit/MetricsUnitTestCase.java	2007-08-28 16:32:04 UTC (rev 64916)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/statelesscreation/unit/MetricsUnitTestCase.java	2007-08-28 16:46:26 UTC (rev 64917)
@@ -101,10 +101,9 @@
       System.out.println("CreateCount=" + createCount);
       
       
-      assertEquals(20, currentSize);
       assertEquals(20, availableCount);
       assertEquals(20, maxSize);
-      assertEquals(20, createCount);
+      assertEquals(currentSize, createCount);
       assertEquals(0, removeCount);
       
    }
@@ -115,7 +114,7 @@
       ObjectName testerName = new ObjectName("jboss.j2ee:jar=statelesscreation-test.jar,name=ThreadLocalPoolStatelessBean,service=EJB3");
       int size = 0;
       
-      size = (Integer)server.getAttribute(testerName, "CurrentSize");
+      int currentSize = (Integer)server.getAttribute(testerName, "CurrentSize");
       assertEquals(0, size);
       
       size = (Integer)server.getAttribute(testerName, "CreateCount");
@@ -125,8 +124,8 @@
       assertNotNull(stateless);
       stateless.test();     
       
-      size = (Integer)server.getAttribute(testerName, "CurrentSize");
-      assertEquals(1, size);
+      currentSize = (Integer)server.getAttribute(testerName, "CurrentSize");
+      assertEquals(1, currentSize);
       
       size = (Integer)server.getAttribute(testerName, "AvailableCount");
       assertEquals(20, size);
@@ -139,7 +138,9 @@
       
       runConcurrentTests(30, 1);
       
-      checkMetrics(server, testerName, 20, 20, 20, 20, 0);
+      currentSize = (Integer)server.getAttribute(testerName, "CurrentSize");
+      
+      checkMetrics(server, testerName, currentSize, 20, 20, currentSize, 0);
      
       for (int i = 1 ; i <= 10 ; ++i)
       {
@@ -158,8 +159,10 @@
       
       runConcurrentTests(30, 1);
       
-      checkMetrics(server, testerName, 20, 20, 20, 30, 10);
+      currentSize = (Integer)server.getAttribute(testerName, "CurrentSize");
       
+      checkMetrics(server, testerName, currentSize, 20, 20, currentSize + 10, 10);
+      
       Runnable r = new Runnable()
       {
          public void run()
@@ -180,14 +183,13 @@
       
       Thread.sleep(10 * 1000);
       
-      int currentSize = (Integer)server.getAttribute(testerName, "CurrentSize");
-      System.out.println("CurrentSize=" + currentSize);
+      int maxSize = (Integer)server.getAttribute(testerName, "MaxSize");
+      System.out.println("MaxSize=" + maxSize);
       
       int availableCount = (Integer)server.getAttribute(testerName, "AvailableCount");
       System.out.println("AvailableCount=" + availableCount);
       
-      assertEquals(20, currentSize);
-      assertEquals(19, availableCount);
+      assertEquals(maxSize - 1, availableCount);
    }
    
    protected void checkMetrics(MBeanServerConnection server, ObjectName testerName, int current, int available, int max, int create, int remove)
@@ -257,5 +259,4 @@
    {
       return getDeploySetup(MetricsUnitTestCase.class, "statelesscreation-test.jar");
    }
-
 }