[jboss-cvs] JBossAS SVN: r105762 - in branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test: jca/test and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2010-06-07 11:06:08 -0400 (Mon, 07 Jun 2010)
New Revision: 105762

Modified:
   branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java
   branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jca/test/TransactionActiveUnitTestCase.java
Log:
testsuite fixes

Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java	2010-06-07 14:59:20 UTC (rev 105761)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java	2010-06-07 15:06:08 UTC (rev 105762)
@@ -27,6 +27,7 @@
 import junit.framework.TestSuite;
 import junit.extensions.TestSetup;
 import org.jboss.test.JBossTestSetup;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
 import org.jboss.security.auth.login.XMLLoginConfigImpl;
 
 /** Test of EJB spec conformace using the security-spec.jar
@@ -95,12 +96,18 @@
          {
             super.setUp();
             Configuration.setConfiguration(XMLLoginConfigImpl.getInstance());
+            JMSDestinationsUtil.setupBasicDestinations();
+            JMSDestinationsUtil.deployQueue("QueueA");
+            JMSDestinationsUtil.deployQueue("QueueB");
+            JMSDestinationsUtil.deployQueue("QueueC");
+            JMSDestinationsUtil.deployQueue("QueueD");
             redeploy("security-spec.jar");
             flushAuthCache();
          }
          protected void tearDown() throws Exception
          {
             undeploy("security-spec.jar");
+            JMSDestinationsUtil.destroyDestinations();
             super.tearDown();
          
          }

Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jca/test/TransactionActiveUnitTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jca/test/TransactionActiveUnitTestCase.java	2010-06-07 14:59:20 UTC (rev 105761)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/jca/test/TransactionActiveUnitTestCase.java	2010-06-07 15:06:08 UTC (rev 105762)
@@ -21,11 +21,15 @@
  */
 package org.jboss.test.jca.test;
 
+import junit.extensions.TestSetup;
 import junit.framework.Test;
+import junit.framework.TestSuite;
 
 import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestSetup;
 import org.jboss.test.jca.interfaces.TransactionActiveHome;
 import org.jboss.test.jca.interfaces.TransactionActiveRemote;
+import org.jboss.test.util.jms.JMSDestinationsUtil;
 
 /**
  * TransactionActiveUnitTestCase.
@@ -42,7 +46,23 @@
 
    public static Test suite() throws Exception
    {
-      return getDeploySetup(TransactionActiveUnitTestCase.class, "jca-txactive-ejb.jar");
+      TestSetup wrapper = new JBossTestSetup(new TestSuite(TransactionActiveUnitTestCase.class))
+      {
+         protected void setUp() throws Exception
+         {
+            super.setUp();
+            JMSDestinationsUtil.setupBasicDestinations();
+            redeploy("jca-txactive-ejb.jar");
+         }
+         protected void tearDown() throws Exception
+         {
+            undeploy("jca-txactive-ejb.jar");
+            JMSDestinationsUtil.destroyDestinations();
+            super.tearDown();
+         
+         }
+      };
+      return wrapper;
    }
 
    public void testJDBCTransactionActive() throws Exception