[jboss-cvs] JBossAS SVN: r100744 - trunk/testsuite/src/main/org/jboss/test/profileservice/test.

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

Author: emuckenhuber
Date: 2010-02-09 07:28:12 -0500 (Tue, 09 Feb 2010)
New Revision: 100744

Modified:
   trunk/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java
Log:
[JBAS-7713] make sure the (on-demand) webApp is actually deployed before we start the tests :)

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java	2010-02-09 12:09:36 UTC (rev 100743)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/test/JMXMappingUnitTestCase.java	2010-02-09 12:28:12 UTC (rev 100744)
@@ -22,28 +22,24 @@
 package org.jboss.test.profileservice.test;
 
 import java.net.URL;
-import java.util.Collection;
-import java.util.List;
 import java.util.Set;
 
 import javax.rmi.PortableRemoteObject;
 
 import junit.framework.Test;
+import junit.framework.TestSuite;
 
 import org.jboss.deployers.spi.management.ManagementView;
 import org.jboss.managed.api.ComponentType;
 import org.jboss.managed.api.ManagedComponent;
-import org.jboss.managed.api.ManagedOperation;
 import org.jboss.managed.api.ManagedProperty;
 import org.jboss.managed.api.RunState;
 import org.jboss.metatype.api.values.CompositeValue;
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.metatype.api.values.SimpleValue;
-import org.jboss.metatype.api.values.TableValue;
 import org.jboss.test.ejb.proxy.beans.StatefulCounter;
 import org.jboss.test.ejb.proxy.beans.StatefulCounterHome;
-import org.jboss.test.ejb.proxy.beans.HandleRetrievalStatefulSessionInterceptor.RetrievalMethodHandle;
-import org.jboss.test.ejb.proxy.test.ProxyLogicTestCase;
+import org.jboss.test.util.web.HttpUtils;
 
 /**
  * Tests JMX components exposed outside the MC
@@ -59,7 +55,22 @@
 
    public static Test suite() throws Exception
    {
-      return getDeploySetup(JMXMappingUnitTestCase.class, "ejbproxy-test.jar");
+      final TestSuite suite = new TestSuite();
+      
+      suite.addTest(new JMXMappingUnitTestCase("testEjbMetrics"));
+      
+      // Make sure the jmx-console is deployed
+      suite.addTest(new JMXMappingUnitTestCase("deployWebApp"));
+      
+      suite.addTest(new JMXMappingUnitTestCase("testConnector"));
+      suite.addTest(new JMXMappingUnitTestCase("testContextMO"));
+      suite.addTest(new JMXMappingUnitTestCase("testRunState"));
+      suite.addTest(new JMXMappingUnitTestCase("testServlet"));
+      suite.addTest(new JMXMappingUnitTestCase("testWebApplication"));
+      suite.addTest(new JMXMappingUnitTestCase("testWebApplicationManager"));
+      suite.addTest(new JMXMappingUnitTestCase("testWebHost"));
+
+      return getDeploySetup(suite, "ejbproxy-test.jar");
    }
 
    public void testEjbMetrics() throws Exception
@@ -94,6 +105,14 @@
       fail("Could not find EJB!");
    }
 
+   public void deployWebApp() throws Exception
+   {
+      // Deploy the jmx-console, in case it's getting deployed on-demand 
+      // @see https://jira.jboss.org/jira/browse/JBAS-7713
+      String baseURL = HttpUtils.getBaseURL();
+      HttpUtils.accessURL(new URL(baseURL + "jmx-console"));      
+   }
+   
    public void testWebApplicationManager()
       throws Exception
    {