[jboss-cvs] JBossAS SVN: r101493 - projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test.

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

Author: alesj
Date: 2010-02-25 14:18:02 -0500 (Thu, 25 Feb 2010)
New Revision: 101493

Modified:
   projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java
Log:
"Fix" tests.

Modified: projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java	2010-02-25 18:47:48 UTC (rev 101492)
+++ projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java	2010-02-25 19:18:02 UTC (rev 101493)
@@ -22,7 +22,9 @@
 package org.jboss.test.classloading.dependency.test;
 
 import junit.framework.Test;
+import org.jboss.classloader.spi.ClassLoaderDomain;
 import org.jboss.classloader.spi.ClassLoaderSystem;
+import org.jboss.classloader.spi.ParentPolicy;
 import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
 import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
 import org.jboss.classloading.spi.metadata.ExportAll;
@@ -473,16 +475,30 @@
 
    public void testExplicitRequirementsInDefaultDomain() throws Exception
    {
-      testExplicitRequirementsInDomain(ClassLoaderSystem.DEFAULT_DOMAIN_NAME);
+      testExplicitRequirementsInDomain(ClassLoaderSystem.DEFAULT_DOMAIN_NAME, true);
    }
 
    public void testExplicitRequirementsInNewDomain() throws Exception
    {
-      // FIXME - testExplicitRequirementsInDomain("SomeNewDomain");
+      testExplicitRequirementsInDomain("SomeNewDomain", false);
    }
 
-   protected void testExplicitRequirementsInDomain(String domain) throws Exception
+   public void testExplicitRequirementsInNewDomainWithFilter() throws Exception
    {
+      String domainName = "SomeNewDomain";
+      ClassLoaderDomain domain = system.createAndRegisterDomain(domainName, ParentPolicy.BEFORE_BUT_JAVA_ONLY, system.getDefaultDomain());
+      try
+      {
+         testExplicitRequirementsInDomain(domainName, true);
+      }
+      finally
+      {
+         system.unregisterDomain(domain);
+      }
+   }
+
+   protected void testExplicitRequirementsInDomain(String domain, boolean fail) throws Exception
+   {
       ClassLoadingMetaDataFactory factory = ClassLoadingMetaDataFactory.getInstance();
       MockClassLoadingMetaData c = new MockClassLoadingMetaData("c");
       c.setPathsAndPackageNames(C.class);
@@ -528,7 +544,10 @@
                   assertLoadClassFail(B.class, clC);
                }
 
-               assertLoadClassFail(C.class.getName(), clB);
+               if (fail)
+                  assertLoadClassFail(C.class.getName(), clB);
+               else
+                  assertLoadClass(C.class.getName(), clB, clC);
             }
             finally
             {