[jboss-cvs] JBossAS SVN: r81342 - trunk/testsuite/src/main/org/jboss/test/profileservice/override/test.

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

Author: scott.stark at jboss.org
Date: 2008-11-20 00:11:52 -0500 (Thu, 20 Nov 2008)
New Revision: 81342

Modified:
   trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java
   trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java
Log:
Cleanup failed tests better

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java	2008-11-20 04:58:53 UTC (rev 81341)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/AbstractProfileServiceTest.java	2008-11-20 05:11:52 UTC (rev 81342)
@@ -88,12 +88,22 @@
             stop(deployMgr, uploadedNames);
             throw e;
          }
+         catch(Error e)
+         {
+            stop(deployMgr, uploadedNames);
+            throw e;
+         }
       }
       catch(Exception e)
       {
          undeploy(deployMgr, uploadedNames);
          throw e;
       }
+      catch(Error e)
+      {
+         undeploy(deployMgr, uploadedNames);
+         throw e;
+      }
       return uploadedNames;
    }
    

Modified: trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java	2008-11-20 04:58:53 UTC (rev 81341)
+++ trunk/testsuite/src/main/org/jboss/test/profileservice/override/test/JmsDestinationOverrideTestCase.java	2008-11-20 05:11:52 UTC (rev 81342)
@@ -45,7 +45,7 @@
       super(name);
    }
    
-   public void testQueue() throws Exception
+   public void testQueue() throws Throwable
    {
       final String deploymentName = "profileservice-testQueue-service.xml";
       try
@@ -69,14 +69,15 @@
          mgtView.process();
 
       }
-      catch(Exception e)
+      catch(Throwable e)
       {
          getLog().error("Caugt exception: ", e);
+         undeployPackage(new String[] {deploymentName});
          throw e;
       }
    }
 
-   public void testTopic() throws Exception
+   public void testTopic() throws Throwable
    {
       final String deploymentName = "profileservice-testTopic-service.xml";
       try
@@ -100,7 +101,7 @@
          mgtView.process();
          
       }
-      catch(Exception e)
+      catch(Throwable e)
       {
          getLog().error("Caugt exception: ", e);
          undeployPackage(new String[] {deploymentName});