Menu
▾
▴
[jboss-cvs] jbosstest/src/main/org/jboss/test JBossRMIAdaptorHelper.java JBossClusteredTestCase.java JBossTestServices.java JBossTestSetup.java JBossTestCase.java
|
From: Scott M S. <st...@us...> - 2004-08-02 22:04:01
|
User: starksm
Date: 04/08/02 15:03:54
Modified: src/main/org/jboss/test JBossClusteredTestCase.java
JBossTestServices.java JBossTestSetup.java
JBossTestCase.java
Added: src/main/org/jboss/test JBossRMIAdaptorHelper.java
Log:
Merge the 3.2 changes
Revision Changes Path
1.7 +21 -33 jbosstest/src/main/org/jboss/test/JBossClusteredTestCase.java
Index: JBossClusteredTestCase.java
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/JBossClusteredTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JBossClusteredTestCase.java 9 Jul 2004 21:19:24 -0000 1.6
+++ JBossClusteredTestCase.java 2 Aug 2004 22:03:53 -0000 1.7
@@ -4,7 +4,6 @@
* Distributable under LGPL license.
* See terms of license at gnu.org.
*/
-
package org.jboss.test;
import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
@@ -18,29 +17,13 @@
* @see org.jboss.test.JBossTestCase
*
* @author <a href="mailto:sac...@co...">Sacha Labourey</a>.
- * @version $Revision: 1.6 $
- *
- * <p><b>Revisions:</b>
- *
- * <p><b>12 avril 2002 Sacha Labourey:</b>
- * <ul>
- * <li> First implementation </li>
- * </ul>
- * @author ani...@jb...
- * Added the method setServers which will configure the clustered servers
+ * @author Sco...@jb...
+ * @version $Revision: 1.7 $
*/
-
public class JBossClusteredTestCase extends JBossTestCase
{
-
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
+ JBossTestClusteredServices clusterServices;
+
public JBossClusteredTestCase(String name)
{
super (name);
@@ -48,7 +31,8 @@
public void initDelegate ()
{
- delegate = new JBossTestClusteredServices(getClass().getName());
+ clusterServices = new JBossTestClusteredServices(getClass().getName());
+ delegate = clusterServices;
}
// Public --------------------------------------------------------
@@ -60,17 +44,18 @@
assertTrue("Server was not found", getServers() != null);
}
- // Z implementation ----------------------------------------------
- // Y overrides ---------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- protected RMIAdaptor[] getServers() throws Exception
+ public RMIAdaptor[] getAdaptors() throws Exception
+ {
+ return clusterServices.getAdaptors();
+ }
+ public String[] getServers() throws Exception
{
- return ((JBossTestClusteredServices)delegate).getServers();
+ return clusterServices.getServers();
+ }
+ public String[] getNamingURLs() throws Exception
+ {
+ return clusterServices.getNamingURLs();
}
public static Test getDeploySetup(final Test test, final String jarName) throws Exception
@@ -80,6 +65,7 @@
protected void setUp() throws Exception
{
+ if( jarName == null ) return;
deploymentException = null;
try {
this.deploy(jarName);
@@ -99,6 +85,8 @@
protected void tearDown() throws Exception
{
+ if( jarName == null ) return;
+ this.getLog().debug("Attempt undeploy of "+ jarName);
this.undeploy(jarName);
this.getLog().debug("undeployed package: " + jarName);
}
@@ -112,9 +100,9 @@
suite.addTest(new TestSuite(clazz));
return getDeploySetup(suite, jarName);
}
-
+
/**
- * @author anil
+ * anil
*/
public void setServerNames( String[] snames) throws Exception{
((JBossTestClusteredServices)delegate).setServerNames(snames);
1.29 +4 -2 jbosstest/src/main/org/jboss/test/JBossTestServices.java
Index: JBossTestServices.java
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/JBossTestServices.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- JBossTestServices.java 28 Jul 2004 05:34:02 -0000 1.28
+++ JBossTestServices.java 2 Aug 2004 22:03:53 -0000 1.29
@@ -37,7 +37,7 @@
* @author <a href="mailto:d_j...@us...">David Jencks</a>
* @author <a href="mailto:chr...@jb...">Christoph G. Jung</a>
* @author Sco...@jb...
- * @version $Revision: 1.28 $
+ * @version $Revision: 1.29 $
*/
public class JBossTestServices
{
@@ -213,6 +213,8 @@
{
try
{
+ this.getLog().debug("Invoking "+name.getCanonicalName()+" method="+method);
+ this.getLog().debug(args.toString());
return server.invoke(name, method, args, sig);
}
catch (javax.management.MBeanException e)
@@ -325,7 +327,7 @@
if( Boolean.getBoolean("jbosstest.nodeploy") == true )
return;
String deployURL = getDeployURL(name);
- log.debug("Uneploying "+name+", url="+deployURL);
+ log.debug("Undeploying "+name+", url="+deployURL);
Object[] args = {deployURL};
String[] sig = {"java.lang.String"};
invoke(getDeployerName(), "undeploy", args, sig);
1.14 +2 -2 jbosstest/src/main/org/jboss/test/JBossTestSetup.java
Index: JBossTestSetup.java
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/JBossTestSetup.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JBossTestSetup.java 2 Mar 2004 08:08:30 -0000 1.13
+++ JBossTestSetup.java 2 Aug 2004 22:03:53 -0000 1.14
@@ -35,7 +35,7 @@
*
* @author <a href="mailto:d_j...@us...">David Jencks</a>
* @author <a href="mailto:chr...@jb...">Christoph G. Jung</a>
- * @version $Revision: 1.13 $
+ * @version $Revision: 1.14 $
*/
public class JBossTestSetup
extends TestSetup
@@ -178,7 +178,7 @@
protected void flushAuthCache() throws Exception
{
- delegate.flushAuthCache("other");
+ flushAuthCache("other");
}
protected void flushAuthCache(String domain) throws Exception
{
1.24 +3 -3 jbosstest/src/main/org/jboss/test/JBossTestCase.java
Index: JBossTestCase.java
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/JBossTestCase.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JBossTestCase.java 9 Apr 2004 22:43:09 -0000 1.23
+++ JBossTestCase.java 2 Aug 2004 22:03:54 -0000 1.24
@@ -32,7 +32,7 @@
*
* @author <a href="mailto:d_j...@us...">David Jencks</a>
* @author Sco...@jb...
- * @version $Revision: 1.23 $
+ * @version $Revision: 1.24 $
*/
public class JBossTestCase
extends TestCase
@@ -264,12 +264,12 @@
return wrapper;
}
- public static Test getDeploySetup(final Class clazz, final String jarNames)
+ public static Test getDeploySetup(final Class clazz, final String jarName)
throws Exception
{
TestSuite suite = new TestSuite();
suite.addTest(new TestSuite(clazz));
- return getDeploySetup(suite, jarNames);
+ return getDeploySetup(suite, jarName);
}
protected String getJndiURL()
1.2 +101 -0 jbosstest/src/main/org/jboss/test/JBossRMIAdaptorHelper.java
|