[jboss-cvs] JBossAS SVN: r97799 - in projects/jboss-classpool/trunk: jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/support and 1 other directories.

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

Author: flavia.rainone at jboss.com
Date: 2009-12-14 13:32:08 -0500 (Mon, 14 Dec 2009)
New Revision: 97799

Modified:
   projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/support/ClassPoolTestScenario.java
   projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/support/FilteredClassPool.java
   projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
   projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
Log:
[JBREFLECT-80] Tidy up.

Modified: projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/support/ClassPoolTestScenario.java
===================================================================
--- projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/support/ClassPoolTestScenario.java	2009-12-14 18:05:41 UTC (rev 97798)
+++ projects/jboss-classpool/trunk/classpool/src/test/java/org/jboss/test/classpool/support/ClassPoolTestScenario.java	2009-12-14 18:32:08 UTC (rev 97799)
@@ -122,8 +122,7 @@
    {
       assertSameClassPool(null, classPool, int.class, boolean.class, byte.class, short.class,
             long.class, float.class, double.class, char.class, void.class);
-      // FIXME JBREFLECT-80
-      //assertSameClassPool(ClassPoolFactory.getDefault(), classPool, classes);
+      assertSameClassPool(ClassPool.getDefault(), classPool, classes);
       
    }
    

Modified: projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/support/FilteredClassPool.java
===================================================================
--- projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/support/FilteredClassPool.java	2009-12-14 18:05:41 UTC (rev 97798)
+++ projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/support/FilteredClassPool.java	2009-12-14 18:32:08 UTC (rev 97799)
@@ -266,4 +266,15 @@
    {
       return delegate.toClass(ct, loader, domain);
    }
+   
+   @Override
+   protected synchronized CtClass get0(String classname, boolean useCache)
+   throws NotFoundException
+   {
+      if (this.classFilter.matchesClassName(classname))
+      {
+         return delegate.getCtClass(classname);
+      }
+      throw new NotFoundException(classname);
+   }
 }
\ No newline at end of file

Modified: projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
===================================================================
--- projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java	2009-12-14 18:05:41 UTC (rev 97798)
+++ projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java	2009-12-14 18:32:08 UTC (rev 97799)
@@ -21,10 +21,6 @@
  */ 
 package org.jboss.test.classpool.jbosscl.test;
 
-import static org.jboss.test.classpool.jbosscl.support.SupportClasses.CLASS_A;
-import static org.jboss.test.classpool.jbosscl.support.SupportClasses.CLASS_B;
-import static org.jboss.test.classpool.jbosscl.support.SupportClasses.CLASS_C;
-
 import java.util.Set;
 
 import junit.framework.Test;
@@ -112,35 +108,7 @@
          super.tearDown();
       }
    }
-
-   /****** ASSERT METHODS ***************************************************************/
    
-   private void assertCannotLoadClass(String className, ClassLoader cl)
-   {
-      try
-      {
-         cl.loadClass(className);
-         fail("Should not have been able to load " + className);
-      }
-      catch(ClassNotFoundException expected)
-      {
-      }
-   }
-   
-
-   /****** TEST METHOD ******************************************************************/
-   
-   /**
-    * The test classes should not be on the launcher classpath
-    */
-   // TODO JBREFLECT-80
-   /*public void testClassesNotOnClasspath()
-   {
-      assertCannotLoadClass(CLASS_A, this.getClass().getClassLoader());
-      assertCannotLoadClass(CLASS_B, this.getClass().getClassLoader());
-      assertCannotLoadClass(CLASS_C, this.getClass().getClassLoader());
-   }*/
-   
    /****** AUXILIARY INTERNAL CLASS *****************************************************/
    
    protected ClassLoaderFactory<CLDeploymentBuilder> getClassLoaderFactory()

Modified: projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
===================================================================
--- projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java	2009-12-14 18:05:41 UTC (rev 97798)
+++ projects/jboss-classpool/trunk/jbosscl/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java	2009-12-14 18:32:08 UTC (rev 97799)
@@ -39,6 +39,7 @@
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.deployers.plugins.main.MainDeployerImpl;
 import org.jboss.test.classpool.jbosscl.support.FilteredClassPool;
+import org.jboss.test.classpool.jbosscl.support.excluded.a.A;
 import org.jboss.test.kernel.junit.MicrocontainerTestDelegate;
 import org.jboss.xb.binding.resolver.MutableSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
@@ -63,9 +64,7 @@
       MutableSchemaResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
       resolver.mapURIToClass("urn:jboss:classloader:1.0", VFSClassLoaderFactory10.class);
       resolver.mapURIToClass("urn:jboss:classloading:1.0", ClassLoadingMetaData10.class);
-      // FIXME JBREFLECT-80
-      //String packageA = A.class.getPackage().getName();
-      String packageA = "org.jboss.test.classpool.support";
+      String packageA = A.class.getPackage().getName();
       final String packageName = packageA.substring(0, packageA.lastIndexOf('.'));
       ClassFilter classFilter = new ClassFilter()
       {