[jboss-cvs] JBossAS SVN: r69260 - 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:18:53 -0500 (Wed, 23 Jan 2008)
New Revision: 69260

Modified:
   projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/FilteredExportUnitTestCase.java
Log:
Update the package exclusion tests

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:11:54 UTC (rev 69259)
+++ 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)
@@ -78,7 +78,9 @@
       policy.setImportAll(true);
       String[] packageNames = policy.getPackageNames();
       Set<String> actual = makeSet(packageNames);
-      assertEquals(expected.keySet(), actual);
+      log.info(policy+" : packages: "+actual);
+      if(expected != null)
+         assertEquals(expected.keySet(), actual);
       
       ClassLoader classLoader = system.registerClassLoaderPolicy(policy);
       return classLoader;
@@ -207,8 +209,24 @@
       ClassLoader war1LoaderAll = buildClassLoader(ExportAll.NON_EMPTY, expectedWeb1, war1Files, null, excludedPkgs);
       URL jdkClassURL = war1Loader.getResource("java/lang/JdkClass.class");
       assertNull(jdkClassURL);
+      // Test that the java.* package was excluded
+      try
+      {
+         Class<?> jdkClass = war1LoaderAll.loadClass("java.lang.JdkClass");
+         fail("Was able to load java.lang.JdkClass: "+jdkClass.getProtectionDomain());
+      }
+      catch(ClassNotFoundException e)
+      {
+         log.debug("CNFE for java.lang.JdkClass");
+      }
       jdkClassURL = war1LoaderAll.getResource("java/lang/JdkClass.class");
-      assertNotNull(jdkClassURL);
+      assertNull(jdkClassURL);
+      system.unregisterClassLoader(war1LoaderAll);
+      // Should be able to load java/lang/JdkClass.class as resource if java is not excluded
+      war1LoaderAll = buildClassLoader(ExportAll.NON_EMPTY, null, war1Files, null);
+      jdkClassURL = war1LoaderAll.getResource("java/lang/JdkClass.class");
+      assertNull(jdkClassURL);
+      
    }
 
    /**