[jboss-cvs] JBossAS SVN: r60204 - in projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer: test and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2007-02-02 14:23:26 -0500 (Fri, 02 Feb 2007)
New Revision: 60204

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/DeployerAspects.java
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/JBossServer.java
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/JMXKernel.java
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/MainDeployerAspects.java
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/DeployersLifecycleAspectManagerJMXTestCase.java
Log:
Fix tests

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/DeployerAspects.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/DeployerAspects.java	2007-02-02 17:32:59 UTC (rev 60203)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/DeployerAspects.java	2007-02-02 19:23:26 UTC (rev 60204)
@@ -61,7 +61,7 @@
    {
       log.debug(invocation);
       MethodInvocation mi = (MethodInvocation) invocation;
-      String methodName = mi.getActualMethod().getName();
+      String methodName = mi.getMethod().getName();
       Object value = null;
       if( methodName.equals("prepareDeploy") )
          value = prepareDeploy(mi);
@@ -72,7 +72,10 @@
       else if( methodName.equals("commitUndeploy") )
          value = commitUndeploy(mi);
       else
+      {
+         log.debug("Method " + methodName + " is not advised");
          value = invocation.invokeNext();
+      }
       return value;
    }
 

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/JBossServer.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/JBossServer.java	2007-02-02 17:32:59 UTC (rev 60203)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/JBossServer.java	2007-02-02 19:23:26 UTC (rev 60204)
@@ -21,10 +21,6 @@
 */ 
 package org.jboss.test.microcontainer.support.deployers;
 
-import javax.management.MBeanServer;
-
-import com.sun.management.jmx.MBeanServerImpl;
-
 /**
  * 
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/JMXKernel.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/JMXKernel.java	2007-02-02 17:32:59 UTC (rev 60203)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/JMXKernel.java	2007-02-02 19:23:26 UTC (rev 60204)
@@ -21,11 +21,15 @@
 */ 
 package org.jboss.test.microcontainer.support.deployers;
 
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+
 import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
 
 import org.jboss.kernel.Kernel;
 
-import com.sun.management.jmx.MBeanServerImpl;
 
 /**
  * 
@@ -36,7 +40,24 @@
 {
    Kernel kernel;
    JBossServer serverImpl;
-   MBeanServer mbeanServer = new MBeanServerImpl();
+   MBeanServer mbeanServer = MBeanServerFactory.createMBeanServer();
+   
+   public JMXKernel() throws Exception
+   {
+      try
+      {
+         mbeanServer = (MBeanServer)AccessController.doPrivileged(new PrivilegedExceptionAction() {
+               public Object run() throws Exception 
+               {
+                  return MBeanServerFactory.createMBeanServer();
+               }
+            });
+      }
+      catch (PrivilegedActionException e)
+      {
+         throw (Exception)e.getCause();
+      }
+   }
 
    public Kernel getKernel()
    {

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/MainDeployerAspects.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/MainDeployerAspects.java	2007-02-02 17:32:59 UTC (rev 60203)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/MainDeployerAspects.java	2007-02-02 19:23:26 UTC (rev 60204)
@@ -50,7 +50,7 @@
    {
       log.debug(invocation);
       MethodInvocation mi = (MethodInvocation) invocation;
-      String methodName = mi.getActualMethod().getName();
+      String methodName = mi.getMethod().getName();
       Object value = null;
       if( methodName.equals("process") )
          value = process(mi);

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/DeployersLifecycleAspectManagerJMXTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/DeployersLifecycleAspectManagerJMXTestCase.java	2007-02-02 17:32:59 UTC (rev 60203)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/DeployersLifecycleAspectManagerJMXTestCase.java	2007-02-02 19:23:26 UTC (rev 60204)
@@ -23,12 +23,9 @@
 
 import java.util.HashSet;
 
-import javax.management.MBeanServer;
-
 import junit.framework.Test;
 
 import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
-import org.jboss.test.microcontainer.support.deployers.AspectManagerBean;
 import org.jboss.test.microcontainer.support.deployers.DeployerAspects;
 import org.jboss.test.microcontainer.support.deployers.IMainDeployer;
 import org.jboss.test.microcontainer.support.deployers.SampleDeployer;
@@ -53,16 +50,6 @@
    
    public void testBean() throws Exception
    {
-//      //Make sure that the mbean server and aspect manager are installed properly
-//      MBeanServer server = (MBeanServer)getBean("MBeanServer");
-//      assertNotNull(server);
-//      AspectManagerBean am = (AspectManagerBean)getBean("AspectManager");
-//      assertNotNull(am);
-//      MBeanServer amServer = am.getMbeanServer();
-//      assertSame(server, amServer);
-//      assertEquals(server, amServer);
-      
-      //Now let's get on with the test
       IMainDeployer md = (IMainDeployer) getBean("MainDeployer");
       assertNotNull(md);