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

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

Author: flavia.rainone at jboss.com
Date: 2009-12-08 20:06:36 -0500 (Tue, 08 Dec 2009)
New Revision: 97574

Modified:
   projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
   projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
   projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportArchives.java
Log:
[JBREFLECT-80] Added more commented code for completing this task.

Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java	2009-12-09 00:19:53 UTC (rev 97573)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java	2009-12-09 01:06:36 UTC (rev 97574)
@@ -21,6 +21,9 @@
  */ 
 package org.jboss.test.classpool.jbosscl.test;
 
+import static org.jboss.test.classpool.support.SupportClasses.CLASS_A;
+import static org.jboss.test.classpool.support.SupportClasses.CLASS_B;
+import static org.jboss.test.classpool.support.SupportClasses.CLASS_C;
 import junit.framework.Test;
 
 import org.jboss.classloader.spi.ClassLoaderSystem;
@@ -92,7 +95,9 @@
       //Set<Class<?>> excluded = AbstractJDKChecker.getExcluded();
       //excluded.add(BeanMetaDataFactoryVisitor.class);
       // This is a hack for a hack. ;-)
-      // excluded.add(SanityTestScenario.class);
+      //excluded.add(SanityTestScenario.class);
+      //excluded.add(TestScenario.class);
+      //excluded.add(ClassPoolTestScenario.class);
       system = (ClassLoaderSystem) getBean("ClassLoaderSystem");
       this.testScenario = getTestScenario();
    }
@@ -130,11 +135,12 @@
    /**
     * The test classes should not be on the launcher classpath
     */
+   // TODO JBREFLECT-80
    public void testClassesNotOnClasspath()
    {
-      assertCannotLoadClass(SupportClasses.CLASS_A, this.getClass().getClassLoader());
-      assertCannotLoadClass(SupportClasses.CLASS_B, this.getClass().getClassLoader());
-      assertCannotLoadClass(SupportClasses.CLASS_C, this.getClass().getClassLoader());
+      assertCannotLoadClass(CLASS_A, this.getClass().getClassLoader());
+      assertCannotLoadClass(CLASS_B, this.getClass().getClassLoader());
+      assertCannotLoadClass(CLASS_C, this.getClass().getClassLoader());
    }
    
    /****** AUXILIARY INTERNAL CLASS *****************************************************/

Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java	2009-12-09 00:19:53 UTC (rev 97573)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTestDelegate.java	2009-12-09 01:06:36 UTC (rev 97574)
@@ -62,7 +62,7 @@
       final String packageName = packageA.substring(0, packageA.lastIndexOf('.'));
       ClassFilter classFilter = new ClassFilter()
       {
-         String packagePath = ClassLoaderUtils.packageNameToPath(JBossClClassPoolTest.class.getName());
+         String packagePath = ClassLoaderUtils.packageNameToPath(packageName);
          ClassFilter patternFilter = new PatternClassFilter(
                new String[] { packageName + "\\..+" }, 
                new String[] { packagePath + "/.+" },

Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportArchives.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportArchives.java	2009-12-09 00:19:53 UTC (rev 97573)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportArchives.java	2009-12-09 01:06:36 UTC (rev 97574)
@@ -78,6 +78,8 @@
    public final static String PTD_WS_WAR_LIB = PTD_WS_WAR + "/WEB-INF/lib/wj2.jar";
    public final static String PARENT_JAR = "replacereferences-parent.jar";
    public final static String CHILD_JAR = "replacereferences-child.jar";
+   // TODO JBREFLECT-80
+   //public final static String EXCLUDED_CLASSPATH = "../test-classes";
    public final static String EXCLUDED_CLASSPATH = "../test-excluded-classes";
    
    /************ CLASSPATH URLS ************************************************************/