[jboss-cvs] JBossAS SVN: r106081 - 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-06-16 05:59:49 -0400 (Wed, 16 Jun 2010)
New Revision: 106081

Modified:
   projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java
   projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/DynamicPackageUnitTestCase.java
Log:
Add embedded over dynamic test.


Modified: projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java	2010-06-16 09:44:40 UTC (rev 106080)
+++ projects/jboss-cl/trunk/classloading/src/main/java/org/jboss/classloading/spi/dependency/RequirementDependencyItem.java	2010-06-16 09:59:49 UTC (rev 106081)
@@ -129,7 +129,7 @@
       resolvedModule = module;
 
       // Self dependency
-      if (module == this.module)
+      if (module == getModule())
       {
          ControllerContext context = module.getControllerContext();
          setIDependOn(context.getName());

Modified: projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/DynamicPackageUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/DynamicPackageUnitTestCase.java	2010-06-16 09:44:40 UTC (rev 106080)
+++ projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/DynamicPackageUnitTestCase.java	2010-06-16 09:59:49 UTC (rev 106081)
@@ -199,4 +199,39 @@
       }
       assertNoClassLoader(contextB);
    }
+
+   public void testDynamicAfterEmbedded() throws Exception
+   {
+      ClassLoadingMetaDataFactory factory = ClassLoadingMetaDataFactory.getInstance();
+
+      MockClassLoadingMetaData b = new MockClassLoadingMetaData("b");
+      b.getCapabilities().addCapability(factory.createPackage(A.class.getPackage().getName()));
+      b.getCapabilities().addCapability(factory.createPackage(B.class.getPackage().getName()));
+      b.setPathsAndPackageNames(A.class, B.class);
+      KernelControllerContext contextB = install(b);
+      try
+      {
+         assertClassLoader(contextB); // force CL install
+
+         MockClassLoadingMetaData a = new MockClassLoadingMetaData("a");
+         a.getRequirements().addRequirement(factory.createWildcardPackage(A.class.getPackage().getName()));
+         a.setPaths(A.class); // embedded
+         KernelControllerContext contextA = install(a);
+         try
+         {
+            ClassLoader clA = assertClassLoader(contextA);
+            assertLoadClass(A.class, clA, clA); // should resolve to itself, as we have an embedded A class
+         }
+         finally
+         {
+            uninstall(contextA);
+         }
+         assertNoClassLoader(contextA);
+      }
+      finally
+      {
+         uninstall(contextB);
+      }
+      assertNoClassLoader(contextB);
+   }
 }