[jboss-cvs] JBossAS SVN: r101490 - in projects/jboss-cl/trunk: classloading/src/test/java/org/jboss/test/classloading/dependency/test and 1 other directory.

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

Author: alesj
Date: 2010-02-25 13:02:23 -0500 (Thu, 25 Feb 2010)
New Revision: 101490

Modified:
   projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java
   projects/jboss-cl/trunk/pom.xml
Log:
Add requirements + domain tests.
Use stable Kernel 2.2.0 release.

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 17:45:59 UTC (rev 101489)
+++ projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java	2010-02-25 18:02:23 UTC (rev 101490)
@@ -23,16 +23,22 @@
 
 import junit.framework.Test;
 
+import org.jboss.classloader.spi.ClassLoaderDomain;
+import org.jboss.classloader.spi.ClassLoaderSystem;
+import org.jboss.classloading.spi.ClassLoadingDomain;
 import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
 import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
+import org.jboss.classloading.spi.metadata.ExportAll;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.test.classloading.dependency.support.a.A;
 import org.jboss.test.classloading.dependency.support.b.B;
+import org.jboss.test.classloading.dependency.support.c.C;
 
 /**
  * HierarchicalDomainUnitTestCase.
  * 
  * @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 class HierarchicalDomainUnitTestCase extends AbstractMockClassLoaderUnitTest
@@ -467,4 +473,80 @@
       }
       assertNoClassLoader(contextB);
    }
+
+   public void testExplicitRequirementsInDefaultDomain() throws Exception
+   {
+      testExplicitRequirementsInDomain(ClassLoaderSystem.DEFAULT_DOMAIN_NAME);
+   }
+
+   public void testExplicitRequirementsInNewDomain() throws Exception
+   {
+      // FIXME - testExplicitRequirementsInDomain("SomeNewDomain");
+   }
+
+   protected void testExplicitRequirementsInDomain(String domain) throws Exception
+   {
+      ClassLoadingMetaDataFactory factory = ClassLoadingMetaDataFactory.getInstance();
+      MockClassLoadingMetaData c = new MockClassLoadingMetaData("c");
+      c.setPathsAndPackageNames(C.class);
+      c.setImportAll(true);
+      c.setExportAll(ExportAll.NON_EMPTY);
+      KernelControllerContext contextC = install(c);
+      try
+      {
+         MockClassLoadingMetaData b = new MockClassLoadingMetaData("b");
+         b.setDomain(domain);
+         b.setPathsAndPackageNames(B.class);
+         b.getRequirements().addRequirement(factory.createRequirePackage(A.class.getPackage().getName()));
+         KernelControllerContext contextB = install(b);
+         try
+         {
+            assertNoClassLoader(contextB);
+
+            MockClassLoadingMetaData a = new MockClassLoadingMetaData("a");
+            a.setDomain(domain);
+            a.setPathsAndPackageNames(A.class);
+            a.getCapabilities().addCapability(factory.createPackage(A.class.getPackage().getName()));
+            KernelControllerContext contextA = install(a);
+            try
+            {
+               ClassLoader clA = assertClassLoader(contextA);
+               assertLoadClass(A.class, clA);
+               assertLoadClassFail(B.class, clA);
+
+               ClassLoader clB = assertClassLoader(contextB);
+               assertLoadClass(A.class, clA);
+               assertLoadClass(B.class, clB);
+
+               ClassLoader clC = assertClassLoader(contextC);
+               assertLoadClass(C.class, clC);               
+               if (ClassLoaderSystem.DEFAULT_DOMAIN_NAME.equals(domain))
+               {
+                  assertLoadClass(A.class, clC, clA);
+                  assertLoadClass(B.class, clC, clB);
+               }
+               else
+               {
+                  assertLoadClassFail(A.class, clC);
+                  assertLoadClassFail(B.class, clC);
+               }
+
+               assertLoadClassFail(C.class.getName(), clB);
+            }
+            finally
+            {
+               uninstall(contextA);
+            }
+         }
+         finally
+         {
+            uninstall(contextB);
+         }
+         assertNoClassLoader(contextB);
+      }
+      finally
+      {
+         uninstall(contextC);
+      }
+   }
 }

Modified: projects/jboss-cl/trunk/pom.xml
===================================================================
--- projects/jboss-cl/trunk/pom.xml	2010-02-25 17:45:59 UTC (rev 101489)
+++ projects/jboss-cl/trunk/pom.xml	2010-02-25 18:02:23 UTC (rev 101490)
@@ -33,7 +33,7 @@
     <version.jboss.vfs>3.0.0.CR1</version.jboss.vfs>
     <version.jboss.man>2.1.1.SP1</version.jboss.man>
     <version.jboss.mdr>2.2.0.Alpha1</version.jboss.mdr>
-    <version.jboss.kernel>2.2.0.Alpha3</version.jboss.kernel>
+    <version.jboss.kernel>2.2.0.Alpha6</version.jboss.kernel>
     <version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
     <version.jboss.logging.spi>2.2.0.CR1</version.jboss.logging.spi>
     <version.jboss.classloading.spi>6.0.0-Alpha8</version.jboss.classloading.spi>