[jboss-cvs] JBossAS SVN: r104301 - in trunk/testsuite/src/main/org/jboss/test: messagedriven/support and 1 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2010-04-28 18:03:52 -0400 (Wed, 28 Apr 2010)
New Revision: 104301

Modified:
   trunk/testsuite/src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java
   trunk/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
   trunk/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java
Log:
Removing possible race on deleting destinations on tests

Modified: trunk/testsuite/src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java	2010-04-28 20:57:23 UTC (rev 104300)
+++ trunk/testsuite/src/main/org/jboss/test/jacc/test/EJBSpecUnitTestCase.java	2010-04-28 22:03:52 UTC (rev 104301)
@@ -95,7 +95,7 @@
          protected void setUp() throws Exception
          {
             super.setUp();
-            JMSDestinationsUtil.destroyEveryDestination();
+            JMSDestinationsUtil.destroyDestinations();
             Configuration.setConfiguration(XMLLoginConfigImpl.getInstance());
             redeploy("security-spec.jar");
             flushAuthCache();
@@ -103,7 +103,7 @@
          protected void tearDown() throws Exception
          {
             undeploy("security-spec.jar");
-            JMSDestinationsUtil.destroyEveryDestination();
+            JMSDestinationsUtil.destroyDestinations();
             super.tearDown();
          
          }

Modified: trunk/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java	2010-04-28 20:57:23 UTC (rev 104300)
+++ trunk/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java	2010-04-28 22:03:52 UTC (rev 104301)
@@ -260,7 +260,7 @@
    
    protected void deployDestinations() throws Exception
    {
-	  JMSDestinationsUtil.destroyEveryDestination();
+	   JMSDestinationsUtil.destroyDestinations();
       JMSDestinationsUtil.setupBasicDestinations();
    }
    
@@ -374,7 +374,7 @@
       
       try
       {
-         JMSDestinationsUtil.destroyEveryDestination();
+         JMSDestinationsUtil.destroyDestinations();
       }
       catch (Throwable t)
       {

Modified: trunk/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java	2010-04-28 20:57:23 UTC (rev 104300)
+++ trunk/testsuite/src/main/org/jboss/test/util/jms/JMSDestinationsUtil.java	2010-04-28 22:03:52 UTC (rev 104301)
@@ -67,13 +67,6 @@
       JMSTestAdmin.getAdmin().destroyCreatedDestinations();
    }
    
-   public static void destroyEveryDestination() throws Exception
-   {
-      destroyDestinations();
-      JMSTestAdmin.getAdmin().destroyEveryDestination();
-   }
-   
-   
    public static void purgeQueue(String jndi) throws Exception
    {
       InitialContext ctx = new InitialContext();