SF.net SVN: mx4j: [2263] trunk/mx4j
[email protected] Tue, 20 Mar 2007 17:51:20 -0700
| Newsgroups | gmane.comp.java.mx4j.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 2263
http://svn.sourceforge.net/mx4j/?rev=2263&view=rev
Author: simonebordet
Date: 2007-03-20 17:51:20 -0700 (Tue, 20 Mar 2007)
Log Message:
-----------
Tests package reorganization.
Modified Paths:
--------------
trunk/mx4j/jsr160/pom.xml
trunk/mx4j/pom.xml
trunk/mx4j/tools/pom.xml
trunk/mx4j/tools/src/test/java/test/mx4j/tools/adaptor/http/HttpAdaptorTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/config/ConfigurationLoaderTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/jython/JythonRunnerTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/HTTPConnectorServerTestCase.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/PasswordAuthenticatorTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/burlap/BurlapConnectorInvocationTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/burlap/BurlapConnectorServerTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/burlap/BurlapConnectorTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/burlap/BurlapNotificationsTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/hessian/HessianConnectorInvocationTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/hessian/HessianConnectorServerTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/hessian/HessianConnectorTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/hessian/HessianNotificationsTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/local/LocalConnectorInvocationTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/local/LocalConnectorServerTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/local/LocalConnectorTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/proxy/RemoteMBeanProxyTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/soap/SOAPConnectorInvocationTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/soap/SOAPConnectorServerTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/soap/SOAPConnectorTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/soap/SOAPNotificationsTest.java
trunk/mx4j/tools/src/test/java/test/mx4j/tools/stats/StatsMBeansTest.java
Added Paths:
-----------
trunk/mx4j/tools/src/test/java/test/
trunk/mx4j/tools/src/test/java/test/mx4j/
Removed Paths:
-------------
trunk/mx4j/tools/src/test/java/mx4j/
Modified: trunk/mx4j/jsr160/pom.xml
===================================================================
--- trunk/mx4j/jsr160/pom.xml 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/jsr160/pom.xml 2007-03-21 00:51:20 UTC (rev 2263)
@@ -28,7 +28,6 @@
</plugins>
</build>
-
<dependencies>
<dependency>
<groupId>mx4j</groupId>
Modified: trunk/mx4j/pom.xml
===================================================================
--- trunk/mx4j/pom.xml 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/pom.xml 2007-03-21 00:51:20 UTC (rev 2263)
@@ -156,6 +156,11 @@
<artifactId>org.mortbay.jetty</artifactId>
<version>5.1.2</version>
</dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.0</version>
+ </dependency>
<dependency>
<groupId>mx4j</groupId>
Modified: trunk/mx4j/tools/pom.xml
===================================================================
--- trunk/mx4j/tools/pom.xml 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/pom.xml 2007-03-21 00:51:20 UTC (rev 2263)
@@ -13,40 +13,62 @@
<name>MX4J :: Tools</name>
<packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <testExcludes>
+ <exclude>**/burlap/*.java</exclude>
+ <exclude>**/hessian/*.java</exclude>
+ <exclude>**/local/*.java</exclude>
+ <exclude>**/soap/*.java</exclude>
+ <exclude>**/HTTPConnectorServerTestCase.java</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-jsr003</artifactId>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-jsr160</artifactId>
- </dependency>
- <dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>jython</groupId>
<artifactId>jython</artifactId>
- <version>2.1</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>com.caucho</groupId>
<artifactId>hessian</artifactId>
- <version>3.0.8</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
- <version>5.1.2</version>
</dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jsr003</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-jsr160</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-tests-support</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Copied: trunk/mx4j/tools/src/test/java/test/mx4j (from rev 2262, trunk/mx4j/tools/src/test/java/mx4j)
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/adaptor/http/HttpAdaptorTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/adaptor/http/HttpAdaptorTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/adaptor/http/HttpAdaptorTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -13,44 +13,29 @@
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
+
import javax.management.Attribute;
import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
-import junit.framework.TestCase;
import mx4j.tools.adaptor.http.HttpCommandProcessorAdaptor;
import mx4j.tools.adaptor.http.HttpInputStream;
import org.w3c.dom.Document;
+import test.mx4j.MX4JTestCase;
/**
* Class HttpAdaptorTest, tests the basics of the HttpAdaptor class
*
* @version $Revision$
*/
-public class HttpAdaptorTest extends TestCase
+public class HttpAdaptorTest extends MX4JTestCase
{
protected MBeanServer server;
protected ObjectName name;
protected static final int DEFAULT_PORT = 9090;
- /**
- * Constructor requested by the JUnit framework
- */
- public HttpAdaptorTest()
- {
- super("HTTPAdapter Test");
- }
-
- /**
- * Constructor requested by the JUnit framework
- */
- public HttpAdaptorTest(String name)
- {
- super(name);
- }
-
public void setUp()
{
try
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/config/ConfigurationLoaderTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/config/ConfigurationLoaderTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/config/ConfigurationLoaderTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -26,17 +26,17 @@
import mx4j.tools.config.ConfigurationException;
import mx4j.tools.config.ConfigurationLoader;
import mx4j.tools.config.DefaultConfigurationBuilder;
-import test.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
*/
public class ConfigurationLoaderTest extends MX4JTestCase
{
- public ConfigurationLoaderTest(String s)
- {
- super(s);
- }
+ private MBeanServer newMBeanServer()
+ {
+ return MBeanServerFactory.newMBeanServer();
+ }
public void testMalformedXML() throws Exception
{
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/jython/JythonRunnerTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/jython/JythonRunnerTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/jython/JythonRunnerTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -14,13 +14,13 @@
import javax.management.ObjectInstance;
import javax.management.ObjectName;
-import junit.framework.TestCase;
import mx4j.tools.jython.JythonRunner;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
*/
-public class JythonRunnerTest extends TestCase
+public class JythonRunnerTest extends MX4JTestCase
{
private MBeanServer svr;
private JythonRunner jythonRunner;
@@ -129,11 +129,6 @@
}
}
- public JythonRunnerTest(String name)
- {
- super(name);
- }
-
public void setUp() throws Exception
{
super.setUp();
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/HTTPConnectorServerTestCase.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/HTTPConnectorServerTestCase.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/HTTPConnectorServerTestCase.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -10,6 +10,7 @@
import java.io.IOException;
import java.util.Set;
+
import javax.management.MBeanServerConnection;
import javax.management.remote.JMXConnector;
import javax.management.remote.JMXConnectorFactory;
@@ -24,11 +25,6 @@
*/
public abstract class HTTPConnectorServerTestCase extends JMXConnectorServerTestCase
{
- public HTTPConnectorServerTestCase(String name)
- {
- super(name);
- }
-
public void testTwoConnectorServersOneHTTPServerStart1Start2Invoke1Invoke2Stop1Stop2() throws Exception
{
JMXServiceURL temp = createJMXConnectorServerAddress();
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/PasswordAuthenticatorTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/PasswordAuthenticatorTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/PasswordAuthenticatorTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -15,21 +15,17 @@
import java.io.StringWriter;
import java.security.Principal;
import java.util.Set;
+
import javax.security.auth.Subject;
import mx4j.tools.remote.PasswordAuthenticator;
-import test.MX4JTestCase;
+import test.mx4j.MX4JTestCase;
/**
* @version $Revision$
*/
public class PasswordAuthenticatorTest extends MX4JTestCase
{
- public PasswordAuthenticatorTest(String s)
- {
- super(s);
- }
-
public void testAuthenticationWithNullCredentials() throws Exception
{
PasswordAuthenticator authenticator = new PasswordAuthenticator(preparePasswords(new String[0]));
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/burlap/BurlapConnectorInvocationTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/burlap/BurlapConnectorInvocationTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/burlap/BurlapConnectorInvocationTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.javax.management.remote.JMXConnectorInvocationTestCase;
@@ -20,11 +21,6 @@
*/
public class BurlapConnectorInvocationTest extends JMXConnectorInvocationTestCase
{
- public BurlapConnectorInvocationTest(String name)
- {
- super(name);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("burlap", null, 8080, "/burlap");
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/burlap/BurlapConnectorServerTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/burlap/BurlapConnectorServerTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/burlap/BurlapConnectorServerTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.mx4j.tools.remote.HTTPConnectorServerTestCase;
@@ -20,11 +21,6 @@
*/
public class BurlapConnectorServerTest extends HTTPConnectorServerTestCase
{
- public BurlapConnectorServerTest(String name)
- {
- super(name);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("burlap", null, 8080, "/burlap");
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/burlap/BurlapConnectorTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/burlap/BurlapConnectorTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/burlap/BurlapConnectorTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.javax.management.remote.JMXConnectorTestCase;
@@ -20,11 +21,6 @@
*/
public class BurlapConnectorTest extends JMXConnectorTestCase
{
- public BurlapConnectorTest(String name)
- {
- super(name);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("burlap", null, 8080, "/burlap");
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/burlap/BurlapNotificationsTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/burlap/BurlapNotificationsTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/burlap/BurlapNotificationsTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.javax.management.remote.JMXNotificationsTestCase;
@@ -20,11 +21,6 @@
*/
public class BurlapNotificationsTest extends JMXNotificationsTestCase
{
- public BurlapNotificationsTest(String name)
- {
- super(name);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("burlap", null, 8080, "/burlap");
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/hessian/HessianConnectorInvocationTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/hessian/HessianConnectorInvocationTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/hessian/HessianConnectorInvocationTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.javax.management.remote.JMXConnectorInvocationTestCase;
@@ -20,11 +21,6 @@
*/
public class HessianConnectorInvocationTest extends JMXConnectorInvocationTestCase
{
- public HessianConnectorInvocationTest(String name)
- {
- super(name);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("hessian", null, 8080, "/hessian");
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/hessian/HessianConnectorServerTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/hessian/HessianConnectorServerTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/hessian/HessianConnectorServerTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.mx4j.tools.remote.HTTPConnectorServerTestCase;
@@ -20,11 +21,6 @@
*/
public class HessianConnectorServerTest extends HTTPConnectorServerTestCase
{
- public HessianConnectorServerTest(String s)
- {
- super(s);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("hessian", null, 8080, "/hessian");
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/hessian/HessianConnectorTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/hessian/HessianConnectorTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/hessian/HessianConnectorTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.javax.management.remote.JMXConnectorTestCase;
@@ -20,11 +21,6 @@
*/
public class HessianConnectorTest extends JMXConnectorTestCase
{
- public HessianConnectorTest(String name)
- {
- super(name);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("hessian", null, 8080, "/hessian");
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/hessian/HessianNotificationsTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/hessian/HessianNotificationsTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/hessian/HessianNotificationsTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.javax.management.remote.JMXNotificationsTestCase;
@@ -20,11 +21,6 @@
*/
public class HessianNotificationsTest extends JMXNotificationsTestCase
{
- public HessianNotificationsTest(String name)
- {
- super(name);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("hessian", null, 8080, "/hessian");
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/local/LocalConnectorInvocationTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/local/LocalConnectorInvocationTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/local/LocalConnectorInvocationTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.javax.management.remote.JMXConnectorInvocationTestCase;
@@ -20,11 +21,6 @@
*/
public class LocalConnectorInvocationTest extends JMXConnectorInvocationTestCase
{
- public LocalConnectorInvocationTest(String s)
- {
- super(s);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("local", "localhost", 0);
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/local/LocalConnectorServerTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/local/LocalConnectorServerTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/local/LocalConnectorServerTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.javax.management.remote.JMXConnectorServerTestCase;
@@ -20,11 +21,6 @@
*/
public class LocalConnectorServerTest extends JMXConnectorServerTestCase
{
- public LocalConnectorServerTest(String s)
- {
- super(s);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("local", "localhost", 0);
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/local/LocalConnectorTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/local/LocalConnectorTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/local/LocalConnectorTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.javax.management.remote.JMXConnectorTestCase;
@@ -20,11 +21,6 @@
*/
public class LocalConnectorTest extends JMXConnectorTestCase
{
- public LocalConnectorTest(String s)
- {
- super(s);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("local", "localhost", 0);
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/proxy/RemoteMBeanProxyTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/proxy/RemoteMBeanProxyTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/proxy/RemoteMBeanProxyTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -10,9 +10,11 @@
import java.io.IOException;
import java.net.URL;
+
import javax.management.MBeanServer;
import javax.management.MBeanServerConnection;
import javax.management.MBeanServerDelegateMBean;
+import javax.management.MBeanServerFactory;
import javax.management.MBeanServerInvocationHandler;
import javax.management.Notification;
import javax.management.NotificationListener;
@@ -27,18 +29,18 @@
import mx4j.tools.remote.proxy.RemoteMBeanProxy;
import mx4j.util.Utils;
-import test.MX4JTestCase;
-import test.MutableObject;
+import test.mx4j.MX4JTestCase;
+import test.mx4j.MutableObject;
/**
* @version $Revision$
*/
public class RemoteMBeanProxyTest extends MX4JTestCase
{
- public RemoteMBeanProxyTest(String s)
- {
- super(s);
- }
+ private MBeanServer newMBeanServer()
+ {
+ return MBeanServerFactory.newMBeanServer();
+ }
public void testNotifications() throws Exception
{
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/soap/SOAPConnectorInvocationTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/soap/SOAPConnectorInvocationTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/soap/SOAPConnectorInvocationTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.javax.management.remote.JMXConnectorInvocationTestCase;
@@ -20,11 +21,6 @@
*/
public class SOAPConnectorInvocationTest extends JMXConnectorInvocationTestCase
{
- public SOAPConnectorInvocationTest(String name)
- {
- super(name);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("soap", null, 8080, "/soap");
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/soap/SOAPConnectorServerTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/soap/SOAPConnectorServerTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/soap/SOAPConnectorServerTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -30,11 +30,6 @@
*/
public class SOAPConnectorServerTest extends HTTPConnectorServerTestCase
{
- public SOAPConnectorServerTest(String s)
- {
- super(s);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("soap", null, 8080, "/soap");
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/soap/SOAPConnectorTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/soap/SOAPConnectorTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/soap/SOAPConnectorTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -23,11 +23,6 @@
*/
public class SOAPConnectorTest extends JMXConnectorTestCase
{
- public SOAPConnectorTest(String name)
- {
- super(name);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("soap", null, 8080, "/soap");
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/soap/SOAPNotificationsTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/remote/soap/SOAPNotificationsTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/remote/soap/SOAPNotificationsTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -11,6 +11,7 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+
import javax.management.remote.JMXServiceURL;
import test.javax.management.remote.JMXNotificationsTestCase;
@@ -20,11 +21,6 @@
*/
public class SOAPNotificationsTest extends JMXNotificationsTestCase
{
- public SOAPNotificationsTest(String s)
- {
- super(s);
- }
-
public JMXServiceURL createJMXConnectorServerAddress() throws MalformedURLException
{
return new JMXServiceURL("soap", null, 8080, "/soap");
Modified: trunk/mx4j/tools/src/test/java/test/mx4j/tools/stats/StatsMBeansTest.java
===================================================================
--- trunk/mx4j/tools/src/test/java/mx4j/tools/stats/StatsMBeansTest.java 2007-03-21 00:09:32 UTC (rev 2262)
+++ trunk/mx4j/tools/src/test/java/test/mx4j/tools/stats/StatsMBeansTest.java 2007-03-21 00:51:20 UTC (rev 2263)
@@ -10,6 +10,7 @@
import java.util.Date;
import java.util.SortedMap;
+
import javax.management.Attribute;
import javax.management.AttributeChangeNotification;
import javax.management.MBeanServer;
@@ -17,34 +18,18 @@
import javax.management.NotificationBroadcasterSupport;
import javax.management.ObjectName;
-import junit.framework.TestCase;
import mx4j.tools.stats.PointTime;
+import test.mx4j.MX4JTestCase;
/**
* Test the Statistics MBeans
*
* @version $Revision$
*/
-public class StatsMBeansTest extends TestCase
+public class StatsMBeansTest extends MX4JTestCase
{
private MBeanServer server;
- /**
- * Constructor requested by the JUnit framework
- */
- public StatsMBeansTest()
- {
- super("StatsMBeansTest Test");
- }
-
- /**
- * Constructor requested by the JUnit framework
- */
- public StatsMBeansTest(String name)
- {
- super(name);
- }
-
public void setUp()
{
try
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV