[jboss-cvs] JBossAS SVN: r103440 - trunk/testsuite/src/main/org/jboss/test/jmx/test.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 1 10:57:29 EDT 2010
Author: smarlow at redhat.com
Date: 2010-04-01 10:57:28 -0400 (Thu, 01 Apr 2010)
New Revision: 103440
Modified:
trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXConnectorUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXInvokerUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/jmx/test/RMIAdaptorUnitTestCase.java
Log:
JBAS-7874 Change unit tests to use JMXConnectorFactory (instead of RMIAdaptor) or remove the unit test
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXConnectorUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXConnectorUnitTestCase.java 2010-04-01 14:57:13 UTC (rev 103439)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXConnectorUnitTestCase.java 2010-04-01 14:57:28 UTC (rev 103440)
@@ -35,7 +35,6 @@
import javax.management.remote.JMXConnectorFactory;
import junit.framework.Test;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossTestCase;
import org.jboss.test.jmx.invoker.CustomClass;
import org.jboss.test.jmx.invoker.InvokerTestMBean;
@@ -80,7 +79,8 @@
public void setUp() throws Exception
{
super.setUp();
- String surl = "service:jmx:rmi://" + getServerHost() + "/jndi/rmi://" + getServerHost() + ":1090/jmxconnector";
+ String surl = "service:jmx:rmi://" + getServerHost() + "/jndi/rmi://" + getServerHost() + ":1090/jmxrmi";
+ log.info("setup for JMXServiceURL = " + surl);
JMXServiceURL url = new JMXServiceURL(surl);
connector = JMXConnectorFactory.connect(url);
server = connector.getMBeanServerConnection();
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXInvokerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXInvokerUnitTestCase.java 2010-04-01 14:57:13 UTC (rev 103439)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/JMXInvokerUnitTestCase.java 2010-04-01 14:57:28 UTC (rev 103440)
@@ -66,8 +66,6 @@
suite.addTest(new JMXInvokerUnitTestCase("testXMBeanDoSomething"));
suite.addTest(new JMXInvokerUnitTestCase("testSetCustom"));
suite.addTest(new JMXInvokerUnitTestCase("testClassNotFoundException"));
- suite.addTest(new JMXInvokerUnitTestCase("testNotification"));
- suite.addTest(new JMXInvokerUnitTestCase("testNotificationWithBadListener"));
return getDeploySetup(suite, "invoker-adaptor-test.ear");
}
@@ -86,16 +84,14 @@
throws Exception
{
log.info("+++ testGetSomething");
- RMIAdaptor server = (RMIAdaptor) getInitialContext().lookup("jmx/invoker/RMIAdaptor");
- assertEquals("something", server.getAttribute(getObjectName(), "Something"));
+ assertEquals("something", getServer().getAttribute(getObjectName(), "Something"));
}
public void testGetCustom()
throws Exception
{
log.info("+++ testGetCustom");
- RMIAdaptor server = (RMIAdaptor) getInitialContext().lookup("jmx/invoker/RMIAdaptor");
- CustomClass custom = (CustomClass) server.getAttribute(getObjectName(), "Custom");
+ CustomClass custom = (CustomClass) getServer().getAttribute(getObjectName(), "Custom");
assertEquals("InitialValue", custom.getValue());
}
@@ -103,29 +99,26 @@
throws Exception
{
log.info("+++ testGetCustomXMBean");
- RMIAdaptor server = (RMIAdaptor) getInitialContext().lookup("jmx/invoker/RMIAdaptor");
ObjectName xmbean = new ObjectName("jboss.test:service=InvokerTest,type=XMBean");
- CustomClass custom = (CustomClass) server.getAttribute(xmbean, "Custom");
+ CustomClass custom = (CustomClass) getServer().getAttribute(xmbean, "Custom");
assertEquals("InitialValue", custom.getValue());
}
public void testGetXMBeanInfo()
throws Exception
{
log.info("+++ testGetXMBeanInfo");
- RMIAdaptor server = (RMIAdaptor) getInitialContext().lookup("jmx/invoker/RMIAdaptor");
ObjectName xmbean = new ObjectName("jboss.test:service=InvokerTest,type=XMBean");
- MBeanInfo info = server.getMBeanInfo(xmbean);
+ MBeanInfo info = getServer().getMBeanInfo(xmbean);
log.info("MBeanInfo: "+info);
}
public void testXMBeanDoSomething()
throws Exception
{
log.info("+++ testXMBeanDoSomething");
- RMIAdaptor server = (RMIAdaptor) getInitialContext().lookup("jmx/invoker/RMIAdaptor");
ObjectName xmbean = new ObjectName("jboss.test:service=InvokerTest,type=XMBean");
Object[] args = {};
String[] sig = {};
- CustomClass custom = (CustomClass) server.invoke(xmbean, "doSomething", args, sig);
+ CustomClass custom = (CustomClass) getServer().invoke(xmbean, "doSomething", args, sig);
log.info("doSomething: "+custom);
}
@@ -133,7 +126,7 @@
throws Exception
{
log.info("+++ testSetCustom");
- RMIAdaptor server = (RMIAdaptor) getInitialContext().lookup("jmx/invoker/RMIAdaptor");
+ MBeanServerConnection server = getServer();
server.setAttribute(getObjectName(), new Attribute("Custom", new CustomClass("changed")));
CustomClass custom = (CustomClass) server.getAttribute(getObjectName(), "Custom");
assertEquals("changed", custom.getValue());
@@ -148,7 +141,7 @@
public void testClassNotFoundException() throws Exception
{
log.info("+++ testClassNotFoundException");
- MBeanServerConnection server = (MBeanServerConnection) getInitialContext().lookup("jmx/invoker/RMIAdaptor");
+ MBeanServerConnection server = getServer();
ObjectName name = new ObjectName("jboss.test:test=testClassNotFoundException");
try
{
@@ -162,69 +155,4 @@
ex instanceof ClassNotFoundException);
}
}
-
- /** Test the remoting of JMX Notifications
- * @throws Exception
- */
- public void testNotification() throws Exception
- {
- log.info("+++ testNotification");
- RMIListener listener = new RMIListener(10);
- listener.export();
- RMIAdaptor server = (RMIAdaptor) getInitialContext().lookup("jmx/invoker/RMIAdaptor");
- server.addNotificationListener(getObjectName(), listener, null, "runTimer");
- server.invoke(getObjectName(), "startTimer", null, null);
- synchronized( listener )
- {
- listener.wait(15000);
- }
- server.removeNotificationListener(getObjectName(), listener);
- listener.unexport();
- int count = listener.getCount();
- assertTrue("Received 10 notifications, count="+count, count == 10);
- }
-
- /** Test the remoting of JMX Notifications with a valid listener
- * and a bad listener that attempts to hang the service by sleeping
- * in the notification callback.
- *
- * @throws Exception
- */
- public void testNotificationWithBadListener() throws Exception
- {
- log.info("+++ testNotificationWithBadListener");
- RMIAdaptor server = (RMIAdaptor) getInitialContext().lookup("jmx/invoker/RMIAdaptor");
- // Add a bad listener
- RMIBadListener badListener = new RMIBadListener();
- badListener.export();
- server.addNotificationListener(getObjectName(), badListener, null, "BadListener");
- RMIListener listener = new RMIListener(10);
- listener.export();
- // Add a good listener
- server.addNotificationListener(getObjectName(), listener, null, "runTimer");
- server.invoke(getObjectName(), "startTimer", null, null);
- // Wait 25 seconds for the good listener events to complete
- synchronized( listener )
- {
- listener.wait(25000);
- }
- server.removeNotificationListener(getObjectName(), listener);
- listener.unexport();
- int count = listener.getCount();
- assertTrue("Received 10 notifications from Listener, count="+count,
- count == 10);
- count = badListener.getCount();
- assertTrue("Received >= 1 notifications from BadListener, count="+count,
- count >= 1);
- try
- {
- server.removeNotificationListener(getObjectName(), badListener);
- badListener.unexport();
- }
- catch(ListenerNotFoundException e)
- {
-
- log.debug("The BadListener was not found", e);
- }
- }
}
Modified: trunk/testsuite/src/main/org/jboss/test/jmx/test/RMIAdaptorUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jmx/test/RMIAdaptorUnitTestCase.java 2010-04-01 14:57:13 UTC (rev 103439)
+++ trunk/testsuite/src/main/org/jboss/test/jmx/test/RMIAdaptorUnitTestCase.java 2010-04-01 14:57:28 UTC (rev 103440)
@@ -25,9 +25,9 @@
import javax.management.MBeanInfo;
import javax.management.ObjectName;
+import javax.management.MBeanServerConnection;
import javax.naming.InitialContext;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
import org.jboss.test.JBossTestCase;
/**
@@ -56,12 +56,13 @@
initURLHandlers();
InitialContext ctx = getInitialContext();
- RMIAdaptor rmiAdaptor = (RMIAdaptor)ctx.lookup("jmx/invoker/RMIAdaptor");
+ MBeanServerConnection rmiAdaptor = (MBeanServerConnection)ctx.lookup("jmx/invoker/RMIAdaptor");
Iterator it = rmiAdaptor.queryNames(null, null).iterator();
-
+ getLog().debug("testMBeanInfoMarshalling: rmiAdaptor = " + rmiAdaptor);
while (it.hasNext())
{
ObjectName objectName = (ObjectName)it.next();
+ getLog().debug("testMBeanInfoMarshalling: about to getMBeanInfo for objectName = " + objectName);
try
{
MBeanInfo mbeanInfo = rmiAdaptor.getMBeanInfo(objectName);
More information about the jboss-cvs-commits
mailing list