From: Scott M S. <st...@us...> - 2003-09-28 17:02:37
|
User: starksm Date: 03/09/28 10:02:24 Modified: src/main/org/jboss/test/jmx/test DeployConnectionManagerUnitTestCase.java Log: Do not rely on there being a tcp based hsqldb service deployed. Revision Changes Path 1.12 +12 -12 jbosstest/src/main/org/jboss/test/jmx/test/DeployConnectionManagerUnitTestCase.java Index: DeployConnectionManagerUnitTestCase.java =================================================================== RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/jmx/test/DeployConnectionManagerUnitTestCase.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- DeployConnectionManagerUnitTestCase.java 27 Aug 2003 04:33:22 -0000 1.11 +++ DeployConnectionManagerUnitTestCase.java 28 Sep 2003 17:02:24 -0000 1.12 @@ -33,7 +33,7 @@ /** * @see <related> * @author <a href="mailto:d_j...@us...">David Jencks</a> - * @version $Revision: 1.11 $ + * @version $Revision: 1.12 $ */ public class DeployConnectionManagerUnitTestCase extends JBossTestCase @@ -105,14 +105,14 @@ } //check it isn't there already - assertTrue("test mbean already registered", !getServer().isRegistered(mcfName)); + assertTrue(mcfName+" is NOT registered", !getServer().isRegistered(mcfName)); //try to create the RARDeployment. - assertTrue("server did not return an objectInstance", - getServer().createMBean("org.jboss.resource.connectionmanager.RARDeployment", - mcfName) != null); + Object mbean = getServer().createMBean("org.jboss.resource.connectionmanager.RARDeployment", + mcfName); + assertTrue("server returned objectInstance", mbean != null); //check deployment registered RARDeployment - assertTrue("test mbean not registered", getServer().isRegistered(mcfName)); + assertTrue(mcfName+" is registered", getServer().isRegistered(mcfName)); ObjectName mcpName = new ObjectName("jboss.jca:service=LocalTxPool,name=TestDS"); @@ -123,14 +123,14 @@ } //check it isn't there already - assertTrue("test mbean already registered", !getServer().isRegistered(mcpName)); + assertTrue(mcpName+" is NOT registered", !getServer().isRegistered(mcpName)); //try to create the pool. - assertTrue("server did not return an objectInstance", - getServer().createMBean("org.jboss.resource.connectionmanager.JBossManagedConnectionPool", - mcpName) != null); + Object pool = getServer().createMBean("org.jboss.resource.connectionmanager.JBossManagedConnectionPool", + mcpName); + assertTrue("server returned objectInstance", pool!= null); //check deployment registered connection factory loader - assertTrue("test mbean not registered", getServer().isRegistered(mcpName)); + assertTrue(mcpName+" is registered", getServer().isRegistered(mcpName)); ObjectName serviceControllerName = new ObjectName("jboss.system:service=ServiceController"); //anon block so I don't rename var al @@ -184,7 +184,7 @@ assertTrue("State is not started", "Started".equals(getServer().getAttribute(mcfName, "StateString"))); //Now set the important attributes: invoke(mcfName, "setManagedConnectionFactoryAttribute", - new Object[] {"ConnectionURL", java.lang.String.class, "jdbc:hsqldb:hsql://localhost:1701"}, + new Object[] {"ConnectionURL", java.lang.String.class, "jdbc:hsqldb:."}, new String[] {"java.lang.String", "java.lang.Class", "java.lang.Object"}); invoke(mcfName, "setManagedConnectionFactoryAttribute", new Object[] {"DriverClass", java.lang.String.class, "org.hsqldb.jdbcDriver"}, |