[jboss-cvs] JBossAS SVN: r83903 - projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test.

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

Author: kabir.khan at jboss.com
Date: 2009-02-05 11:19:09 -0500 (Thu, 05 Feb 2009)
New Revision: 83903

Modified:
   projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithModuleDependencyTestCase.java
   projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithReplaceReferencesTestCase.java
   projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTest.java
Log:
[JBAOP-666] Redo how the test is set up now that I have a better understanding of jboss-cl

Modified: projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithModuleDependencyTestCase.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithModuleDependencyTestCase.java	2009-02-05 14:53:00 UTC (rev 83902)
+++ projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithModuleDependencyTestCase.java	2009-02-05 16:19:09 UTC (rev 83903)
@@ -47,7 +47,7 @@
    
    public static Test suite()
    {
-      return suite(ClassPoolWithModuleDependencyTestCase.class, new Class[0]);
+      return suite(ClassPoolWithModuleDependencyTestCase.class);
    }
    
    public void testImportNoVersionCheck() throws Exception

Modified: projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithReplaceReferencesTestCase.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithReplaceReferencesTestCase.java	2009-02-05 14:53:00 UTC (rev 83902)
+++ projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithReplaceReferencesTestCase.java	2009-02-05 16:19:09 UTC (rev 83903)
@@ -80,7 +80,7 @@
 
    public static Test suite()
    {
-      return suite(ClassPoolWithReplaceReferencesTestCase.class, new Class[0]);
+      return suite(ClassPoolWithReplaceReferencesTestCase.class);
    }
 
    public void testParentLoadedParentDelegation() throws Exception

Modified: projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTest.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTest.java	2009-02-05 14:53:00 UTC (rev 83902)
+++ projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTest.java	2009-02-05 16:19:09 UTC (rev 83903)
@@ -39,11 +39,13 @@
 import org.jboss.aop.asintegration.jboss5.VFSClassLoaderDomainRegistry;
 import org.jboss.aop.classpool.jbosscl.JBossClDelegatingClassPoolFactory;
 import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.classloader.plugins.filter.CombiningClassFilter;
 import org.jboss.classloader.plugins.filter.PatternClassFilter;
 import org.jboss.classloader.spi.ClassLoaderDomain;
 import org.jboss.classloader.spi.ClassLoaderSystem;
 import org.jboss.classloader.spi.ParentPolicy;
 import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloader.spi.filter.PackageClassFilter;
 import org.jboss.classloader.test.support.IsolatedClassLoaderTestHelper;
 import org.jboss.classloading.spi.dependency.ClassLoading;
 import org.jboss.classloading.spi.dependency.Module;
@@ -90,8 +92,28 @@
    private LoaderNameDeploymentRegistry loaderNameDeploymentRegistry = new LoaderNameDeploymentRegistry();
    
    /** The classloader helper */
-   //protected static IsolatedClassLoaderTestHelper helper;
    protected static final ClassLoaderSystem system = ClassLoaderSystem.getInstance();
+   private static boolean initialisedDefaultDomain;
+   private static final ClassFilter aopFilter;
+   static
+   {
+      String[] classPatterns = new String[] {
+            "org\\.jboss\\.aop\\..+", 
+            "org\\.jboss\\.classloading\\..+", 
+            "org\\.jboss\\.classloader\\..+", 
+            "org\\.jboss\\.virtual\\..+", 
+            "org\\.jboss\\.test\\.aop\\.classpool\\.jbosscl\\..+\\..+", 
+            "org\\.jboss\\.metadata\\..+"};
+      String[] resourcePatterns = new String[] {
+            "org/jboss/aop/.+", 
+            "org/jboss/classloading/.+", 
+            "org/jboss/classloader/.+", 
+            "org/jboss/virtual/.+", 
+            "org/jboss/test/aop/classpool/jbosscl/.+\\..+", 
+            "org/jboss/metadata/.+"};
+      aopFilter = new PatternClassFilter(classPatterns, resourcePatterns, null);
+   }
+   
    protected static VFSClassLoaderDomainRegistry domainRegistry;
    
    ClassLoading classLoading = new ClassLoading();
@@ -107,48 +129,27 @@
 
    public static ClassLoaderSystem getSystem()
    {
-      ClassLoaderDomain defaultDomain = system.getDefaultDomain();
-      defaultDomain.setParentPolicy(ParentPolicy.BEFORE_BUT_JAVA_ONLY);
+      if (!initialisedDefaultDomain)
+      {
+         ClassLoaderDomain defaultDomain = system.getDefaultDomain();
+         
+         Set<String> parentPackages = IsolatedClassLoaderTestHelper.getParentPackages();
+         String[] parentPkgs = parentPackages.toArray(new String[parentPackages.size()]);
+         PackageClassFilter filter = new PackageClassFilter(parentPkgs);
+         filter.setIncludeJava(true);
+         CombiningClassFilter beforeFilter = CombiningClassFilter.create(filter, aopFilter);
+         ParentPolicy parentPolicy = new ParentPolicy(beforeFilter, ClassFilter.NOTHING);
+         
+         defaultDomain.setParentPolicy(parentPolicy);
+      }
       return system;
    }
    
-
    public static Test suite(Class<?> clazz)
    {
-      return suite(clazz, new Class[0]);
+      return AbstractTestCaseWithSetup.suite(clazz);
    }
    
-   public static Test suite(Class<?> clazz, Class<?>... packages)
-   {
-      return suite(clazz, true, packages);
-   }
-   
-   public static Test suite(Class<?> clazz, boolean importAll, Class<?>... packages)
-   {
-      IsolatedClassLoaderTestHelper helper = new IsolatedClassLoaderTestHelper();
-
-      String[] classPatterns = new String[] {
-            "org\\.jboss\\.aop\\..+", 
-            "org\\.jboss\\.classloading\\..+", 
-            "org\\.jboss\\.classloader\\..+", 
-            "org\\.jboss\\.virtual\\..+", 
-            "org\\.jboss\\.test\\.aop\\.classpool\\.jbosscl\\..+\\..+", 
-            "org\\.jboss\\.metadata\\..+"};
-      String[] resourcePatterns = new String[] {
-            "org/jboss/aop/.+", 
-            "org/jboss/classloading/.+", 
-            "org/jboss/classloader/.+", 
-            "org/jboss/virtual/.+", 
-            "org/jboss/test/aop/classpool/jbosscl/.+\\..+", 
-            "org/jboss/metadata/.+"};
-      ClassFilter aopFilter = new PatternClassFilter(classPatterns, resourcePatterns, null);
-      Class<?> newClass = helper.initializeClassLoader(clazz, aopFilter, importAll, packages);
-      System.out.println(clazz.getClassLoader());
-      System.out.println(newClass.getClassLoader());
-      return AbstractTestCaseWithSetup.suite(newClass);
-   }
-
-   
    public JBossClClassPoolTest(String name)
    {
       super(name);
@@ -187,8 +188,8 @@
    protected void setUp() throws Exception
    {
       super.setUp();
-//      enableTrace("org.jboss.aop.classpool");
-//      enableTrace("org.jboss.aop.classpool.jbosscl");
+      enableTrace("org.jboss.aop.classpool");
+      enableTrace("org.jboss.aop.classpool.jbosscl");
       deploy("/org/jboss/test/aop/classpool/jbosscl/Common.xml");
    }