[jboss-cvs] JBossAS SVN: r65881 - 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 08:02:39 -0400 (Fri, 05 Oct 2007)
New Revision: 65881

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

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/LocalTransactionTidyupUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/LocalTransactionTidyupUnitTestCase.java	2007-10-05 11:56:37 UTC (rev 65880)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/LocalTransactionTidyupUnitTestCase.java	2007-10-05 12:02:39 UTC (rev 65881)
@@ -21,23 +21,29 @@
 */
 package org.jboss.test.jca.test;
 
+import javax.management.MBeanServer;
+import javax.naming.InitialContext;
 import javax.resource.spi.ConnectionRequestInfo;
 import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
 
+import junit.framework.Test;
+
 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;
-import org.jboss.resource.connectionmanager.TransactionSynchronizer;
 import org.jboss.resource.connectionmanager.TxConnectionManager;
 import org.jboss.test.JBossTestCase;
 import org.jboss.test.jca.adapter.TestConnection;
 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.usertx.client.ServerVMClientUserTransaction;
 
 /**
  * A LocalTransactionTidyupUnitTestCase.
@@ -45,13 +51,13 @@
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
  * @version $Revision$
  */
-public class LocalTransactionTidyupUnitTestCase extends JBossTestCase
+public class LocalTransactionTidyupUnitTestCase 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;
@@ -59,6 +65,11 @@
 
    private int poolSize = 5;
 
+   public static Test suite() throws Exception
+   {
+      return JBossTestCase.getDeploySetup(LocalTransactionTidyupUnitTestCase.class, "jca-tests.jar");
+   }
+
    public LocalTransactionTidyupUnitTestCase (String name)
    {
       super(name);
@@ -69,10 +80,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();