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

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

Author: bdecoste
Date: 2007-03-07 13:46:26 -0500 (Wed, 07 Mar 2007)
New Revision: 61203

Modified:
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/unit/MetricsUnitTestCase.java
Log:
[EJBTHREE-825] added EJB 2.x style metrics to EJB3.0 JMX Containers

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java	2007-03-07 18:45:53 UTC (rev 61202)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateful/unit/MetricsUnitTestCase.java	2007-03-07 18:46:26 UTC (rev 61203)
@@ -23,26 +23,13 @@
 
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
-import javax.naming.InitialContext;
 
-import org.jboss.ejb3.test.stateful.ConcurrentStateful;
-import org.jboss.ejb3.test.stateful.SmallCacheStateful;
 import org.jboss.ejb3.test.stateful.Stateful;
-import org.jboss.ejb3.test.stateful.StatefulInvoker;
-import org.jboss.ejb3.test.stateful.StatefulLocal;
-import org.jboss.ejb3.test.stateful.StatefulTx;
-import org.jboss.ejb3.test.stateful.ProxyFactoryInterface;
-import org.jboss.ejb3.test.stateful.RemoteBindingInterceptor;
-import org.jboss.ejb3.test.stateful.State;
-import org.jboss.ejb3.test.stateful.StatefulHome;
-import org.jboss.ejb3.test.stateful.ExtendedState;
-import org.jboss.ejb3.test.stateful.Tester;
+
 import org.jboss.logging.Logger;
 import org.jboss.test.JBossTestCase;
 import junit.framework.Test;
 
-import javax.management.MBeanServerConnection;
-
 import org.jboss.security.SimplePrincipal;
 import org.jboss.security.SecurityAssociation;
 
@@ -122,14 +109,23 @@
       size = (Integer)server.getAttribute(testerName, "CacheSize");
       assertEquals(2, size);
       
+      size = (Integer)server.getAttribute(testerName, "RemoveCount");
+      assertEquals(0, size);
+      
       another.removeBean();
       size = (Integer)server.getAttribute(testerName, "CacheSize");
       assertEquals(1, size);
       
+      size = (Integer)server.getAttribute(testerName, "RemoveCount");
+      assertEquals(1, size);
+      
       stateful.removeBean();
       size = (Integer)server.getAttribute(testerName, "CacheSize");
       assertEquals(0, size);
       
+      size = (Integer)server.getAttribute(testerName, "RemoveCount");
+      assertEquals(2, size);
+      
    }
 
    public static Test suite() throws Exception

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-03-07 18:45:53 UTC (rev 61202)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/stateless/unit/MetricsUnitTestCase.java	2007-03-07 18:46:26 UTC (rev 61203)
@@ -55,6 +55,9 @@
       size = (Integer)server.getAttribute(testerName, "CurrentSize");
       assertEquals(-1, size);
       
+      size = (Integer)server.getAttribute(testerName, "CreateCount");
+      assertEquals(0, size);
+      
       StatelessRemote stateless = (StatelessRemote)getInitialContext().lookup("DefaultPoolStatelessBean/remote");
       assertNotNull(stateless);
       stateless.test();     
@@ -68,6 +71,12 @@
       size = (Integer)server.getAttribute(testerName, "MaxSize");
       assertEquals(-1, size);
       
+      size = (Integer)server.getAttribute(testerName, "CreateCount");
+      assertEquals(1, size);
+      
+      size = (Integer)server.getAttribute(testerName, "RemoveCount");
+      assertEquals(0, size);
+      
    }
    
    public void testStrictMaxPoolJmxMetrics() throws Exception
@@ -79,6 +88,9 @@
       size = (Integer)server.getAttribute(testerName, "CurrentSize");
       assertEquals(0, size);
       
+      size = (Integer)server.getAttribute(testerName, "CreateCount");
+      assertEquals(0, size);
+      
       StatelessRemote stateless = (StatelessRemote)getInitialContext().lookup("StrictMaxPoolStatelessBean/remote");
       assertNotNull(stateless);
       stateless.test();     
@@ -91,6 +103,9 @@
       
       size = (Integer)server.getAttribute(testerName, "MaxSize");
       assertEquals(123, size);
+      
+      size = (Integer)server.getAttribute(testerName, "CreateCount");
+      assertEquals(1, size);
    }
 
    public static Test suite() throws Exception