[jboss-cvs] JBossAS SVN: r104152 - in projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers: vfs/reflect/support and 1 other directory.

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

Author: alesj
Date: 2010-04-22 09:47:01 -0400 (Thu, 22 Apr 2010)
New Revision: 104152

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTest.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/support/ClassPoolTestDelegate.java
Log:
Tidy up on tear down.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTest.java	2010-04-22 13:38:03 UTC (rev 104151)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/BootstrapDeployersTest.java	2010-04-22 13:47:01 UTC (rev 104152)
@@ -21,6 +21,8 @@
 */
 package org.jboss.test.deployers;
 
+import java.io.Closeable;
+import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.security.CodeSource;
@@ -28,10 +30,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.io.Closeable;
-import java.io.IOException;
 
-import junit.framework.AssertionFailedError;
 import org.jboss.classloader.plugins.ClassLoaderUtils;
 import org.jboss.classloader.plugins.jdk.AbstractJDKChecker;
 import org.jboss.dependency.spi.ControllerContext;
@@ -49,10 +48,13 @@
 import org.jboss.vfs.VirtualFile;
 import org.jboss.vfs.VirtualFileAssembly;
 
+import junit.framework.AssertionFailedError;
+
 /**
  * BootstrapDeployersTest.
  * 
  * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
  * @version $Revision: 1.1 $
  */
 public abstract class BootstrapDeployersTest extends MicrocontainerTest
@@ -349,9 +351,16 @@
    
    protected void tearDown() throws Exception 
    {
-      for (Closeable handle : assemblyHandles.values())
+      try
       {
-         handle.close();
+         for (Closeable handle : assemblyHandles.values())
+         {
+            handle.close();
+         }
       }
+      finally
+      {
+         super.tearDown();
+      }
    }
 }

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/support/ClassPoolTestDelegate.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/support/ClassPoolTestDelegate.java	2010-04-22 13:38:03 UTC (rev 104151)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/support/ClassPoolTestDelegate.java	2010-04-22 13:47:01 UTC (rev 104152)
@@ -24,6 +24,7 @@
 import org.jboss.classloader.spi.filter.ClassFilter;
 import org.jboss.classpool.base.IsLocalResourcePluginFactoryRegistry;
 import org.jboss.classpool.spi.AbstractClassPoolFactory;
+import org.jboss.classpool.spi.SystemClassPool;
 import org.jboss.test.deployers.BootstrapDeployersTestDelegate;
 import org.jboss.util.loading.Translatable;
 
@@ -58,4 +59,11 @@
       super.deploy();
       AbstractClassPoolFactory.setSystemClassPool(defaultClassPool);
    }
+
+   @Override
+   protected void undeploy()
+   {
+      AbstractClassPoolFactory.setSystemClassPool(SystemClassPool.getInstance());
+      super.undeploy();      
+   }
 }
\ No newline at end of file