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

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

Author: smcgowan at redhat.com
Date: 2007-11-26 16:33:07 -0500 (Mon, 26 Nov 2007)
New Revision: 67458

Modified:
   trunk/testsuite/src/main/org/jboss/test/jca/test/AbstractPoolingStressTest.java
   trunk/testsuite/src/main/org/jboss/test/jca/test/LocalTransactionTidyupUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/jca/test/PoolingUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/jca/test/PreFillPoolingUnitTestCase.java
Log:
JBAS-4993

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/AbstractPoolingStressTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/AbstractPoolingStressTest.java	2007-11-26 21:32:25 UTC (rev 67457)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/AbstractPoolingStressTest.java	2007-11-26 21:33:07 UTC (rev 67458)
@@ -60,6 +60,7 @@
    private ConnectionRequestInfo cri;
    protected ConnectionFactory cf;
 
+   @Override
    protected void setUp() throws Exception
    {
       log.debug("================> Start " + getName());

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/LocalTransactionTidyupUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/LocalTransactionTidyupUnitTestCase.java	2007-11-26 21:32:25 UTC (rev 67457)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/LocalTransactionTidyupUnitTestCase.java	2007-11-26 21:33:07 UTC (rev 67458)
@@ -75,9 +75,9 @@
       super(name);
    }
 
+   @Override
    protected void setUp() throws Exception
    {
-      super.setUp();
       log.debug("================> Start " + getName());
       tm = TransactionManagerLocator.getInstance().locate();
       InitialContext ctx = new InitialContext();

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/PoolingUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/PoolingUnitTestCase.java	2007-11-26 21:32:25 UTC (rev 67457)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/PoolingUnitTestCase.java	2007-11-26 21:33:07 UTC (rev 67458)
@@ -60,7 +60,7 @@
 
    Logger log = Logger.getLogger(getClass());
 
-   static TransactionManager tm = TransactionManagerLocator.getInstance().locate();
+   protected static TransactionManager tm;
    static TestConnectionRequestInfo cri1 = new TestConnectionRequestInfo("info1");
    static TestConnectionRequestInfo cri2 = new TestConnectionRequestInfo("info2");
 
@@ -74,6 +74,12 @@
       super(name);
    }
 
+   @Override
+   public void setUp()
+   {
+      tm = TransactionManagerLocator.getInstance().locate();
+   }
+
    private ManagedConnectionPool getPool(PoolType type, boolean noTxnSeperatePools, ManagedConnectionFactory mcf, InternalManagedConnectionPool.PoolParams pp){
       
       return PoolHelper.getManagedConnectionPool(type, mcf, noTxnSeperatePools, pp, log);

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/PreFillPoolingUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/PreFillPoolingUnitTestCase.java	2007-11-26 21:32:25 UTC (rev 67457)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/PreFillPoolingUnitTestCase.java	2007-11-26 21:33:07 UTC (rev 67458)
@@ -52,7 +52,7 @@
    private static final String PREFILL = "PreFill";
    
    //For non managed prefill testing.
-   static TransactionManager tm = TransactionManagerLocator.getInstance().locate();
+   static TransactionManager tm;
    static TestConnectionRequestInfo cri1 = new TestConnectionRequestInfo("info1");
    static TestConnectionRequestInfo cri2 = new TestConnectionRequestInfo("info2");
 
@@ -61,6 +61,12 @@
       super(name);
    }
 
+   @Override
+   public void setUp()
+   {
+      tm = TransactionManagerLocator.getInstance().locate();
+   }
+
    protected MBeanServer getServer()
    {
       return MBeanServerLocator.locateJBoss();