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

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

Author: adrian at jboss.org
Date: 2010-03-30 07:49:11 -0400 (Tue, 30 Mar 2010)
New Revision: 103249

Modified:
   projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/DynamicPackageUnitTestCase.java
Log:
Add an extra test, which was not actually the cause of the problem

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-03-30 11:39:57 UTC (rev 103248)
+++ projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/DynamicPackageUnitTestCase.java	2010-03-30 11:49:11 UTC (rev 103249)
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2008, Red Hat Inc., and individual contributors
  * as indicated by the @author tags. See the copyright.txt file in the
  * distribution for a full listing of individual contributors.
  *
@@ -25,6 +25,7 @@
 
 import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
 import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
+import org.jboss.classloading.spi.version.VersionRange;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.test.classloading.dependency.support.a.A;
 
@@ -65,7 +66,6 @@
          {
             ClassLoader clA2 = assertClassLoader(contextA2);
             assertLoadClass(A.class, clA2);
-            enableTrace("org.jboss.classloader");
             assertLoadClass(A.class, clA1, clA2);
          }
          finally
@@ -80,4 +80,39 @@
       }
       assertNoClassLoader(contextA1);
    }
+   
+   public void testDynamicPackageWithOptional() throws Exception
+   {
+      ClassLoadingMetaDataFactory factory = ClassLoadingMetaDataFactory.getInstance();
+      
+      MockClassLoadingMetaData a1 = new MockClassLoadingMetaData("a1");
+      a1.getRequirements().addRequirement(factory.createRequirePackage(A.class.getPackage().getName(), null, false, false, true));
+      KernelControllerContext contextA1 = install(a1);
+      try
+      {
+         ClassLoader clA1 = assertClassLoader(contextA1);
+         assertLoadClassFail(A.class, clA1);
+
+         MockClassLoadingMetaData a2 = new MockClassLoadingMetaData("a2");
+         a2.setPathsAndPackageNames(A.class);
+         a2.getRequirements().addRequirement(factory.createRequirePackage("doesNotExist", VersionRange.ALL_VERSIONS, true, false, false));
+         KernelControllerContext contextA2 = install(a2);
+         try
+         {
+            ClassLoader clA2 = assertClassLoader(contextA2);
+            assertLoadClass(A.class, clA2);
+            assertLoadClass(A.class, clA1, clA2);
+         }
+         finally
+         {
+            uninstall(contextA2);
+         }
+         assertNoClassLoader(contextA2);
+      }
+      finally
+      {
+         uninstall(contextA1);
+      }
+      assertNoClassLoader(contextA1);
+   }
 }