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

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

Author: adrian at jboss.org
Date: 2007-10-05 07:56:37 -0400 (Fri, 05 Oct 2007)
New Revision: 65880

Modified:
   trunk/testsuite/src/main/org/jboss/test/jca/test/XATxConnectionManagerUnitTestCase.java
Log:
[JBAS-4520] - Move the XATxConnectionManager test to the server

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/XATxConnectionManagerUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/XATxConnectionManagerUnitTestCase.java	2007-10-05 11:46:40 UTC (rev 65879)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/XATxConnectionManagerUnitTestCase.java	2007-10-05 11:56:37 UTC (rev 65880)
@@ -25,16 +25,21 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.management.MBeanServer;
+import javax.naming.InitialContext;
 import javax.resource.spi.ConnectionRequestInfo;
 import javax.transaction.RollbackException;
 import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
 import javax.transaction.xa.XAException;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.resource.connectionmanager.CachedConnectionManager;
+import org.jboss.resource.connectionmanager.CachedConnectionManagerMBean;
 import org.jboss.resource.connectionmanager.InternalManagedConnectionPool;
 import org.jboss.resource.connectionmanager.JBossManagedConnectionPool;
 import org.jboss.resource.connectionmanager.ManagedConnectionPool;
@@ -45,6 +50,7 @@
 import org.jboss.test.jca.adapter.TestConnectionRequestInfo;
 import org.jboss.test.jca.adapter.TestManagedConnection;
 import org.jboss.test.jca.adapter.TestManagedConnectionFactory;
+import org.jboss.test.util.ejb.EJBTestCase;
 import org.jboss.tm.TransactionManagerLocator;
 import org.jboss.tm.TxUtils;
 import org.jboss.tm.usertx.client.ServerVMClientUserTransaction;
@@ -58,13 +64,13 @@
  * @author <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
  * @version $Revision$
  */
-public class XATxConnectionManagerUnitTestCase extends JBossTestCase
+public class XATxConnectionManagerUnitTestCase extends EJBTestCase
 {
    Logger poolLog = Logger.getLogger(JBossManagedConnectionPool.class);
    Logger log = Logger.getLogger(getClass());
 
    private TransactionManager tm;
-   private ServerVMClientUserTransaction ut;
+   private UserTransaction ut;
    private CachedConnectionManager ccm;
    private TestManagedConnectionFactory mcf;
    private TxConnectionManager cm;
@@ -86,7 +92,7 @@
       suite.addTest(new XATxConnectionManagerUnitTestCase("testFailedStartTx"));
       suite.addTest(new XATxConnectionManagerUnitTestCase("testFailedEndTx"));
 
-      return suite;
+      return JBossTestCase.getDeploySetup(suite, "jca-tests.jar");
    }
    
    public XATxConnectionManagerUnitTestCase (String name)
@@ -99,10 +105,10 @@
       super.setUp();
       log.debug("================> Start " + getName());
       tm = TransactionManagerLocator.getInstance().locate();
-      TransactionSynchronizer.setTransactionManager(tm);
-      ut = new ServerVMClientUserTransaction(tm);
-      ccm = new CachedConnectionManager();
-      ut.registerTxStartedListener(ccm);
+      InitialContext ctx = new InitialContext();
+      ut = (UserTransaction) ctx.lookup("java:comp/UserTransaction");
+      MBeanServer server = MBeanServerLocator.locateJBoss();
+      ccm = (CachedConnectionManager) server.getAttribute(CachedConnectionManagerMBean.OBJECT_NAME, "Instance");
 
       mcf = new TestManagedConnectionFactory();
       InternalManagedConnectionPool.PoolParams pp = new InternalManagedConnectionPool.PoolParams();
@@ -128,7 +134,7 @@
 
    public void testGetConnection() throws Exception
    {
-      getLog().info("testGetConnection");
+      log.info("testGetConnection");
       TestConnection c = (TestConnection)cm.allocateConnection(mcf, cri);
       assertTrue("Connection is null", c != null);
       c.close();
@@ -136,7 +142,7 @@
 
    public void testEnlistInExistingTx() throws Exception
    {
-      getLog().info("testEnlistInExistingTx");
+      log.info("testEnlistInExistingTx");
       ut.begin();
       TestConnection c = null;
       try
@@ -164,7 +170,7 @@
 
    public void testEnlistCheckedOutConnectionInNewTx() throws Exception
    {
-      getLog().info("testEnlistCheckedOutConnectionInNewTx");
+      log.info("testEnlistCheckedOutConnectionInNewTx");
       Object key = this;
       Set unshared = new HashSet();
       ccm.pushMetaAwareObject(key, unshared);
@@ -207,7 +213,7 @@
     */
    public void testReconnectConnectionHandlesOnNotification() throws Exception
    {
-      getLog().info("testReconnectConnectionHandlesOnNotification");
+      log.info("testReconnectConnectionHandlesOnNotification");
       ccm.setSpecCompliant(true);
       Object key1 = new Object();
       Object key2 = new Object();
@@ -307,7 +313,7 @@
 
   public void testBrokenConnectionAndTrackByTx() throws Exception
   {
-     getLog().info("testBrokenConnectionAndTrackByTx");
+     log.info("testBrokenConnectionAndTrackByTx");
      cm.setTrackConnectionByTx(true);
      ut.begin();
      TestConnection c = (TestConnection)cm.allocateConnection(mcf, cri);