[jboss-cvs] JBossAS SVN: r65883 - 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:19:46 -0400 (Fri, 05 Oct 2007)
New Revision: 65883

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

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/PreFillPoolingUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/PreFillPoolingUnitTestCase.java	2007-10-05 12:07:54 UTC (rev 65882)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/PreFillPoolingUnitTestCase.java	2007-10-05 12:19:46 UTC (rev 65883)
@@ -4,6 +4,7 @@
 import java.sql.Connection;
 
 import javax.management.Attribute;
+import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
 import javax.resource.spi.ManagedConnectionFactory;
@@ -13,18 +14,20 @@
 import junit.framework.Test;
 
 import org.jboss.logging.Logger;
+import org.jboss.mx.util.MBeanServerLocator;
 import org.jboss.mx.util.ObjectNameFactory;
 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.test.JBossTestCase;
 import org.jboss.test.jca.adapter.TestConnectionRequestInfo;
 import org.jboss.test.jca.adapter.TestManagedConnectionFactory;
+import org.jboss.test.util.ejb.EJBTestCase;
 import org.jboss.tm.TransactionManagerLocator;
 
 /**
@@ -33,7 +36,7 @@
  * @author <a href="weston.price at jboss.com">Weston Price</a>
  * @version $Revision$
  */
-public class PreFillPoolingUnitTestCase extends JBossTestCase
+public class PreFillPoolingUnitTestCase extends EJBTestCase
 {
    Logger log = Logger.getLogger(PreFillPoolingUnitTestCase.class);
   
@@ -49,7 +52,6 @@
    private static final String PREFILL = "PreFill";
    
    //For non managed prefill testing.
-   static CachedConnectionManager ccm = new CachedConnectionManager();
    static TransactionManager tm = TransactionManagerLocator.getInstance().locate();
    static TestConnectionRequestInfo cri1 = new TestConnectionRequestInfo("info1");
    static TestConnectionRequestInfo cri2 = new TestConnectionRequestInfo("info2");
@@ -59,6 +61,11 @@
       super(name);
    }
 
+   protected MBeanServer getServer()
+   {
+      return MBeanServerLocator.locateJBoss();
+   }
+   
    /**
     * Test basic prefill support on a OnePool.
     * 
@@ -192,7 +199,7 @@
       
       assertTrue(count.intValue() != min.intValue());
       
-      InitialContext ctx = super.getInitialContext();
+      InitialContext ctx = new InitialContext();
       DataSource ds = (DataSource)ctx.lookup("CriPreFillDS");
       Connection conn = ds.getConnection("sa", "");
       
@@ -294,9 +301,9 @@
       
    }
 
-   private BaseConnectionManager2 getNoTxCM(ManagedConnectionPool poolingStrategy)
+   private BaseConnectionManager2 getNoTxCM(ManagedConnectionPool poolingStrategy) throws Exception
    {
-      TransactionSynchronizer.setTransactionManager(tm);
+      CachedConnectionManager ccm = (CachedConnectionManager) getServer().getAttribute(CachedConnectionManagerMBean.OBJECT_NAME, "Instance");
       BaseConnectionManager2 cm = new NoTxConnectionManager(ccm, poolingStrategy);
       poolingStrategy.setConnectionListenerFactory(cm);
       return cm;
@@ -306,23 +313,23 @@
    {
       ClassLoader loader = Thread.currentThread().getContextClassLoader();
       URL resURL = loader.getResource("jca/prefill/prefill-ds.xml");
-      Test t1 = getDeploySetup(PreFillPoolingUnitTestCase.class, resURL.toString());
+      Test t1 = JBossTestCase.getDeploySetup(PreFillPoolingUnitTestCase.class, resURL.toString());
       
       resURL = loader.getResource("jca/prefill/no-prefill-ds.xml");
       
-      Test t2 = getDeploySetup(t1, resURL.toString());
+      Test t2 = JBossTestCase.getDeploySetup(t1, resURL.toString());
       resURL = loader.getResource("jca/prefill/no-element-prefill-ds.xml");
       
-      Test t3 = getDeploySetup(t2, resURL.toString());
+      Test t3 = JBossTestCase.getDeploySetup(t2, resURL.toString());
       
       resURL = loader.getResource("jca/prefill/cri-prefill-ds.xml");
       
-      Test t4 = getDeploySetup(t3, resURL.toString());
+      Test t4 = JBossTestCase.getDeploySetup(t3, resURL.toString());
       resURL = loader.getResource("jca/prefill/invalid-prefill-ds.xml");
       
-      return getDeploySetup(t4, resURL.toString());
+      Test t5 = JBossTestCase.getDeploySetup(t4, resURL.toString());
       
-      
+      return JBossTestCase.getDeploySetup(t5, "jca-tests.jar");
    }