[jboss-cvs] JBossAS SVN: r74094 - in trunk/testsuite/src: main/org/jboss/test/jmx/test and 1 other directories.

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

Author: adrian at jboss.org
Date: 2008-06-04 08:30:04 -0400 (Wed, 04 Jun 2008)
New Revision: 74094

Modified:
   trunk/testsuite/src/main/org/jboss/test/jmx/annotated/AnnotatedJMXPojo.java
   trunk/testsuite/src/main/org/jboss/test/jmx/test/AnnotatedJMXUnitTestCase.java
   trunk/testsuite/src/resources/jmx/annotated/META-INF/annotated-jmx-beans.xml
Log:
[JBAS-5578] - Add tests for registering directly and invoking MBean operations

Modified: trunk/testsuite/src/main/org/jboss/test/jmx/annotated/AnnotatedJMXPojo.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/annotated/AnnotatedJMXPojo.java	2008-06-04 12:28:33 UTC (rev 74093)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/annotated/AnnotatedJMXPojo.java	2008-06-04 12:30:04 UTC (rev 74094)
@@ -30,7 +30,7 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision: 1.1 $
  */
- at JMX(name="test:name=AnnotatedJMXPojo", exposedInterface=AnnotatedJMXPojoMBean.class)
+ at JMX(name="test:name=AnnotatedJMXPojo", exposedInterface=AnnotatedJMXPojoMBean.class, registerDirectly=true)
 public class AnnotatedJMXPojo extends ServiceMBeanSupport implements AnnotatedJMXPojoMBean
 {
    private boolean createInvoked;

Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/AnnotatedJMXUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/AnnotatedJMXUnitTestCase.java	2008-06-04 12:28:33 UTC (rev 74093)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/AnnotatedJMXUnitTestCase.java	2008-06-04 12:30:04 UTC (rev 74094)
@@ -41,16 +41,71 @@
    public void testAnnotatedJMX() throws Exception
    {
       ObjectName name = new ObjectName("test:name=AnnotatedJMXPojo");
+      ObjectName nameNotDirect = new ObjectName("test:name=AnnotatedJMXPojoNotDirect");
       
       deploy("testannotatedjmxpojo.beans");
       try
       {
          assertTrue((Boolean) getServer().getAttribute(name, "CreateInvoked"));
          assertTrue((Boolean) getServer().getAttribute(name, "StartInvoked"));
+         assertTrue((Boolean) getServer().getAttribute(nameNotDirect, "CreateInvoked"));
+         assertTrue((Boolean) getServer().getAttribute(nameNotDirect, "StartInvoked"));
       }
       finally
       {
          undeploy("testannotatedjmxpojo.beans");
       }
    }
+   
+   public void testAnnotatedJMXRestart() throws Exception
+   {
+      ObjectName name = new ObjectName("test:name=AnnotatedJMXPojo");
+      
+      deploy("testannotatedjmxpojo.beans");
+      try
+      {
+         assertTrue((Boolean) getServer().getAttribute(name, "CreateInvoked"));
+         assertTrue((Boolean) getServer().getAttribute(name, "StartInvoked"));
+         
+         getServer().invoke(name, "destroy", null, null);
+         assertTrue((Boolean) getServer().getAttribute(name, "StopInvoked"));
+         assertTrue((Boolean) getServer().getAttribute(name, "DestroyInvoked"));
+
+         getServer().invoke(name, "reset", null, null);
+         
+         getServer().invoke(name, "create", null, null);
+         getServer().invoke(name, "start", null, null);
+         assertTrue((Boolean) getServer().getAttribute(name, "StartInvoked"));
+      }
+      finally
+      {
+         undeploy("testannotatedjmxpojo.beans");
+      }
+   }
+   
+   public void testAnnotatedJMXRestartNotDirect() throws Exception
+   {
+      ObjectName name = new ObjectName("test:name=AnnotatedJMXPojoNotDirect");
+      
+      deploy("testannotatedjmxpojo.beans");
+      try
+      {
+         assertTrue((Boolean) getServer().getAttribute(name, "CreateInvoked"));
+         assertTrue((Boolean) getServer().getAttribute(name, "StartInvoked"));
+         
+         getServer().invoke(name, "destroy", null, null);
+         assertTrue((Boolean) getServer().getAttribute(name, "StopInvoked"));
+         assertTrue((Boolean) getServer().getAttribute(name, "DestroyInvoked"));
+
+         getServer().invoke(name, "reset", null, null);
+         
+         getServer().invoke(name, "create", null, null);
+         getServer().invoke(name, "start", null, null);
+         assertTrue((Boolean) getServer().getAttribute(name, "StartInvoked"));
+      }
+      finally
+      {
+         undeploy("testannotatedjmxpojo.beans");
+      }
+   }
 }

Modified: trunk/testsuite/src/resources/jmx/annotated/META-INF/annotated-jmx-beans.xml
===================================================================
--- trunk/testsuite/src/resources/jmx/annotated/META-INF/annotated-jmx-beans.xml	2008-06-04 12:28:33 UTC (rev 74093)
+++ trunk/testsuite/src/resources/jmx/annotated/META-INF/annotated-jmx-beans.xml	2008-06-04 12:30:04 UTC (rev 74094)
@@ -4,4 +4,8 @@
 
    <bean name="TestAnnotatedJMXPojo" class="org.jboss.test.jmx.annotated.AnnotatedJMXPojo"/>
 
+   <bean name="TestAnnotatedJMXPojoNotDirect" class="org.jboss.test.jmx.annotated.AnnotatedJMXPojo">
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:name=AnnotatedJMXPojoNotDirect", exposedInterface=org.jboss.test.jmx.annotated.AnnotatedJMXPojoMBean.class)</annotation>
+   </bean>
+
 </deployment>
\ No newline at end of file