[jboss-cvs] JBossAS SVN: r65882 - 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:07:54 -0400 (Fri, 05 Oct 2007)
New Revision: 65882

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

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/PoolingUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/PoolingUnitTestCase.java	2007-10-05 12:02:39 UTC (rev 65881)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/PoolingUnitTestCase.java	2007-10-05 12:07:54 UTC (rev 65882)
@@ -21,28 +21,31 @@
   */
 package org.jboss.test.jca.test;
 
+import javax.management.MBeanServer;
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
-import junit.framework.TestCase;
+import junit.framework.Test;
 
 import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.resource.connectionmanager.BaseConnectionManager2;
 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.NoTxConnectionManager;
-import org.jboss.resource.connectionmanager.PreFillPoolSupport;
-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.jca.support.PoolHelper;
 import org.jboss.test.jca.support.PoolHelper.PoolType;
+import org.jboss.test.util.ejb.EJBTestCase;
 import org.jboss.tm.TransactionManagerLocator;
 
 /**
@@ -52,15 +55,19 @@
  * @author <a href="mailto:weston.price at jboss.com">Weston Price</a>
  * @version $Revision$
  */
-public class PoolingUnitTestCase extends TestCase
+public class PoolingUnitTestCase extends EJBTestCase
 {
 
    Logger log = Logger.getLogger(getClass());
 
-   static CachedConnectionManager ccm = new CachedConnectionManager();
    static TransactionManager tm = TransactionManagerLocator.getInstance().locate();
    static TestConnectionRequestInfo cri1 = new TestConnectionRequestInfo("info1");
    static TestConnectionRequestInfo cri2 = new TestConnectionRequestInfo("info2");
+
+   public static Test suite() throws Exception
+   {
+      return JBossTestCase.getDeploySetup(PoolingUnitTestCase.class, "jca-tests.jar");
+   }
    
    public PoolingUnitTestCase (String name)
    {
@@ -99,25 +106,28 @@
       return poolingStrategy;
    }
    
-   private BaseConnectionManager2 getNoTxCM(ManagedConnectionPool poolingStrategy)
+   private BaseConnectionManager2 getNoTxCM(ManagedConnectionPool poolingStrategy) throws Exception
    {
-      TransactionSynchronizer.setTransactionManager(tm);
+      MBeanServer server = MBeanServerLocator.locateJBoss();
+      CachedConnectionManager ccm = (CachedConnectionManager) server.getAttribute(CachedConnectionManagerMBean.OBJECT_NAME, "Instance");
       BaseConnectionManager2 cm = new NoTxConnectionManager(ccm, poolingStrategy);
       poolingStrategy.setConnectionListenerFactory(cm);
       return cm;
    }
    
-   private BaseConnectionManager2 getTxCM(ManagedConnectionPool poolingStrategy)
+   private BaseConnectionManager2 getTxCM(ManagedConnectionPool poolingStrategy) throws Exception
    {
-      TransactionSynchronizer.setTransactionManager(tm);
+      MBeanServer server = MBeanServerLocator.locateJBoss();
+      CachedConnectionManager ccm = (CachedConnectionManager) server.getAttribute(CachedConnectionManagerMBean.OBJECT_NAME, "Instance");
       BaseConnectionManager2 cm = new TxConnectionManager(ccm, poolingStrategy, tm);
       poolingStrategy.setConnectionListenerFactory(cm);
       return cm;
    }
    
-   private BaseConnectionManager2 getTxTrackCM(ManagedConnectionPool poolingStrategy)
+   private BaseConnectionManager2 getTxTrackCM(ManagedConnectionPool poolingStrategy) throws Exception
    {
-      TransactionSynchronizer.setTransactionManager(tm);
+      MBeanServer server = MBeanServerLocator.locateJBoss();
+      CachedConnectionManager ccm = (CachedConnectionManager) server.getAttribute(CachedConnectionManagerMBean.OBJECT_NAME, "Instance");
       TxConnectionManager cm = new TxConnectionManager(ccm, poolingStrategy, tm);
       cm.setTrackConnectionByTx(true);
       poolingStrategy.setConnectionListenerFactory(cm);
@@ -272,9 +282,4 @@
       c2.close();
       assertEquals("Should get the same connection for different cri", mc1, mc2);
    }
-
- 
-  
-   
-   
 }