[jboss-cvs] JBossAS SVN: r69261 - projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test.

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

Author: scott.stark at jboss.org
Date: 2008-01-23 19:38:47 -0500 (Wed, 23 Jan 2008)
New Revision: 69261

Modified:
   projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/FilteredExportUnitTestCase.java
Log:
Update the class loader domain to use a BEFORE_BUT_JAVA_ONLY parent policy

Modified: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/FilteredExportUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/FilteredExportUnitTestCase.java	2008-01-24 00:18:53 UTC (rev 69260)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/FilteredExportUnitTestCase.java	2008-01-24 00:38:47 UTC (rev 69261)
@@ -24,9 +24,6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -36,7 +33,9 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jboss.classloader.plugins.system.DefaultClassLoaderSystem;
+import org.jboss.classloader.spi.ClassLoaderDomain;
 import org.jboss.classloader.spi.ClassLoaderSystem;
+import org.jboss.classloader.spi.ParentPolicy;
 import org.jboss.deployers.structure.spi.classloading.ExportAll;
 import org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderPolicy;
 import org.jboss.test.BaseTestCase;
@@ -52,13 +51,27 @@
  */
 public class FilteredExportUnitTestCase extends BaseTestCase
 {
-   ClassLoaderSystem system = new DefaultClassLoaderSystem();
-   
+   ClassLoaderSystem system;
+
    public FilteredExportUnitTestCase(String name)
    {
       super(name);
    }
 
+   protected void setUp()
+      throws Exception
+   {
+      super.setUp();
+      system = new DefaultClassLoaderSystem();
+      ClassLoaderDomain domain = system.getDefaultDomain();
+      domain.setParentPolicy(ParentPolicy.BEFORE_BUT_JAVA_ONLY);
+   }
+   protected void tearDown()
+      throws Exception
+   {
+      system.shutdown();
+      super.tearDown();
+   }
    protected ClassLoader buildClassLoader(ExportAll exportAll, Map<String, String> expected, VirtualFile[] files, String[] exportPkgs)
       throws Exception
    {
@@ -187,11 +200,9 @@
          log.info(url);
          count ++;
       }
-      /* TODO: this is now picking up parent classpath file:resources
       assertEquals("Saw 2 users.properties", 2, count);
       assertTrue("sawEarUsersProperties", sawEarUsersProperties);
       assertTrue("sawEjbUsersProperties", sawEjbUsersProperties);
-      */
 
       // war1.war
       Map<String,String> expectedWeb1 = makeSimpleMap("testear1.ear",
@@ -277,10 +288,8 @@
          log.info(url);
          count ++;
       }
-      /* TODO: this is now picking up parent classpath file:resources
       assertEquals("Saw 2 users.properties", 2, count);
       assertTrue("sawEarUsersProperties", sawEarUsersProperties);
       assertTrue("sawEjbUsersProperties", sawEjbUsersProperties);
-      */
    }
 }