[jboss-cvs] JBossAS SVN: r97264 - in projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool: support and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 1 17:53:49 EST 2009
Author: flavia.rainone at jboss.com
Date: 2009-12-01 17:53:47 -0500 (Tue, 01 Dec 2009)
New Revision: 97264
Added:
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportArchives.java
Modified:
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/ArchiveTest.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/DependencyTest.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/HierarchicalDomainTest.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/HierarchicalParentLoaderTest.java
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/ReExportTest.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/ReplaceReferencesClassPoolTestCase.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/RepositoryClassPoolTestCase.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/RepositoryTest.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/UsesPackageTest.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportClasses.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ParentFirstDelegatingClassPoolTestCase.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ParentLastDelegatingClassPoolTestCase.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ScopedSiblingDelegatingClassPoolTestCase.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/SimpleDelegatingClassPoolTestCase.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclClassLoaderSanityTestCase.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclClassPoolTest.java
projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclDelegatingClassPoolTestCase.java
Log:
[JBREFLECT-74] Created SupportArchives to contain all archive names and archive-related urls. Removed strings in the tests that refer to archive names without using the SupportArchives constants.
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/ArchiveTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/ArchiveTest.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/ArchiveTest.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -21,6 +21,52 @@
*/
package org.jboss.test.classpool.jbosscl.test;
+import static org.jboss.test.classpool.support.SupportArchives.EJB_JAR;
+import static org.jboss.test.classpool.support.SupportArchives.EJB_JAR_URL;
+import static org.jboss.test.classpool.support.SupportArchives.EXCLUDED_CLASSPATH_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_2;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_2_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_IN_EAR;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_IN_EAR_JAR_URL;
+import static org.jboss.test.classpool.support.SupportArchives.PTD_EAR;
+import static org.jboss.test.classpool.support.SupportArchives.PTD_EAR_LIB_URL;
+import static org.jboss.test.classpool.support.SupportArchives.PTD_JSF_WAR;
+import static org.jboss.test.classpool.support.SupportArchives.PTD_JSF_WAR_LIB_URL;
+import static org.jboss.test.classpool.support.SupportArchives.PTD_JSF_WAR_URL;
+import static org.jboss.test.classpool.support.SupportArchives.PTD_WS_WAR;
+import static org.jboss.test.classpool.support.SupportArchives.PTD_WS_WAR_LIB_URL;
+import static org.jboss.test.classpool.support.SupportArchives.PTD_WS_WAR_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SERVLET_JAR;
+import static org.jboss.test.classpool.support.SupportArchives.SERVLET_JAR_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_EJB_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_JAR_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_LIB1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_LIB2_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_SAR_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_WAR1;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_WAR1_CP_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_WAR1_LIB_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_WAR1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_WAR2;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_WAR2_CP_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_WAR2_LIB_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_EAR_WAR2_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_JAR;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_JAR_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_SAR;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_SAR_URL;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_WAR;
+import static org.jboss.test.classpool.support.SupportArchives.SIMPLE_WAR_CP_URL;
+import static org.jboss.test.classpool.support.SupportArchives.TOP_EAR;
+import static org.jboss.test.classpool.support.SupportArchives.TOP_EAR_EXT_URL;
+import static org.jboss.test.classpool.support.SupportArchives.TOP_EAR_UTIL_URL;
+import static org.jboss.test.classpool.support.SupportArchives.WAR_IN_EAR;
+import static org.jboss.test.classpool.support.SupportArchives.WAR_IN_EAR_WAR;
+import static org.jboss.test.classpool.support.SupportArchives.WAR_IN_EAR_WAR_CP;
+import static org.jboss.test.classpool.support.SupportArchives.WAR_IN_EAR_WAR_URL;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_A;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_CRM;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_EXT;
@@ -33,6 +79,9 @@
import static org.jboss.test.classpool.support.SupportClasses.CLASS_TIF;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_UI;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_UTIL;
+import static org.jboss.test.classpool.support.SupportClasses.PACKAGE_JAR;
+import static org.jboss.test.classpool.support.SupportClasses.PACKAGE_TIF;
+import static org.jboss.test.classpool.support.SupportClasses.PACKAGE_WEB;
import java.util.HashMap;
import java.util.Map;
@@ -59,29 +108,29 @@
public void testJar() throws Exception
{
- CLDeploymentBuilder classLoaderBuilder = new CLDeploymentBuilder("simple.jar", SIMPLE_JAR);
+ CLDeploymentBuilder classLoaderBuilder = new CLDeploymentBuilder(SIMPLE_JAR, SIMPLE_JAR_URL);
L loader = testScenario.createLoader(classLoaderBuilder);
assertCanLoad(loader, CLASS_PLAIN);
}
public void testSar() throws Exception
{
- CLDeploymentBuilder classLoaderBuilder = new CLDeploymentBuilder("simple.sar", SIMPLE_SAR);
+ CLDeploymentBuilder classLoaderBuilder = new CLDeploymentBuilder(SIMPLE_SAR, SIMPLE_SAR_URL);
L loader = testScenario.createLoader(classLoaderBuilder);
assertCanLoad(loader, CLASS_MBEAN);
}
public void testEjbJar() throws Exception
{
- CLDeploymentBuilder classLoaderBuilder = new CLDeploymentBuilder("ejbs.jar", EJB_JAR);
+ CLDeploymentBuilder classLoaderBuilder = new CLDeploymentBuilder(EJB_JAR, EJB_JAR_URL);
L loader = testScenario.createLoader(classLoaderBuilder);
assertCanLoad(loader, CLASS_SLS_BEAN, CLASS_SLS_INTERFACE);
}
public void testWar() throws Exception
{
- CLDeploymentBuilder clBuilder = new CLDeploymentBuilder("simple.war", SIMPLE_WAR);
- clBuilder.createDomain("simple.war", false);
+ CLDeploymentBuilder clBuilder = new CLDeploymentBuilder(SIMPLE_WAR, SIMPLE_WAR_CP_URL);
+ clBuilder.createDomain(getDomain(SIMPLE_WAR), false);
L loader = testScenario.createLoader(clBuilder);
assertCanLoad(loader, CLASS_SERVLET);
}
@@ -89,23 +138,23 @@
public void testEar() throws Exception
{
// create the ear loader
- CLDeploymentBuilder earCLBuilder = new CLDeploymentBuilder("simple.ear", SIMPLE_EAR_JAR,
- SIMPLE_EAR_SAR, SIMPLE_EAR_EJB, SIMPLE_EAR_LIB1, SIMPLE_EAR_LIB2);
- earCLBuilder.setExcludes(SIMPLE_EAR_WAR1, SIMPLE_EAR_WAR1_CP, SIMPLE_EAR_WAR1_LIB,
- SIMPLE_EAR_WAR2, SIMPLE_EAR_WAR2_CP, SIMPLE_EAR_WAR2_LIB);
+ CLDeploymentBuilder earCLBuilder = new CLDeploymentBuilder(SIMPLE_EAR, SIMPLE_EAR_JAR_URL,
+ SIMPLE_EAR_SAR_URL, SIMPLE_EAR_EJB_URL, SIMPLE_EAR_LIB1_URL, SIMPLE_EAR_LIB2_URL);
+ earCLBuilder.setExcludes(SIMPLE_EAR_WAR1_URL, SIMPLE_EAR_WAR1_CP_URL, SIMPLE_EAR_WAR1_LIB_URL,
+ SIMPLE_EAR_WAR2_URL, SIMPLE_EAR_WAR2_CP_URL, SIMPLE_EAR_WAR2_LIB_URL);
L earLoader = testScenario.createLoader(earCLBuilder);
// create the simple_ui.war loader
ClassLoader earClassLoader = testScenario.getClassLoader(earLoader);
CLDeploymentBuilder war1CLBuilder = new CLDeploymentBuilder(
- "simple.ear/simple_ui.war", SIMPLE_EAR_WAR1_CP, SIMPLE_EAR_WAR1_LIB);
- war1CLBuilder.createDomain("simple_ui.war", earClassLoader, false);
+ SIMPLE_EAR_WAR1, SIMPLE_EAR_WAR1_CP_URL, SIMPLE_EAR_WAR1_LIB_URL);
+ war1CLBuilder.createDomain(getDomain(SIMPLE_EAR_WAR1), earClassLoader, false);
L war1Loader = testScenario.createLoader(war1CLBuilder);
// create the jsfapp.war loader
- CLDeploymentBuilder war2CLBuilder = new CLDeploymentBuilder("simple.ear/jsfapp.war",
- SIMPLE_EAR_WAR2_CP, SIMPLE_EAR_WAR2_LIB);
- war2CLBuilder.createDomain("jsfapp.war", earClassLoader, false);
+ CLDeploymentBuilder war2CLBuilder = new CLDeploymentBuilder(SIMPLE_EAR_WAR2,
+ SIMPLE_EAR_WAR2_CP_URL, SIMPLE_EAR_WAR2_LIB_URL);
+ war2CLBuilder.createDomain(getDomain(SIMPLE_EAR_WAR2), earClassLoader, false);
L war2Loader = testScenario.createLoader(war2CLBuilder);
// assert that the loaderse can load the classes
@@ -128,7 +177,7 @@
public void testTopLevelWithUtil() throws Exception
{
- CLDeploymentBuilder clBuilder = new CLDeploymentBuilder("top-level.ear", EAR_UTIL1, EAR_UTIL2);
+ CLDeploymentBuilder clBuilder = new CLDeploymentBuilder(TOP_EAR, TOP_EAR_UTIL_URL, TOP_EAR_EXT_URL);
L earLoader = testScenario.createLoader(clBuilder);
assertCanLoad(earLoader, CLASS_UTIL, CLASS_EXT);
}
@@ -136,14 +185,13 @@
public void testWarInEar() throws Exception
{
// create ear loader
- CLDeploymentBuilder earCLBuilder = new CLDeploymentBuilder("war-in-ear.ear");
- earCLBuilder.setExcludes(EAR_WAR, EAR_WAR_CP);
+ CLDeploymentBuilder earCLBuilder = new CLDeploymentBuilder(WAR_IN_EAR);
+ earCLBuilder.setExcludes(WAR_IN_EAR_WAR_URL, WAR_IN_EAR_WAR_CP);
L earLoader = testScenario.createLoader(earCLBuilder);
// create war loader
- CLDeploymentBuilder warCLBuilder = new CLDeploymentBuilder(
- "war-in-ear.ear/simple.war", EAR_WAR_CP);
- warCLBuilder.createDomain("simple.war", testScenario.getClassLoader(earLoader), false);
+ CLDeploymentBuilder warCLBuilder = new CLDeploymentBuilder(WAR_IN_EAR_WAR, WAR_IN_EAR_WAR_CP);
+ warCLBuilder.createDomain(getDomain(WAR_IN_EAR_WAR), testScenario.getClassLoader(earLoader), false);
L warLoader = testScenario.createLoader(warCLBuilder);
// assert warLoader can load CLASS_SERVLET
@@ -154,7 +202,7 @@
public void testJarInEar() throws Exception
{
- CLDeploymentBuilder earCLBuilder = new CLDeploymentBuilder("jar-in-ear.ear", EAR_JAR);
+ CLDeploymentBuilder earCLBuilder = new CLDeploymentBuilder(JAR_IN_EAR, JAR_IN_EAR_JAR_URL);
L earLoader = testScenario.createLoader(earCLBuilder);
assertCanLoad(earLoader, CLASS_PLAIN);
}
@@ -162,12 +210,12 @@
public void testIsolatedJars() throws Exception
{
// create a1.jar loader
- CLDeploymentBuilder cl1Builder = new CLDeploymentBuilder("a1.jar", JAR_A_1);
- cl1Builder.createDomain("a1.jar_Domain", true);
+ CLDeploymentBuilder cl1Builder = new CLDeploymentBuilder(JAR_A_1, JAR_A_1_URL);
+ cl1Builder.createDomain(getDomain(JAR_A_1), true);
L loader1 = testScenario.createLoader(cl1Builder);
// create a2.jar loader
- CLDeploymentBuilder cl2Builder = new CLDeploymentBuilder("a2.jar", JAR_A_2);
- cl2Builder.createDomain("a2.jar_Domain", true);
+ CLDeploymentBuilder cl2Builder = new CLDeploymentBuilder(JAR_A_2, JAR_A_2_URL);
+ cl2Builder.createDomain(getDomain(JAR_A_2), true);
L loader2 = testScenario.createLoader(cl2Builder);
// assert proper isolation between the loaders
assertIsolated(loader1, loader2);
@@ -176,13 +224,14 @@
public void testHierarchyJarsChildFirst() throws Exception
{
// creeate a1.jar loader
- CLDeploymentBuilder clBuilder1 = new CLDeploymentBuilder("a1.jar", JAR_A_1);
- clBuilder1.createDomain("a1.jar_Domain", true);
+ String domain1 = getDomain(JAR_A_1);
+ CLDeploymentBuilder clBuilder1 = new CLDeploymentBuilder(JAR_A_1, JAR_A_1_URL);
+ clBuilder1.createDomain(domain1, true);
L loader1 = testScenario.createLoader(clBuilder1);
// create a2.jar loader
- CLDeploymentBuilder clBuilder2 = new CLDeploymentBuilder("a2.jar", JAR_A_2);
- clBuilder2.createDomain("a2.jar_Domain", "a1.jar_Domain", false);
+ CLDeploymentBuilder clBuilder2 = new CLDeploymentBuilder(JAR_A_2, JAR_A_2_URL);
+ clBuilder2.createDomain(getDomain(JAR_A_2), domain1, false);
L loader2 = testScenario.createLoader(clBuilder2);
assertIsolated(loader1, loader2);
}
@@ -190,18 +239,19 @@
public void testDomainHierarchy() throws Exception
{
// create simple.jar loader
- CLDeploymentBuilder topCLBuilder = new CLDeploymentBuilder("simple.jar", SIMPLE_JAR);
- topCLBuilder.createDomain("simple.jar_Domain", true);
+ String topDomain = getDomain(SIMPLE_JAR);
+ CLDeploymentBuilder topCLBuilder = new CLDeploymentBuilder(SIMPLE_JAR, SIMPLE_JAR_URL);
+ topCLBuilder.createDomain(topDomain, true);
L topLoader = testScenario.createLoader(topCLBuilder);
// create servlet.jar "left" loader
- CLDeploymentBuilder leftCLBuilder = new CLDeploymentBuilder("servlet.jarL", SERVLET_JAR);
- leftCLBuilder.createDomain("servlet.jar_LeftDomain", "simple.jar_Domain", true);
+ CLDeploymentBuilder leftCLBuilder = new CLDeploymentBuilder(SERVLET_JAR + 'L', SERVLET_JAR_URL);
+ leftCLBuilder.createDomain(getDomain(SERVLET_JAR) + 'L', topDomain, true);
L leftLoader = testScenario.createLoader(leftCLBuilder);
// create servlet.jar "right" loader
- CLDeploymentBuilder rightCLBuilder = new CLDeploymentBuilder("servlet.jarR", SERVLET_JAR);
- rightCLBuilder.createDomain("servlet.jar_RightDomain", "simple.jar_Domain", true);
+ CLDeploymentBuilder rightCLBuilder = new CLDeploymentBuilder(SERVLET_JAR + 'R', SERVLET_JAR_URL);
+ rightCLBuilder.createDomain(getDomain(SERVLET_JAR) + 'R', topDomain, true);
L rightLoader = testScenario.createLoader(rightCLBuilder);
// assert domain hierarchy
@@ -211,24 +261,20 @@
public void testEar2War() throws Exception
{
// create ptd-ear-1.0-SNAPSHOT.ear loader
- CLDeploymentBuilder topCLBuilder = new CLDeploymentBuilder("ptd-ear-1.0-SNAPSHOT.ear",
- PTD_EAR_LIB);
- topCLBuilder.createDomain("ptd-ear-1.0-SNAPSHOT.ear_Domain", false);
- topCLBuilder.setExcludes(PTD_JSF_WAR, PTD_JSF_WAR_LIB, PTD_WS_WAR, PTD_WS_WAR_LIB);
+ String topDomain = getDomain(PTD_EAR);
+ CLDeploymentBuilder topCLBuilder = new CLDeploymentBuilder(PTD_EAR, PTD_EAR_LIB_URL);
+ topCLBuilder.createDomain(topDomain, false);
+ topCLBuilder.setExcludes(PTD_JSF_WAR_URL, PTD_JSF_WAR_LIB_URL, PTD_WS_WAR_URL, PTD_WS_WAR_LIB_URL);
L topLoader = testScenario.createLoader(topCLBuilder);
// create ptd-jsf-1.0.-SNAPSHOT.war loader
- CLDeploymentBuilder leftCLBuilder = new CLDeploymentBuilder(SupportClasses.PTD_JSF_WAR,
- PTD_JSF_WAR_LIB);
- leftCLBuilder.createDomain("ptd-jsf-1.0-SNAPSHOT.war_Domain",
- "ptd-ear-1.0-SNAPSHOT.ear_Domain", true);
+ CLDeploymentBuilder leftCLBuilder = new CLDeploymentBuilder(PTD_JSF_WAR, PTD_JSF_WAR_LIB_URL);
+ leftCLBuilder.createDomain(getDomain(PTD_JSF_WAR), topDomain, true);
+ L leftLoader = testScenario.createLoader(leftCLBuilder);
// create ptd-ws-1.0-SNAPSHOT.war loader
- L leftLoader = testScenario.createLoader(leftCLBuilder);
- CLDeploymentBuilder rightCLBuilder = new CLDeploymentBuilder(SupportClasses.PTD_WS_WAR,
- PTD_WS_WAR_LIB);
- rightCLBuilder.createDomain("ptd-ws-1.0-SNAPSHOT.war_Domain",
- "ptd-ear-1.0-SNAPSHOT.ear_Domain", true);
+ CLDeploymentBuilder rightCLBuilder = new CLDeploymentBuilder(PTD_WS_WAR, PTD_WS_WAR_LIB_URL);
+ rightCLBuilder.createDomain(getDomain(PTD_WS_WAR), topDomain, true);
L rightLoader = testScenario.createLoader(rightCLBuilder);
// assert domain hierarchy
@@ -238,22 +284,23 @@
public void testJarAndExcludedClassPath() throws Exception
{
// create simple.jar loader
- CLDeploymentBuilder jarCLBuilder = new CLDeploymentBuilder("simple.jar", SIMPLE_JAR);
+ CLDeploymentBuilder jarCLBuilder = new CLDeploymentBuilder(SIMPLE_JAR, SIMPLE_JAR_URL);
L jarLoader = testScenario.createLoader(jarCLBuilder);
// create anys loader
CLDeploymentBuilder anysCLBuilder = new CLDeploymentBuilder("anys-classloader",
- EXCLUDED_CLASSPATH);
- anysCLBuilder.createPackage(SupportClasses.PACKAGE_WEB);
+ EXCLUDED_CLASSPATH_URL);
+ anysCLBuilder.createPackage(PACKAGE_WEB);
L anysLoader = testScenario.createLoader(anysCLBuilder);
// create AnyServlet bean meta data
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("AnyServlet", CLASS_SERVLET);
+ String beanName = "AnyServlet";
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(beanName, CLASS_SERVLET);
builder.setClassLoader(new AbstractDependencyValueMetaData("anys-classloader:0.0.0"));
super.deploy(builder.getBeanMetaData());
// assert AnyServlet bean
- Object anys = assertBean("AnyServlet", Object.class);
+ Object anys = assertBean(beanName, Object.class);
Class<?> anysClass = anys.getClass();
ClassLoader anysCL = anysClass.getClassLoader();
assertSame(anysCL, testScenario.getClassLoader(anysLoader));
@@ -266,21 +313,22 @@
public void testTifHierarchy() throws Exception
{
// create simple.jar loader
- CLDeploymentBuilder jarCLBuilder = new CLDeploymentBuilder("simple.jar", SIMPLE_JAR);
+ CLDeploymentBuilder jarCLBuilder = new CLDeploymentBuilder(SIMPLE_JAR, SIMPLE_JAR_URL);
L jarLoader = testScenario.createLoader(jarCLBuilder);
// create anys loader
+ String anysDomain = getDomain("Anys");
CLDeploymentBuilder anysCLBuilder = new CLDeploymentBuilder("anys-classloader",
- EXCLUDED_CLASSPATH);
- anysCLBuilder.createDomain("Anys_Domain", true);
+ EXCLUDED_CLASSPATH_URL);
+ anysCLBuilder.createDomain(anysDomain, true);
anysCLBuilder.createPackage(SupportClasses.PACKAGE_WEB);
L anysLoader = testScenario.createLoader(anysCLBuilder);
// create tif loader
CLDeploymentBuilder tifCLBuilder = new CLDeploymentBuilder("tif-classloader",
- EXCLUDED_CLASSPATH);
- tifCLBuilder.createDomain("TIF_Domain", "Anys_Domain",true);
- tifCLBuilder.createPackage(SupportClasses.PACKAGE_TIF);
+ EXCLUDED_CLASSPATH_URL);
+ tifCLBuilder.createDomain(getDomain("TIF"), anysDomain,true);
+ tifCLBuilder.createPackage(PACKAGE_TIF);
L tifLoader = testScenario.createLoader(tifCLBuilder);
// create AnyServlet and TifTester beans
@@ -293,24 +341,24 @@
public void testTifHierarchyWithRequirements() throws Exception
{
// create simple.jar loader
- CLDeploymentBuilder jarCLBuilder = new CLDeploymentBuilder("simple.jar", SIMPLE_JAR);
- jarCLBuilder.createPackage(SupportClasses.PACKAGE_JAR);
+ CLDeploymentBuilder jarCLBuilder = new CLDeploymentBuilder(SIMPLE_JAR, SIMPLE_JAR_URL);
+ jarCLBuilder.createPackage(PACKAGE_JAR);
L jarLoader = testScenario.createLoader(jarCLBuilder);
// create anys loader
CLDeploymentBuilder anysCLBuilder = new CLDeploymentBuilder("anys-classloader",
- EXCLUDED_CLASSPATH);
+ EXCLUDED_CLASSPATH_URL);
anysCLBuilder.createModule("any-classloader:0.0.0$Module");
- anysCLBuilder.createPackage(SupportClasses.PACKAGE_WEB);
- anysCLBuilder.createRequirePackage(SupportClasses.PACKAGE_JAR);
+ anysCLBuilder.createPackage(PACKAGE_WEB);
+ anysCLBuilder.createRequirePackage(PACKAGE_JAR);
L anysLoader = testScenario.createLoader(anysCLBuilder);
// create tif loader
CLDeploymentBuilder tifCLBuilder = new CLDeploymentBuilder("tif-classloader",
- EXCLUDED_CLASSPATH);
+ EXCLUDED_CLASSPATH_URL);
tifCLBuilder.createModule("tif-classloader:0.0.0$Module");
- tifCLBuilder.createPackage(SupportClasses.PACKAGE_TIF);
- tifCLBuilder.createRequirePackage(SupportClasses.PACKAGE_WEB);
+ tifCLBuilder.createPackage(PACKAGE_TIF);
+ tifCLBuilder.createRequirePackage(PACKAGE_WEB);
L tifLoader = testScenario.createLoader(tifCLBuilder);
// create AnyServlet and TifTester beans
@@ -410,19 +458,21 @@
private void createHierarchyBeans(L jarLoader) throws Exception
{
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("AnyServlet", CLASS_SERVLET);
+ String servletName = "AnyServlet";
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(servletName, CLASS_SERVLET);
builder.setClassLoader(new AbstractDependencyValueMetaData("anys-classloader:0.0.0"));
super.deploy(builder.getBeanMetaData());
- builder = BeanMetaDataBuilder.createBuilder("TifTester", CLASS_TIF);
+ String tifName = "TifTester";
+ builder = BeanMetaDataBuilder.createBuilder(tifName, CLASS_TIF);
builder.setClassLoader(new AbstractDependencyValueMetaData("tif-classloader:0.0.0"));
super.deploy(builder.getBeanMetaData());
- Object anys = assertBean("AnyServlet", Object.class);
+ Object anys = assertBean(servletName, Object.class);
Class<?> anysClass = anys.getClass();
ClassLoader anysCL = anysClass.getClassLoader();
- Object tif = assertBean("TifTester", Object.class);
+ Object tif = assertBean(tifName, Object.class);
Class<?> tifClass = tif.getClass();
ClassLoader tifCL = tifClass.getClassLoader();
@@ -432,4 +482,9 @@
assertNotSame(jarCL, tifCL);
assertNotSame(anysCL, tifCL);
}
+
+ private String getDomain(String name)
+ {
+ return name + "_Domain";
+ }
}
\ No newline at end of file
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/DependencyTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/DependencyTest.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/DependencyTest.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.classpool.jbosscl.test;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_1_URL;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_A;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_B;
@@ -225,7 +227,7 @@
private CLDeploymentBuilder createExportCLBuilder(String name, String version)
{
- CLDeploymentBuilder clBuilderA = new CLDeploymentBuilder(name, JAR_A_1);
+ CLDeploymentBuilder clBuilderA = new CLDeploymentBuilder(name, JAR_A_1_URL);
createExportCapabilities(clBuilderA, "Module" + name, version);
return clBuilderA;
}
@@ -239,7 +241,7 @@
private CLDeploymentBuilder createRequireCLBuilder(VersionRange requiredVersion)
{
- CLDeploymentBuilder clBuilderB = new CLDeploymentBuilder("B", JAR_B_1);
+ CLDeploymentBuilder clBuilderB = new CLDeploymentBuilder("B", JAR_B_1_URL);
createRequireCapabilities(clBuilderB, requiredVersion);
return clBuilderB;
}
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/HierarchicalDomainTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/HierarchicalDomainTest.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/HierarchicalDomainTest.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -22,6 +22,9 @@
package org.jboss.test.classpool.jbosscl.test;
import static org.jboss.classloader.spi.ClassLoaderSystem.DEFAULT_DOMAIN_NAME;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_2_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_1_URL;
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.PACKAGE_A;
@@ -169,7 +172,7 @@
L parentLoader = testScenario.createLoader(parentCLBuilder);
assertCanLoadAButNotB(parentLoader);
- CLDeploymentBuilder childCLBuilderA = new CLDeploymentBuilder("aChild", JAR_A_2);
+ CLDeploymentBuilder childCLBuilderA = new CLDeploymentBuilder("aChild", JAR_A_2_URL);
childCLBuilderA.createDomain(CHILD_DOMAIN, parentFirst);
L childLoaderA = testScenario.createLoader(childCLBuilderA);
assertCanLoadAButNotB(parentLoader);
@@ -244,7 +247,7 @@
private CLDeploymentBuilder createParentCLBuilder()
{
- return new CLDeploymentBuilder("aParent", JAR_A_1);
+ return new CLDeploymentBuilder("aParent", JAR_A_1_URL);
}
private CLDeploymentBuilder createParentCLBuilderWithDomain()
@@ -256,7 +259,7 @@
private CLDeploymentBuilder createChildCLBuilder(boolean importAll)
{
- CLDeploymentBuilder childCLBuilderB = new CLDeploymentBuilder("b", JAR_B_1);
+ CLDeploymentBuilder childCLBuilderB = new CLDeploymentBuilder("b", JAR_B_1_URL);
childCLBuilderB.setDomain(CHILD_DOMAIN);
childCLBuilderB.createRequirePackage(PACKAGE_A);
childCLBuilderB.setImportAll(importAll);
@@ -265,7 +268,7 @@
private CLDeploymentBuilder createChildCLBuilder(boolean parentFirst, String parentDomain)
{
- CLDeploymentBuilder childBuilder = new CLDeploymentBuilder("b", JAR_B_1);
+ CLDeploymentBuilder childBuilder = new CLDeploymentBuilder("b", JAR_B_1_URL);
childBuilder.createDomain(CHILD_DOMAIN, parentDomain, parentFirst);
childBuilder.createRequirePackage(PACKAGE_A);
childBuilder.setImportAll(false);
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/HierarchicalParentLoaderTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/HierarchicalParentLoaderTest.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/HierarchicalParentLoaderTest.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -22,6 +22,8 @@
package org.jboss.test.classpool.jbosscl.test;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_2_URL;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_A;
import java.net.URL;
@@ -80,12 +82,12 @@
private void runTest(ParentPolicy parentParentPolicy, ParentPolicy childParentPolicy, boolean expectedParent) throws Exception
{
- runTest(parentParentPolicy, childParentPolicy, true, JAR_A_2, expectedParent);
+ runTest(parentParentPolicy, childParentPolicy, true, JAR_A_2_URL, expectedParent);
}
private void runTest(ParentPolicy parentParentPolicy, ParentPolicy childParentPolicy, boolean createParent, boolean expectedParent) throws Exception
{
- runTest(parentParentPolicy, childParentPolicy, createParent, JAR_A_2, expectedParent);
+ runTest(parentParentPolicy, childParentPolicy, createParent, JAR_A_2_URL, expectedParent);
}
private void runTest(ParentPolicy parentParentPolicy, ParentPolicy childParentPolicy, URL url, boolean expectedParent) throws Exception
@@ -104,7 +106,7 @@
L parentLoader = null;
if (createParent)
{
- CLDeploymentBuilder parentCLBuilder = new CLDeploymentBuilder("ParentLoader", JAR_A_1);
+ CLDeploymentBuilder parentCLBuilder = new CLDeploymentBuilder("ParentLoader", JAR_A_1_URL);
parentCLBuilder.setDomain(parentName);
parentLoader = testScenario.createLoader(parentCLBuilder);
}
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-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -21,9 +21,6 @@
*/
package org.jboss.test.classpool.jbosscl.test;
-import java.net.MalformedURLException;
-import java.net.URL;
-
import junit.framework.Test;
import org.jboss.aop.AspectManager;
@@ -46,69 +43,11 @@
*/
public abstract class JBossClClassPoolTest<C, L> extends MicrocontainerTest
{
- /****** STATIC ***************************************************************************/
-
- public final static URL JAR_A_1 = getURLRelativeToProjectRoot(SupportClasses.JAR_A_1);
- public final static URL JAR_A_2 = getURLRelativeToProjectRoot(SupportClasses.JAR_A_2);
- public final static URL JAR_B_1 = getURLRelativeToProjectRoot(SupportClasses.JAR_B_1);
- public final static URL JAR_B_2 = getURLRelativeToProjectRoot(SupportClasses.JAR_B_2);
- public final static URL JAR_C_1 = getURLRelativeToProjectRoot(SupportClasses.JAR_C_1);
- public final static URL JAR_C_2 = getURLRelativeToProjectRoot(SupportClasses.JAR_C_2);
- public final static URL JAR_D = getURLRelativeToProjectRoot(SupportClasses.JAR_D);
-// TODO refactorate this, extracting this from this class
- // TODO move the jars to a directory of their own (such as target/test-archives)
- public final static URL SIMPLE_JAR = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_JAR);
- public final static URL SIMPLE_SAR = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_SAR);
- public final static URL EJB_JAR = getURLRelativeToProjectRoot(SupportClasses.EJB_JAR);
- public final static URL SIMPLE_WAR = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_WAR);
- public final static URL SIMPLE_EAR_JAR = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_EAR_JAR);
- public final static URL SIMPLE_EAR_SAR = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_EAR_SAR);
- public final static URL SIMPLE_EAR_EJB = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_EAR_EJB);
- public final static URL SIMPLE_EAR_LIB1 = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_EAR_LIB1);
- public final static URL SIMPLE_EAR_LIB2 = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_EAR_LIB2);
- public final static URL SIMPLE_EAR_WAR1 = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_EAR_WAR1);
- public final static URL SIMPLE_EAR_WAR1_CP = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_EAR_WAR1_CP);
- public final static URL SIMPLE_EAR_WAR1_LIB = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_EAR_WAR1_LIB);
- public final static URL SIMPLE_EAR_WAR2 = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_EAR_WAR2);
- public final static URL SIMPLE_EAR_WAR2_CP = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_EAR_WAR2_CP);
- public final static URL SIMPLE_EAR_WAR2_LIB = getURLRelativeToProjectRoot(SupportClasses.SIMPLE_EAR_WAR2_LIB);
- public final static URL EAR_UTIL1 = getURLRelativeToProjectRoot(SupportClasses.EAR_UTIL1);
- public final static URL EAR_UTIL2 = getURLRelativeToProjectRoot(SupportClasses.EAR_UTIL2);
- public final static URL EAR_WAR = getURLRelativeToProjectRoot(SupportClasses.EAR_WAR);
- public final static URL EAR_WAR_CP = getURLRelativeToProjectRoot(SupportClasses.EAR_WAR_CP);
- public final static URL EAR_JAR = getURLRelativeToProjectRoot(SupportClasses.EAR_JAR);
- public final static URL SERVLET_JAR = getURLRelativeToProjectRoot(SupportClasses.SERVLET_JAR);
- public final static URL PTD_EAR_LIB = getURLRelativeToProjectRoot(SupportClasses.PTD_EAR_LIB);
- public final static URL PTD_JSF_WAR = getURLRelativeToProjectRoot(SupportClasses.PTD_JSF_WAR);
- public final static URL PTD_JSF_WAR_LIB = getURLRelativeToProjectRoot(SupportClasses.PTD_JSF_WAR_LIB);
- public final static URL PTD_WS_WAR = getURLRelativeToProjectRoot(SupportClasses.PTD_WS_WAR);
- public final static URL PTD_WS_WAR_LIB = getURLRelativeToProjectRoot(SupportClasses.PTD_WS_WAR_LIB);
- public final static URL EXCLUDED_CLASSPATH = getURLRelativeToProjectRoot(SupportClasses.EXCLUDED_CLASSPATH);
-
public static Test suite(Class<?> clazz)
{
return AbstractTestCaseWithSetup.suite(clazz);
}
-
- /** Returns the relative URL to the project root */
- protected static URL getURLRelativeToProjectRoot(String relativePath)
- {
- try
- {
- URL url = JBossClClassPoolTest.class.getProtectionDomain().getCodeSource().getLocation();
- String location = url.toString();
- int index = location.lastIndexOf("/target/") + "/target/".length();
- location = location.substring(0, index) + "archives/";
-
- location = location + relativePath;
- return new URL(location);
- }
- catch (MalformedURLException e)
- {
- throw new RuntimeException(e);
- }
- }
-
+
// FIXME
static
{
@@ -145,7 +84,6 @@
protected void setUp() throws Exception
{
super.setUp();
-
deploy("/org/jboss/test/classpool/jbosscl/Common.xml");
VFS.init();
system = (ClassLoaderSystem) getBean("ClassLoaderSystem");
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/ReExportTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/ReExportTest.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/ReExportTest.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -21,6 +21,9 @@
*/
package org.jboss.test.classpool.jbosscl.test;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_C_1_URL;
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;
@@ -58,7 +61,7 @@
private void assertReExport(boolean reExport) throws Exception
{
- CLDeploymentBuilder clBuilderA = new CLDeploymentBuilder("A", JAR_A_1);
+ CLDeploymentBuilder clBuilderA = new CLDeploymentBuilder("A", JAR_A_1_URL);
clBuilderA.createModule(MODULE_A).createPackage(PACKAGE_A).setImportAll(false);
L loaderA = testScenario.createLoader(clBuilderA);
@@ -66,7 +69,7 @@
testScenario.cannotLoadClass(loaderA, CLASS_B);
testScenario.cannotLoadClass(loaderA, CLASS_C);
- CLDeploymentBuilder clBuilderB = new CLDeploymentBuilder("B", JAR_B_1);
+ CLDeploymentBuilder clBuilderB = new CLDeploymentBuilder("B", JAR_B_1_URL);
clBuilderB.createModule(MODULE_B).createPackage(PACKAGE_B).setImportAll(false);
createReExport(clBuilderB);
L loaderB = testScenario.createLoader(clBuilderB);
@@ -81,7 +84,7 @@
C classB = testScenario.loadClass(loaderB, CLASS_B);
testScenario.cannotLoadClass(loaderB, CLASS_C);
- CLDeploymentBuilder clBuilderC = new CLDeploymentBuilder("C", JAR_C_1);
+ CLDeploymentBuilder clBuilderC = new CLDeploymentBuilder("C", JAR_C_1_URL);
clBuilderC.setImportAll(false);
if (reExport)
{
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/ReplaceReferencesClassPoolTestCase.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/ReplaceReferencesClassPoolTestCase.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/ReplaceReferencesClassPoolTestCase.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -21,10 +21,11 @@
*/
package org.jboss.test.classpool.jbosscl.test;
-import static org.jboss.test.classpool.support.SupportClasses.PACKAGE_ROOT;
+import static org.jboss.test.classpool.support.SupportArchives.CHILD_JAR_URL;
+import static org.jboss.test.classpool.support.SupportArchives.PARENT_JAR_URL;
+
import java.lang.reflect.Method;
-import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
@@ -45,6 +46,7 @@
import org.jboss.classpool.spi.ClassPoolRepository;
import org.jboss.test.classpool.support.CLDeploymentBuilder;
import org.jboss.test.classpool.support.ClassPoolTestScenario;
+import org.jboss.test.classpool.support.SupportClasses;
import org.jboss.test.classpool.support.TestScenario;
import org.jboss.util.loading.Translator;
@@ -59,22 +61,6 @@
{
final static String STRING = String.class.getName();
- public final static URL JAR_PARENT = getURLRelativeToProjectRoot("/replacereferences-parent.jar");
-
- public final static URL JAR_CHILD = getURLRelativeToProjectRoot("/replacereferences-child.jar");
-
- public final static String PACKAGE_REPLACEMENT = PACKAGE_ROOT + ".replacereferences";
-
- public final static String PACKAGE_REPLACEMENT_CHILD = PACKAGE_REPLACEMENT + ".child";
-
- public final static String PACKAGE_REPLACEMENT_PARENT = PACKAGE_REPLACEMENT + ".parent";
-
- public final static String CLASS_INVOKED = PACKAGE_REPLACEMENT + ".Invoked";
-
- public final static String CLASS_PARENT_CALLER = PACKAGE_REPLACEMENT_PARENT + ".ParentCaller";
-
- public final static String CLASS_CHILD_CALLER = PACKAGE_REPLACEMENT_CHILD + ".ChildCaller";
-
public final String x = "org.jboss.test.classpool.support.excluded";
private final static Translator TRANSLATOR = new MyTranslator();
@@ -113,44 +99,44 @@
public void testParentLoadedParentDelegation() throws Exception
{
- ClassPool globalPool = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_PARENT));
- CLDeploymentBuilder childCLBuilder = new CLDeploymentBuilder("SCOPED", JAR_CHILD);
+ ClassPool globalPool = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", PARENT_JAR_URL));
+ CLDeploymentBuilder childCLBuilder = new CLDeploymentBuilder("SCOPED", CHILD_JAR_URL);
childCLBuilder.createDomain("SCOPED", true);
ClassPool scopedPool = testScenario.createLoader(childCLBuilder);
- loadClassAndRunTest(CLASS_PARENT_CALLER, globalPool.getClassLoader());
- loadClassAndRunTest(CLASS_CHILD_CALLER, scopedPool.getClassLoader());
+ loadClassAndRunTest(SupportClasses.CLASS_PARENT_CALLER, globalPool.getClassLoader());
+ loadClassAndRunTest(SupportClasses.CLASS_CHILD_CALLER, scopedPool.getClassLoader());
}
public void testParentLoadedNoParentDelegation() throws Exception
{
- ClassPool globalPool = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_PARENT));
- CLDeploymentBuilder childCLBuilder = new CLDeploymentBuilder("SCOPED", JAR_CHILD);
+ ClassPool globalPool = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", PARENT_JAR_URL));
+ CLDeploymentBuilder childCLBuilder = new CLDeploymentBuilder("SCOPED", CHILD_JAR_URL);
childCLBuilder.createDomain("SCOPED", false);
ClassPool scopedPool = testScenario.createLoader(childCLBuilder);
- loadClassAndRunTest(CLASS_PARENT_CALLER, globalPool.getClassLoader());
- loadClassAndRunTest(CLASS_CHILD_CALLER, scopedPool.getClassLoader());
+ loadClassAndRunTest(SupportClasses.CLASS_PARENT_CALLER, globalPool.getClassLoader());
+ loadClassAndRunTest(SupportClasses.CLASS_CHILD_CALLER, scopedPool.getClassLoader());
}
public void testParentNotLoadedParentDelegation() throws Exception
{
- testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_PARENT));
- CLDeploymentBuilder childCLBuilder = new CLDeploymentBuilder("SCOPED", JAR_CHILD);
+ testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", PARENT_JAR_URL));
+ CLDeploymentBuilder childCLBuilder = new CLDeploymentBuilder("SCOPED", CHILD_JAR_URL);
childCLBuilder.createDomain("SCOPED", true);
ClassPool scopedPool = testScenario.createLoader(childCLBuilder);
- loadClassAndRunTest(CLASS_CHILD_CALLER, scopedPool.getClassLoader());
+ loadClassAndRunTest(SupportClasses.CLASS_CHILD_CALLER, scopedPool.getClassLoader());
}
public void testParentNotLoadedNoParentDelegation() throws Exception
{
- testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_PARENT));
- CLDeploymentBuilder childCLBuilder = new CLDeploymentBuilder("SCOPED", JAR_CHILD);
+ testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", PARENT_JAR_URL));
+ CLDeploymentBuilder childCLBuilder = new CLDeploymentBuilder("SCOPED", CHILD_JAR_URL);
childCLBuilder.createDomain("SCOPED", false);
ClassPool scopedPool = testScenario.createLoader(childCLBuilder);
- loadClassAndRunTest(CLASS_CHILD_CALLER, scopedPool.getClassLoader());
+ loadClassAndRunTest(SupportClasses.CLASS_CHILD_CALLER, scopedPool.getClassLoader());
}
private void loadClassAndRunTest(String classname, ClassLoader loader) throws Exception
@@ -170,7 +156,7 @@
public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
ProtectionDomain protectionDomain, byte[] classfileBuffer) throws Exception
{
- if (!className.startsWith(PACKAGE_REPLACEMENT))
+ if (!className.startsWith(SupportClasses.PACKAGE_REPLACEMENT))
{
return null;
}
@@ -201,7 +187,7 @@
{
try
{
- if (!clazz.getName().startsWith(PACKAGE_REPLACEMENT))
+ if (!clazz.getName().startsWith(SupportClasses.PACKAGE_REPLACEMENT))
{
return clazz;
}
@@ -217,7 +203,7 @@
private CtClass instrumentReplaceReferences(CtClass clazz) throws Exception
{
- if (!clazz.getName().startsWith(PACKAGE_REPLACEMENT))
+ if (!clazz.getName().startsWith(SupportClasses.PACKAGE_REPLACEMENT))
{
return clazz;
}
@@ -252,7 +238,7 @@
getFieldReadWrapperName(field.getName()),
new CtClass[]{objectCt},
null,
- "{" + CLASS_INVOKED + ".invoked = true; return ((" + clazz.getName() + ")$1)." + field.getName() + ";}",
+ "{" + SupportClasses.CLASS_INVOKED + ".invoked = true; return ((" + clazz.getName() + ")$1)." + field.getName() + ";}",
clazz);
clazz.addMethod(rmethod);
@@ -264,7 +250,7 @@
getFieldWriteWrapperName(field.getName()),
new CtClass[]{objectCt, field.getType()},
null,
- "{" + CLASS_INVOKED + ".invoked = true; ((" + clazz.getName() + ")$1)." + field.getName() + "=(int)$2;}",
+ "{" + SupportClasses.CLASS_INVOKED + ".invoked = true; ((" + clazz.getName() + ")$1)." + field.getName() + "=(int)$2;}",
clazz);
clazz.addMethod(wmethod);
}
@@ -275,7 +261,7 @@
for (CtConstructor ctor : clazz.getConstructors())
{
CtMethod wrapper = CtNewMethod.make(clazz, getConstructorName(clazz), ctor.getParameterTypes(), null,
- "{" + CLASS_INVOKED + ".invoked = true; return new " + clazz.getName() + "($$);}", clazz);
+ "{" + SupportClasses.CLASS_INVOKED + ".invoked = true; return new " + clazz.getName() + "($$);}", clazz);
wrapper.setModifiers(Modifier.PUBLIC | Modifier.STATIC);
clazz.addMethod(wrapper);
}
@@ -296,7 +282,7 @@
for (String ref : refs)
{
- if (ref.startsWith(PACKAGE_REPLACEMENT_CHILD) || ref.startsWith(PACKAGE_REPLACEMENT_PARENT))
+ if (ref.startsWith(SupportClasses.PACKAGE_REPLACEMENT_CHILD) || ref.startsWith(SupportClasses.PACKAGE_REPLACEMENT_PARENT))
{
if (ref.endsWith("Caller"))
{
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/RepositoryClassPoolTestCase.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/RepositoryClassPoolTestCase.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/RepositoryClassPoolTestCase.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.classpool.jbosscl.test;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_1_URL;
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.PACKAGE_A;
@@ -65,8 +67,8 @@
public void testCanLoadArrayCtClass() throws Exception
{
- ClassPool poolA = testScenario.createLoader(new CLDeploymentBuilder("A", JAR_A_1));
- ClassPool poolB = testScenario.createLoader(new CLDeploymentBuilder("B", JAR_B_1));
+ ClassPool poolA = testScenario.createLoader(new CLDeploymentBuilder("A", JAR_A_1_URL));
+ ClassPool poolB = testScenario.createLoader(new CLDeploymentBuilder("B", JAR_B_1_URL));
accessCanLoadCtArray(poolA, poolB);
accessCanLoadCtArray(poolA, poolB);
}
@@ -105,8 +107,8 @@
public void testCreatedClassInSamePackage() throws Exception
{
- ClassPool poolA = testScenario.createLoader(new CLDeploymentBuilder("A", JAR_A_1));
- ClassPool poolB = testScenario.createLoader(new CLDeploymentBuilder("B", JAR_B_1));
+ ClassPool poolA = testScenario.createLoader(new CLDeploymentBuilder("A", JAR_A_1_URL));
+ ClassPool poolB = testScenario.createLoader(new CLDeploymentBuilder("B", JAR_B_1_URL));
ClassLoader loaderA = poolA.getClassLoader();
ClassLoader loaderB = poolB.getClassLoader();
@@ -216,12 +218,12 @@
public void testCreateClassForSystemClass() throws Exception
{
- CLDeploymentBuilder clBuilderA = new CLDeploymentBuilder("A", JAR_A_1);
+ CLDeploymentBuilder clBuilderA = new CLDeploymentBuilder("A", JAR_A_1_URL);
clBuilderA.createModule("ModuleA").createPackage(PACKAGE_A);
clBuilderA.createPackage(ClassFactory.PACKAGE).setImportAll(true);
ClassPool poolA = testScenario.createLoader(clBuilderA);
- CLDeploymentBuilder clBuilderB = new CLDeploymentBuilder("B", JAR_B_1);
+ CLDeploymentBuilder clBuilderB = new CLDeploymentBuilder("B", JAR_B_1_URL);
clBuilderB.createModule("ModuleB").createPackage(PACKAGE_B);
clBuilderB.createPackage(ClassFactory.PACKAGE).setImportAll(true);
ClassPool poolB = testScenario.createLoader(clBuilderB);
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/RepositoryTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/RepositoryTest.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/RepositoryTest.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -21,6 +21,13 @@
*/
package org.jboss.test.classpool.jbosscl.test;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_2_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_2_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_C_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_C_2_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_D_URL;
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;
@@ -50,10 +57,10 @@
public void testGlobalScope() throws Exception
{
- CLDeploymentBuilder clBuilderA = new CLDeploymentBuilder("A", JAR_A_1);
+ CLDeploymentBuilder clBuilderA = new CLDeploymentBuilder("A", JAR_A_1_URL);
L loaderA = testScenario.createLoader(clBuilderA);
- CLDeploymentBuilder clBuilderB = new CLDeploymentBuilder("B", JAR_B_1);
+ CLDeploymentBuilder clBuilderB = new CLDeploymentBuilder("B", JAR_B_1_URL);
L loaderB = testScenario.createLoader(clBuilderB);
C aFromA = testScenario.loadClass(loaderA, CLASS_A);
@@ -71,10 +78,10 @@
public void testChildDomain() throws Exception
{
- L loaderA = testScenario.createLoader(new CLDeploymentBuilder("A", JAR_A_1));
- L loaderB = testScenario.createLoader(new CLDeploymentBuilder("B", JAR_B_2));
+ L loaderA = testScenario.createLoader(new CLDeploymentBuilder("A", JAR_A_1_URL));
+ L loaderB = testScenario.createLoader(new CLDeploymentBuilder("B", JAR_B_2_URL));
- CLDeploymentBuilder childCLBuilder = new CLDeploymentBuilder("C", JAR_C_1);
+ CLDeploymentBuilder childCLBuilder = new CLDeploymentBuilder("C", JAR_C_1_URL);
childCLBuilder.createDomain("CHILD", true);
L childLoader = testScenario.createLoader(childCLBuilder);
@@ -92,11 +99,11 @@
public void testSiblingDomains() throws Exception
{
- CLDeploymentBuilder clBuilderA = new CLDeploymentBuilder("A", JAR_A_1);
+ CLDeploymentBuilder clBuilderA = new CLDeploymentBuilder("A", JAR_A_1_URL);
clBuilderA.createDomain("ChildA", true);
L loaderA = testScenario.createLoader(clBuilderA);
- CLDeploymentBuilder clBuilderB = new CLDeploymentBuilder("B", JAR_B_1);
+ CLDeploymentBuilder clBuilderB = new CLDeploymentBuilder("B", JAR_B_1_URL);
clBuilderB.createDomain("ChildB", true);
L loaderB = testScenario.createLoader(clBuilderB);
@@ -108,13 +115,13 @@
public void testChildWithNewClassesInParent() throws Exception
{
- CLDeploymentBuilder clScopedBuilder = new CLDeploymentBuilder("SCOPED", JAR_B_1);
+ CLDeploymentBuilder clScopedBuilder = new CLDeploymentBuilder("SCOPED", JAR_B_1_URL);
clScopedBuilder.createDomain("SCOPED", true);
L scopedLoader = testScenario.createLoader(clScopedBuilder);
testScenario.cannotLoadClass(scopedLoader, CLASS_A);
- L globalLoader = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_A_1));
+ L globalLoader = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_A_1_URL));
C aFromChild = testScenario.loadClass(scopedLoader, globalLoader, CLASS_A);
C aFromParent = testScenario.loadClass(globalLoader, CLASS_A);
@@ -123,9 +130,9 @@
public void testChildOverrideWithParentDelegation() throws Exception
{
- L globalLoader = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_A_1));
+ L globalLoader = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_A_1_URL));
- CLDeploymentBuilder clScopedBuilder = new CLDeploymentBuilder("SCOPED", JAR_B_1);
+ CLDeploymentBuilder clScopedBuilder = new CLDeploymentBuilder("SCOPED", JAR_B_1_URL);
clScopedBuilder.createDomain("SCOPED", true);
L scopedLoader = testScenario.createLoader(clScopedBuilder);
@@ -136,9 +143,9 @@
public void testChildOverrideWithNoParentDelegation() throws Exception
{
- L globalLoader = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_A_1));
+ L globalLoader = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_A_1_URL));
- CLDeploymentBuilder clScopedBuilder = new CLDeploymentBuilder("CHILD", JAR_A_1);
+ CLDeploymentBuilder clScopedBuilder = new CLDeploymentBuilder("CHILD", JAR_A_1_URL);
clScopedBuilder.createDomain("CHILD", false);
L scopedLoader = testScenario.createLoader(clScopedBuilder);
@@ -149,23 +156,23 @@
public void testURLChildOfGlobalUcl() throws Exception
{
- L globalLoader = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_A_1));
- L childALoader = createChildURLLoader(globalLoader, JAR_B_1);
+ L globalLoader = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_A_1_URL));
+ L childALoader = createChildURLLoader(globalLoader, JAR_B_1_URL);
testScenario.loadClass(childALoader, globalLoader, CLASS_A);
testScenario.loadClass(childALoader, CLASS_B);
- L childBLoader = createChildURLLoader(globalLoader, JAR_A_2);
+ L childBLoader = createChildURLLoader(globalLoader, JAR_A_2_URL);
testScenario.loadClass(childBLoader, globalLoader, CLASS_A);
}
public void testUndeploySibling() throws Exception
{
- L globalLoader = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_A_1));
+ L globalLoader = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_A_1_URL));
testScenario.cannotLoadClass(globalLoader, CLASS_B);
- CLDeploymentBuilder bCLBuilder = new CLDeploymentBuilder("B", JAR_B_1);
+ CLDeploymentBuilder bCLBuilder = new CLDeploymentBuilder("B", JAR_B_1_URL);
L bLoader = testScenario.createLoader(bCLBuilder);
testScenario.loadClass(globalLoader, bLoader, CLASS_B);
testScenario.destroyLoader(bCLBuilder);
@@ -175,15 +182,15 @@
public void testUndeployParentDomainClassLoader() throws Exception
{
- L globalLoaderA = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_A_1));
+ L globalLoaderA = testScenario.createLoader(new CLDeploymentBuilder("GLOBAL", JAR_A_1_URL));
testScenario.cannotLoadClass(globalLoaderA, CLASS_B);
- CLDeploymentBuilder childCLBuilder = new CLDeploymentBuilder("C", JAR_C_1);
+ CLDeploymentBuilder childCLBuilder = new CLDeploymentBuilder("C", JAR_C_1_URL);
childCLBuilder.createDomain("C", false);
L childLoader = testScenario.createLoader(childCLBuilder);
testScenario.cannotLoadClass(childLoader, CLASS_B);
- CLDeploymentBuilder globalCLBuilderB = new CLDeploymentBuilder("B", JAR_B_1);
+ CLDeploymentBuilder globalCLBuilderB = new CLDeploymentBuilder("B", JAR_B_1_URL);
L globalLoaderB = testScenario.createLoader(globalCLBuilderB);
C bFromChild = testScenario.loadClass(childLoader, globalLoaderB, CLASS_B);
@@ -197,9 +204,9 @@
public void testClassLoaderWithParentClassLoader() throws Exception
{
- L parentLoader = createChildURLLoader((L) null, JAR_B_1);
+ L parentLoader = createChildURLLoader((L) null, JAR_B_1_URL);
- CLDeploymentBuilder globalCLBuilder = new CLDeploymentBuilder("A", JAR_A_1);
+ CLDeploymentBuilder globalCLBuilder = new CLDeploymentBuilder("A", JAR_A_1_URL);
globalCLBuilder.createDomain("A", testScenario.getClassLoader(parentLoader), true);
L globalLoader = testScenario.createLoader(globalCLBuilder);
@@ -212,9 +219,9 @@
public void testClassLoaderWithParentClassLoaderAndCrossReference() throws Exception
{
- L parentLoader = createChildURLLoader(null, JAR_B_1);
+ L parentLoader = createChildURLLoader(null, JAR_B_1_URL);
- CLDeploymentBuilder globalCLBuilder = new CLDeploymentBuilder("D", JAR_D);
+ CLDeploymentBuilder globalCLBuilder = new CLDeploymentBuilder("D", JAR_D_URL);
globalCLBuilder.createDomain("D", testScenario.getClassLoader(parentLoader), true);
L globalLoader = testScenario.createLoader(globalCLBuilder);
@@ -231,17 +238,17 @@
public void testClassLoaderWithParentClassLoaderAndSameClassInDomain() throws Exception
{
- L parentLoader = createChildURLLoader(null, JAR_B_1);
+ L parentLoader = createChildURLLoader(null, JAR_B_1_URL);
String domain = "CHILD";
- CLDeploymentBuilder globalCLBuilderA = new CLDeploymentBuilder("A", JAR_A_1);
+ CLDeploymentBuilder globalCLBuilderA = new CLDeploymentBuilder("A", JAR_A_1_URL);
globalCLBuilderA.createDomain(domain, testScenario.getClassLoader(parentLoader), true);
L globalLoaderA = testScenario.createLoader(globalCLBuilderA);
testScenario.loadClass(globalLoaderA, CLASS_A);
C bFromGlobalA = testScenario.loadClass(globalLoaderA, parentLoader, CLASS_B);
- CLDeploymentBuilder globalCLBuilderB = new CLDeploymentBuilder("B", JAR_B_2);
+ CLDeploymentBuilder globalCLBuilderB = new CLDeploymentBuilder("B", JAR_B_2_URL);
globalCLBuilderB.setDomain(domain);
L globalLoaderB = testScenario.createLoader(globalCLBuilderB);
@@ -251,7 +258,7 @@
C bFromGlobalB = testScenario.loadClass(globalLoaderB, parentLoader, CLASS_B);
assertSame(bFromGlobalB, bFromParent);
- CLDeploymentBuilder globalCLBuilderC = new CLDeploymentBuilder("C", JAR_B_2);
+ CLDeploymentBuilder globalCLBuilderC = new CLDeploymentBuilder("C", JAR_B_2_URL);
globalCLBuilderC.createDomain(domain + "2", testScenario.getClassLoader(parentLoader), false);
L globalLoaderC = testScenario.createLoader(globalCLBuilderC);
testScenario.loadClass(globalLoaderC, CLASS_B);
@@ -259,15 +266,15 @@
public void testSeveralLevelsOfDomain() throws Exception
{
- L parentLoader = testScenario.createLoader(new CLDeploymentBuilder("A", JAR_A_1));
+ L parentLoader = testScenario.createLoader(new CLDeploymentBuilder("A", JAR_A_1_URL));
C aFromParent = testScenario.loadClass(parentLoader, CLASS_A);
String domain1 = "1";
- CLDeploymentBuilder clDeploymentBuilder1B = new CLDeploymentBuilder("1B", JAR_B_1);
+ CLDeploymentBuilder clDeploymentBuilder1B = new CLDeploymentBuilder("1B", JAR_B_1_URL);
clDeploymentBuilder1B.createDomain(domain1, true);
L loader1B = testScenario.createLoader(clDeploymentBuilder1B);
- CLDeploymentBuilder clDeploymentBuilder1C = new CLDeploymentBuilder("1C", JAR_C_1);
+ CLDeploymentBuilder clDeploymentBuilder1C = new CLDeploymentBuilder("1C", JAR_C_1_URL);
clDeploymentBuilder1C.setDomain(domain1);
L loader1C = testScenario.createLoader(clDeploymentBuilder1C);
@@ -284,11 +291,11 @@
String domain2 = "2";
- CLDeploymentBuilder clDeploymentBuilder2B = new CLDeploymentBuilder("2B", JAR_B_1);
+ CLDeploymentBuilder clDeploymentBuilder2B = new CLDeploymentBuilder("2B", JAR_B_1_URL);
clDeploymentBuilder2B.createDomain(domain2, true);
L loader2B = testScenario.createLoader(clDeploymentBuilder2B);
- CLDeploymentBuilder clDeploymentBuilder2C = new CLDeploymentBuilder("2C", JAR_C_1);
+ CLDeploymentBuilder clDeploymentBuilder2C = new CLDeploymentBuilder("2C", JAR_C_1_URL);
clDeploymentBuilder2C.setDomain(domain2);
L loader2C = testScenario.createLoader(clDeploymentBuilder2C);
@@ -307,24 +314,24 @@
assertNotSame(cFrom2C, cFrom1C);
final String domain11 = "11";
- CLDeploymentBuilder clBuilder11A = new CLDeploymentBuilder("11A", JAR_A_2);
+ CLDeploymentBuilder clBuilder11A = new CLDeploymentBuilder("11A", JAR_A_2_URL);
clBuilder11A.createDomain(domain11, domain1, true);
L loader11A = testScenario.createLoader(clBuilder11A);
- CLDeploymentBuilder clBuilder11B = new CLDeploymentBuilder("11B", JAR_B_2);
+ CLDeploymentBuilder clBuilder11B = new CLDeploymentBuilder("11B", JAR_B_2_URL);
clBuilder11B.setDomain(domain11);
L loader11B = testScenario.createLoader(clBuilder11B);
- CLDeploymentBuilder clBuilder11C = new CLDeploymentBuilder("11C", JAR_C_2);
+ CLDeploymentBuilder clBuilder11C = new CLDeploymentBuilder("11C", JAR_C_2_URL);
clBuilder11C.setDomain(domain11);
L loader11C = testScenario.createLoader(clBuilder11C);
String domain12 = "12";
- CLDeploymentBuilder clBuilder12A = new CLDeploymentBuilder("12A", JAR_A_2);
+ CLDeploymentBuilder clBuilder12A = new CLDeploymentBuilder("12A", JAR_A_2_URL);
clBuilder12A.createDomain(domain12, domain1, false);
L loader12A = testScenario.createLoader(clBuilder12A);
- CLDeploymentBuilder clBuilder12B = new CLDeploymentBuilder("12B", JAR_B_2);
+ CLDeploymentBuilder clBuilder12B = new CLDeploymentBuilder("12B", JAR_B_2_URL);
clBuilder12B.setDomain(domain12);
L loader12B = testScenario.createLoader(clBuilder12B);
- CLDeploymentBuilder clBuilder12C = new CLDeploymentBuilder("12C", JAR_C_2);
+ CLDeploymentBuilder clBuilder12C = new CLDeploymentBuilder("12C", JAR_C_2_URL);
clBuilder12C.setDomain(domain12);
L loader12C = testScenario.createLoader(clBuilder12C);
@@ -371,9 +378,9 @@
public void testUclLoaderOrdering() throws Exception
{
- L globalLoaderA1 = testScenario.createLoader(new CLDeploymentBuilder("A1", JAR_A_1));
- L globalLoaderA2 = testScenario.createLoader(new CLDeploymentBuilder("A2", JAR_A_1));
- L globalLoaderA3 = testScenario.createLoader(new CLDeploymentBuilder("A3", JAR_A_1));
+ L globalLoaderA1 = testScenario.createLoader(new CLDeploymentBuilder("A1", JAR_A_1_URL));
+ L globalLoaderA2 = testScenario.createLoader(new CLDeploymentBuilder("A2", JAR_A_1_URL));
+ L globalLoaderA3 = testScenario.createLoader(new CLDeploymentBuilder("A3", JAR_A_1_URL));
testScenario.loadClass(globalLoaderA1, CLASS_A);
testScenario.loadClass(globalLoaderA2, globalLoaderA1, CLASS_A);
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/UsesPackageTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/UsesPackageTest.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/jbosscl/test/UsesPackageTest.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.classpool.jbosscl.test;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_A;
import static org.jboss.test.classpool.support.SupportClasses.PACKAGE_A;
@@ -43,12 +44,12 @@
public void testUsesImport() throws Exception
{
- CLDeploymentBuilder clBuilderA1 = new CLDeploymentBuilder("A1", JAR_A_1);
+ CLDeploymentBuilder clBuilderA1 = new CLDeploymentBuilder("A1", JAR_A_1_URL);
clBuilderA1.createModule("a1").createPackage(PACKAGE_A).setImportAll(false);
L loaderA1 = testScenario.createLoader(clBuilderA1);
C classA = testScenario.loadClass(loaderA1, CLASS_A);
- CLDeploymentBuilder clBuilderA2 = new CLDeploymentBuilder("A2", JAR_A_1);
+ CLDeploymentBuilder clBuilderA2 = new CLDeploymentBuilder("A2", JAR_A_1_URL);
clBuilderA2.createModule("a2").createUsesPackage(PACKAGE_A).setImportAll(false);
L loaderA2 = testScenario.createLoader(clBuilderA2);
@@ -65,7 +66,7 @@
public void testUsesNoImport() throws Exception
{
- CLDeploymentBuilder clBuilder = new CLDeploymentBuilder("A1", JAR_A_1);
+ CLDeploymentBuilder clBuilder = new CLDeploymentBuilder("A1", JAR_A_1_URL);
clBuilder.createModule("a1").createUsesPackage(PACKAGE_A).setImportAll(false);
L loader = testScenario.createLoader(clBuilder);
testScenario.loadClass(loader, CLASS_A);
Added: 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 (rev 0)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportArchives.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -0,0 +1,140 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.classpool.support;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+
+/**
+ *
+ *
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ * @version $Revision$
+ */
+public class SupportArchives
+{
+ private static final String UTIL_JAR = "lib/util.jar";
+ private static final String EXT_JAR = "lib/ext.jar";
+ private static final String UI_JAR = "lib/ui.jar";
+ private static final String UI_UTIL_JAR = "lib/ui_util.jar";
+ private static String WAR_CP = "/WEB-INF/classes";
+
+ /************ ARCHIVE NAMES *************************************************************/
+
+ public final static String JAR_A_1 = "a1.jar";
+ public final static String JAR_A_2 = "a2.jar";
+ public final static String JAR_B_1 = "b1.jar";
+ public final static String JAR_B_2 = "b2.jar";
+ public final static String JAR_C_1 = "c1.jar";
+ public final static String JAR_C_2 = "c2.jar";
+ public final static String JAR_D = "d.jar";
+ public final static String SIMPLE_JAR = "simple.jar";
+ public final static String SIMPLE_SAR = "simple.sar";
+ public final static String EJB_JAR = "ejbs.jar";
+ public final static String SIMPLE_WAR = "simple.war";
+ public final static String SIMPLE_EAR = "simple.ear";
+ public final static String SIMPLE_EAR_JAR = SIMPLE_EAR + '/' + SIMPLE_JAR;
+ public final static String SIMPLE_EAR_SAR = SIMPLE_EAR + '/' + SIMPLE_SAR;
+ public final static String SIMPLE_EAR_EJB = SIMPLE_EAR + '/' + EJB_JAR;
+ public final static String SIMPLE_EAR_LIB1 = SIMPLE_EAR + '/' + UTIL_JAR;
+ public final static String SIMPLE_EAR_LIB2 = SIMPLE_EAR + '/' + EXT_JAR;
+ public final static String SIMPLE_EAR_WAR1 = SIMPLE_EAR + "/simple_ui.war";
+ public final static String SIMPLE_EAR_WAR1_LIB = SIMPLE_EAR_WAR1 + "/WEB-INF/" + UI_JAR;
+ public final static String SIMPLE_EAR_WAR2 = SIMPLE_EAR + "/jsfapp.war";
+ public final static String SIMPLE_EAR_WAR2_LIB = SIMPLE_EAR_WAR2 + "/WEB-INF/" + UI_UTIL_JAR;
+ public final static String TOP_EAR = "top-level.ear";
+ public final static String TOP_EAR_UTIL = TOP_EAR + '/' + UTIL_JAR;
+ public final static String TOP_EAR_EXT = TOP_EAR + '/' + EXT_JAR;
+ public final static String WAR_IN_EAR = "war-in-ear.ear";
+ public final static String WAR_IN_EAR_WAR = WAR_IN_EAR + '/' + SIMPLE_WAR;
+ public final static String JAR_IN_EAR = "jar-in-ear.ear";
+ public final static String JAR_IN_EAR_JAR = JAR_IN_EAR + '/' + SIMPLE_JAR;
+ public final static String SERVLET_JAR = "servlet.jar";
+ public final static String PTD_EAR = "ptd-ear-1.0-SNAPSHOT.ear";
+ public final static String PTD_EAR_LIB = PTD_EAR + "/lib/common.jar";
+ public final static String PTD_JSF_WAR = PTD_EAR + "/ptd-jsf-1.0-SNAPSHOT.war";
+ public final static String PTD_JSF_WAR_LIB = PTD_JSF_WAR + "/WEB-INF/lib/wj1.jar";
+ public final static String PTD_WS_WAR = PTD_EAR + "/ptd-ws-1.0-SNAPSHOT.war";
+ 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";
+ public final static String EXCLUDED_CLASSPATH = "../test-excluded-classes";
+
+ /************ CLASSPATH URLS ************************************************************/
+
+ public final static URL JAR_A_1_URL = getURL(JAR_A_1);
+ public final static URL JAR_A_2_URL = getURL(JAR_A_2);
+ public final static URL JAR_B_1_URL = getURL(JAR_B_1);
+ public final static URL JAR_B_2_URL = getURL(JAR_B_2);
+ public final static URL JAR_C_1_URL = getURL(JAR_C_1);
+ public final static URL JAR_C_2_URL = getURL(JAR_C_2);
+ public final static URL JAR_D_URL = getURL(JAR_D);
+ public final static URL SIMPLE_JAR_URL = getURL(SIMPLE_JAR);
+ public final static URL SIMPLE_SAR_URL = getURL(SIMPLE_SAR);
+ public final static URL EJB_JAR_URL = getURL(EJB_JAR);
+ public final static URL SIMPLE_WAR_CP_URL = getURL(SIMPLE_WAR + WAR_CP);
+ public final static URL SIMPLE_EAR_JAR_URL = getURL(SIMPLE_EAR_JAR);
+ public final static URL SIMPLE_EAR_SAR_URL = getURL(SIMPLE_EAR_SAR);
+ public final static URL SIMPLE_EAR_EJB_URL = getURL(SIMPLE_EAR_EJB);
+ public final static URL SIMPLE_EAR_LIB1_URL = getURL(SIMPLE_EAR_LIB1);
+ public final static URL SIMPLE_EAR_LIB2_URL = getURL(SIMPLE_EAR_LIB2);
+ public final static URL SIMPLE_EAR_WAR1_URL = getURL(SIMPLE_EAR_WAR1);
+ public final static URL SIMPLE_EAR_WAR1_CP_URL = getURL(SIMPLE_EAR_WAR1 + WAR_CP);
+ public final static URL SIMPLE_EAR_WAR1_LIB_URL = getURL(SIMPLE_EAR_WAR1_LIB);
+ public final static URL SIMPLE_EAR_WAR2_URL = getURL(SIMPLE_EAR_WAR2);
+ public final static URL SIMPLE_EAR_WAR2_CP_URL = getURL(SIMPLE_EAR_WAR2 + WAR_CP);
+ public final static URL SIMPLE_EAR_WAR2_LIB_URL = getURL(SIMPLE_EAR_WAR2_LIB);
+ public final static URL TOP_EAR_UTIL_URL = getURL(TOP_EAR_UTIL);
+ public final static URL TOP_EAR_EXT_URL = getURL(TOP_EAR_EXT);
+ public final static URL WAR_IN_EAR_WAR_URL = getURL(WAR_IN_EAR_WAR);
+ public final static URL WAR_IN_EAR_WAR_CP = getURL(WAR_IN_EAR_WAR + WAR_CP);
+ public final static URL JAR_IN_EAR_JAR_URL = getURL(JAR_IN_EAR_JAR);
+ public final static URL SERVLET_JAR_URL = getURL(SERVLET_JAR);
+ public final static URL PTD_EAR_LIB_URL = getURL(PTD_EAR_LIB);
+ public final static URL PTD_JSF_WAR_URL = getURL(PTD_JSF_WAR);
+ public final static URL PTD_JSF_WAR_LIB_URL = getURL(PTD_JSF_WAR_LIB);
+ public final static URL PTD_WS_WAR_URL = getURL(PTD_WS_WAR);
+ public final static URL PTD_WS_WAR_LIB_URL = getURL(PTD_WS_WAR_LIB);
+ public final static URL EXCLUDED_CLASSPATH_URL = getURL(EXCLUDED_CLASSPATH);
+ public final static URL PARENT_JAR_URL = getURL(PARENT_JAR);
+ public final static URL CHILD_JAR_URL = getURL(CHILD_JAR);
+
+ /** Returns the relative URL to the project root */
+ private static URL getURL(String relativePath)
+ {
+ try
+ {
+ URL url = SupportArchives.class.getProtectionDomain().getCodeSource().getLocation();
+ String location = url.toString();
+ int index = location.lastIndexOf("/target/") + "/target/".length();
+ location = location.substring(0, index) + "archives/";
+
+ location = location + relativePath;
+ return new URL(location);
+ }
+ catch (MalformedURLException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportArchives.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportClasses.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportClasses.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/support/SupportClasses.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -22,6 +22,7 @@
package org.jboss.test.classpool.support;
+
/**
*
*
@@ -30,44 +31,6 @@
*/
public class SupportClasses
{
- public final static String JAR_A_1 = "a1.jar";
- public final static String JAR_A_2 = "a2.jar";
- public final static String JAR_B_1 = "b1.jar";
- public final static String JAR_B_2 = "b2.jar";
- public final static String JAR_C_1 = "c1.jar";
- public final static String JAR_C_2 = "c2.jar";
- public final static String JAR_D = "d.jar";
- public final static String SIMPLE_JAR = "simple.jar";
- public final static String SIMPLE_SAR = "simple.sar";
- public final static String EJB_JAR = "ejbs.jar";
- public final static String SIMPLE_WAR = "simple.war/WEB-INF/classes";
- public final static String SIMPLE_EAR_JAR = "simple.ear/simple.jar";
- public final static String SIMPLE_EAR_SAR = "simple.ear/simple.sar";
- public final static String SIMPLE_EAR_EJB = "simple.ear/ejbs.jar";
- public final static String SIMPLE_EAR_LIB1 = "simple.ear/lib/util.jar";
- public final static String SIMPLE_EAR_LIB2 = "simple.ear/lib/ext.jar";
- public final static String SIMPLE_EAR_WAR1 = "simple.ear/simple_ui.war";
- public final static String SIMPLE_EAR_WAR1_CP = "simple.ear/simple_ui.war/WEB-INF/classes";
- public final static String SIMPLE_EAR_WAR1_LIB = "simple.ear/simple_ui.war/WEB-INF/lib/ui.jar";
- public final static String SIMPLE_EAR_WAR2 = "simple.ear/jsfapp.war";
- public final static String SIMPLE_EAR_WAR2_CP = "simple.ear/jsfapp.war/WEB-INF/classes";
- public final static String SIMPLE_EAR_WAR2_LIB = "simple.ear/jsfapp.war/WEB-INF/lib/ui_util.jar";
- public final static String EAR_UTIL1 = "top-level.ear/lib/util.jar";
- public final static String EAR_UTIL2 = "top-level.ear/lib/ext.jar";
- public final static String EAR_WAR = "war-in-ear.ear/simple.war";
- public final static String EAR_WAR_CP = "war-in-ear.ear/simple.war/WEB-INF/classes";
- public final static String EAR_JAR = "jar-in-ear.ear/simple.jar";
- public final static String SERVLET_JAR = "servlet.jar";
- public final static String PTD_EAR = "ptd-ear-1.0-SNAPSHOT.ear";
- public final static String PTD_EAR_LIB = "ptd-ear-1.0-SNAPSHOT.ear/lib/common.jar";
- public final static String PTD_JSF_WAR = "ptd-ear-1.0-SNAPSHOT.ear/ptd-jsf-1.0-SNAPSHOT.war";
- public final static String PTD_JSF_WAR_LIB = "ptd-ear-1.0-SNAPSHOT.ear/ptd-jsf-1.0-SNAPSHOT.war/WEB-INF/lib/wj1.jar";
- public final static String PTD_WS_WAR = "ptd-ear-1.0-SNAPSHOT.ear/ptd-ws-1.0-SNAPSHOT.war";
- public final static String PTD_WS_WAR_LIB = "ptd-ear-1.0-SNAPSHOT.ear/ptd-ws-1.0-SNAPSHOT.war/WEB-INF/lib/wj2.jar";
- public final static String EXCLUDED_CLASSPATH = "../test-excluded-classes";
- // TODO map the url to the corresponding package
- // TODO automatically replace .war by .war/WEB-INF/classes e lib???
-
public static final String PACKAGE_ROOT = SupportClasses.class.getPackage().getName() + ".excluded";
public final static String PACKAGE_A = PACKAGE_ROOT + ".a";
public final static String PACKAGE_B = PACKAGE_ROOT + ".b";
@@ -108,4 +71,11 @@
{
return SUPPORT_CLASSES;
}
+
+ public final static String PACKAGE_REPLACEMENT = PACKAGE_ROOT + ".replacereferences";
+ public final static String PACKAGE_REPLACEMENT_CHILD = PACKAGE_REPLACEMENT + ".child";
+ public final static String PACKAGE_REPLACEMENT_PARENT = PACKAGE_REPLACEMENT + ".parent";
+ public final static String CLASS_INVOKED = PACKAGE_REPLACEMENT + ".Invoked";
+ public final static String CLASS_PARENT_CALLER = PACKAGE_REPLACEMENT_PARENT + ".ParentCaller";
+ public final static String CLASS_CHILD_CALLER = PACKAGE_REPLACEMENT_CHILD + ".ChildCaller";
}
\ No newline at end of file
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ClassPoolTest.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -21,7 +21,9 @@
*/
package org.jboss.test.classpool.test;
-import java.net.MalformedURLException;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_1_URL;
+
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
@@ -44,10 +46,7 @@
* @version $Revision$
*/
public class ClassPoolTest extends AbstractTestCaseWithSetup
-{
- public final static URL JAR_A = getURLRelativeToProjectRoot(SupportClasses.JAR_A_1);
- public final static URL JAR_B = getURLRelativeToProjectRoot(SupportClasses.JAR_B_1);
-
+{
//Hard references to classloaders used for pools to avoid them being garbage collected before the test finished
private final static List<ClassLoader> loaders = new ArrayList<ClassLoader>();
@@ -56,25 +55,6 @@
super(name);
}
- protected static URL getURLRelativeToProjectRoot(String relativePath)
- {
- try
- {
- URL url = ClassPoolTest.class.getProtectionDomain().getCodeSource().getLocation();
- String location = url.toString();
- int index = location.lastIndexOf("/target/") + "/target/".length();
- location = location.substring(0, index) + "archives/";
-
- location = location + relativePath;
- return new URL(location);
- }
- catch (MalformedURLException e)
- {
- // AutoGenerated
- throw new RuntimeException(e);
- }
- }
-
public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
AbstractTestDelegate delegate = new ClassPoolTestDelegate(clazz);
@@ -95,11 +75,11 @@
ClassLoader loader = new URLClassLoader(urls);
for (URL url : urls)
{
- if (url == JAR_A)
+ if (url == JAR_A_1_URL)
{
loader.loadClass(SupportClasses.CLASS_A);
}
- else if (url == JAR_B)
+ else if (url == JAR_B_1_URL)
{
loader.loadClass(SupportClasses.CLASS_B);
}
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ParentFirstDelegatingClassPoolTestCase.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ParentFirstDelegatingClassPoolTestCase.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ParentFirstDelegatingClassPoolTestCase.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -1,5 +1,7 @@
package org.jboss.test.classpool.test;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_1_URL;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_A;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_B;
import javassist.ClassPool;
@@ -54,9 +56,9 @@
public void testClassInParentOnly() throws Exception
{
ClassPoolDomain parent = createClassPoolDomain("PARENT", null, true);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_A);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_A_1_URL);
ClassPoolDomain child = createClassPoolDomain("CHILD", parent, true);
- ClassPool childPool = createDelegatingClassPool(child, JAR_B);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_B_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessClassInParentOnly(parentPool, childPool);
@@ -91,11 +93,11 @@
public void testClassInGrandParentOnly() throws Exception
{
ClassPoolDomain grandParent = createClassPoolDomain("GRANDPARENT", null, true);
- ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A);
+ ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A_1_URL);
ClassPoolDomain parent = createClassPoolDomain("PARENT", grandParent, true);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_B);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_B_1_URL);
ClassPoolDomain child = createClassPoolDomain("CHILD", parent, true);
- ClassPool childPool = createDelegatingClassPool(child, JAR_B);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_B_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessClassInGrandParentOnly(grandParentPool, parentPool, childPool);
@@ -136,9 +138,9 @@
public void testChildNotInParent() throws Exception
{
ClassPoolDomain parent = createClassPoolDomain("PARENT", null, true);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_B);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_B_1_URL);
ClassPoolDomain child = createClassPoolDomain("CHILD", parent, true);
- ClassPool childPool = createDelegatingClassPool(child, JAR_A);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_A_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessChildNotInParent(parentPool, childPool);
@@ -163,9 +165,9 @@
public void testChildInParent() throws Exception
{
ClassPoolDomain parent = createClassPoolDomain("PARENT", null, true);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_A);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_A_1_URL);
ClassPoolDomain child = createClassPoolDomain("CHILD", parent, true);
- ClassPool childPool = createDelegatingClassPool(child, JAR_A);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_A_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessChildInParent(parentPool, childPool);
@@ -186,11 +188,11 @@
public void testChildInParentAndGrandParent() throws Exception
{
ClassPoolDomain grandParent = createClassPoolDomain("GRANDPARENT", null, true);
- ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A);
+ ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A_1_URL);
ClassPoolDomain parent = createClassPoolDomain("PARENT", grandParent, true);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_A);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_A_1_URL);
ClassPoolDomain child = createClassPoolDomain("CHILD", parent, true);
- ClassPool childPool = createDelegatingClassPool(child, JAR_B);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_B_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessChildInParentAndGrandParent(grandParentPool, parentPool, childPool);
@@ -214,11 +216,11 @@
public void testChildInParentAndGrandParentFromTop() throws Exception
{
ClassPoolDomain grandParent = createClassPoolDomain("GRANDPARENT", null, true);
- ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A);
+ ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A_1_URL);
ClassPoolDomain parent = createClassPoolDomain("PARENT", grandParent, true);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_A);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_A_1_URL);
ClassPoolDomain child = createClassPoolDomain("CHILD", parent, true);
- ClassPool childPool = createDelegatingClassPool(child, JAR_B);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_B_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessChildInParentAndGrandParentFromTop(grandParentPool, parentPool, childPool);
@@ -242,11 +244,11 @@
public void testChildInGrandParent() throws Exception
{
ClassPoolDomain grandParent = createClassPoolDomain("GRANDPARENT", null, true);
- ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A);
+ ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A_1_URL);
ClassPoolDomain parent = createClassPoolDomain("PARENT", grandParent, true);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_B);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_B_1_URL);
ClassPoolDomain child = createClassPoolDomain("CHILD", parent, true);
- ClassPool childPool = createDelegatingClassPool(child, JAR_A);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_A_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessChildInGrandParent(grandParentPool, parentPool, childPool);
@@ -270,9 +272,9 @@
public void testGenerateSameNestedClassInChildAndParent() throws Exception
{
ClassPoolDomain parent = createClassPoolDomain("PARENT", null, false);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_A);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_A_1_URL);
ClassPoolDomain child = createClassPoolDomain("CHILD", parent, true);
- ClassPool childPool = createDelegatingClassPool(child, JAR_A);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_A_1_URL);
CtClass parentA = parentPool.get(CLASS_A);
CtClass parentClazz = ClassFactory.createNested(parentA, "Test", true);
assertSame(parentPool, parentClazz.getClassPool());
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ParentLastDelegatingClassPoolTestCase.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ParentLastDelegatingClassPoolTestCase.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ParentLastDelegatingClassPoolTestCase.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -1,6 +1,8 @@
package org.jboss.test.classpool.test;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_1_URL;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_A;
import javassist.ClassPool;
import javassist.CtClass;
@@ -53,9 +55,9 @@
public void testChildInParent() throws Exception
{
AbstractClassPoolDomain parent = createClassPoolDomain("PARENT", null, false);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_A);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_A_1_URL);
AbstractClassPoolDomain child = createClassPoolDomain("CHILD", parent, false);
- ClassPool childPool = createDelegatingClassPool(child, JAR_A);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_A_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessChildInParent(parentPool, childPool);
@@ -74,11 +76,11 @@
public void testChildInGrandParent() throws Exception
{
AbstractClassPoolDomain grandParent = createClassPoolDomain("GRANDPARENT", null, false);
- ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A);
+ ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A_1_URL);
AbstractClassPoolDomain parent = createClassPoolDomain("PARENT", grandParent, false);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_B);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_B_1_URL);
AbstractClassPoolDomain child = createClassPoolDomain("CHILD", parent, false);
- ClassPool childPool = createDelegatingClassPool(child, JAR_A);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_A_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessChildInGrandParent(grandParentPool, parentPool, childPool);
@@ -100,11 +102,11 @@
public void testChildInGrandParentFromTop() throws Exception
{
AbstractClassPoolDomain grandParent = createClassPoolDomain("GRANDPARENT", null, false);
- ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A);
+ ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A_1_URL);
AbstractClassPoolDomain parent = createClassPoolDomain("PARENT", grandParent, false);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_B);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_B_1_URL);
AbstractClassPoolDomain child = createClassPoolDomain("CHILD", parent, false);
- ClassPool childPool = createDelegatingClassPool(child, JAR_A);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_A_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessChildInGrandParentFromTop(grandParentPool, parentPool, childPool);
@@ -126,11 +128,11 @@
public void testChildInSibling() throws Exception
{
AbstractClassPoolDomain parent = createClassPoolDomain("PARENT", null, false);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_A);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_A_1_URL);
AbstractClassPoolDomain childA = createClassPoolDomain("CHILDA", parent, false);
- ClassPool childPoolA = createDelegatingClassPool(childA, JAR_A);
+ ClassPool childPoolA = createDelegatingClassPool(childA, JAR_A_1_URL);
AbstractClassPoolDomain childB = createClassPoolDomain("CHILDB", parent, false);
- ClassPool childPoolB = createDelegatingClassPool(childB, JAR_A);
+ ClassPool childPoolB = createDelegatingClassPool(childB, JAR_A_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessChildInSibling(parentPool, childPoolA, childPoolB);
@@ -152,9 +154,9 @@
public void testClassInParentOnly() throws Exception
{
AbstractClassPoolDomain parent = createClassPoolDomain("PARENT", null, false);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_A);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_A_1_URL);
AbstractClassPoolDomain child = createClassPoolDomain("CHILD", parent, false);
- ClassPool childPool = createDelegatingClassPool(child, JAR_B);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_B_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessClassInParentOnly(parentPool, childPool);
@@ -173,11 +175,11 @@
public void testClassInGrandParentOnly() throws Exception
{
AbstractClassPoolDomain grandParent = createClassPoolDomain("GRANDPARENT", null, false);
- ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A);
+ ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A_1_URL);
AbstractClassPoolDomain parent = createClassPoolDomain("PARENT", grandParent, false);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_B);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_B_1_URL);
AbstractClassPoolDomain child = createClassPoolDomain("CHILD", parent, false);
- ClassPool childPool = createDelegatingClassPool(child, JAR_B);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_B_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessChildInGrandParentOnly(grandParentPool, parentPool, childPool);
@@ -199,11 +201,11 @@
public void testClassInGrandParentOnlyFromTop() throws Exception
{
AbstractClassPoolDomain grandParent = createClassPoolDomain("GRANDPARENT", null, false);
- ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A);
+ ClassPool grandParentPool = createDelegatingClassPool(grandParent, JAR_A_1_URL);
AbstractClassPoolDomain parent = createClassPoolDomain("PARENT", grandParent, false);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_B);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_B_1_URL);
AbstractClassPoolDomain child = createClassPoolDomain("CHILD", parent, false);
- ClassPool childPool = createDelegatingClassPool(child, JAR_B);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_B_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessChildInGrandParentOnlyFromTop(grandParentPool, parentPool, childPool);
@@ -225,9 +227,9 @@
public void testGenerateSameClassInChildAndParent() throws Exception
{
AbstractClassPoolDomain parent = createClassPoolDomain("PARENT", null, false);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_A);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_A_1_URL);
AbstractClassPoolDomain child = createClassPoolDomain("CHILD", parent, false);
- ClassPool childPool = createDelegatingClassPool(child, JAR_A);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_A_1_URL);
CtClass parentClazz = ClassFactory.create(parentPool, "test.Test");
assertSame(parentClazz, parentPool.get("test.Test"));
assertSame(parentPool, parentClazz.getClassPool());
@@ -244,9 +246,9 @@
public void testGenerateSameNestedClassInChildAndParent() throws Exception
{
AbstractClassPoolDomain parent = createClassPoolDomain("PARENT", null, false);
- ClassPool parentPool = createDelegatingClassPool(parent, JAR_A);
+ ClassPool parentPool = createDelegatingClassPool(parent, JAR_A_1_URL);
AbstractClassPoolDomain child = createClassPoolDomain("CHILD", parent, false);
- ClassPool childPool = createDelegatingClassPool(child, JAR_A);
+ ClassPool childPool = createDelegatingClassPool(child, JAR_A_1_URL);
CtClass parentA = parentPool.get(CLASS_A);
CtClass parentClazz = ClassFactory.createNested(parentA, "Test", true);
assertSame(parentPool, parentClazz.getClassPool());
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ScopedSiblingDelegatingClassPoolTestCase.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ScopedSiblingDelegatingClassPoolTestCase.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/ScopedSiblingDelegatingClassPoolTestCase.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -1,5 +1,7 @@
package org.jboss.test.classpool.test;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_1_URL;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_A;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_B;
import javassist.ClassPool;
@@ -53,9 +55,9 @@
{
ClassPoolDomain root = createClassPoolDomain("ROOT", null, false);
ClassPoolDomain domainA = createClassPoolDomain("A", root, false);
- ClassPool poolA = createDelegatingClassPool(domainA, JAR_A);
+ ClassPool poolA = createDelegatingClassPool(domainA, JAR_A_1_URL);
ClassPoolDomain domainB = createClassPoolDomain("B", root, false);
- ClassPool poolB = createDelegatingClassPool(domainB, JAR_B);
+ ClassPool poolB = createDelegatingClassPool(domainB, JAR_B_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessNoVisibilityBetweenSiblings(poolA, poolB);
@@ -91,9 +93,9 @@
{
ClassPoolDomain root = createClassPoolDomain("ROOT", null, false);
ClassPoolDomain domainA = createClassPoolDomain("A", root, false);
- ClassPool poolA = createDelegatingClassPool(domainA, JAR_A, JAR_B);
+ ClassPool poolA = createDelegatingClassPool(domainA, JAR_A_1_URL, JAR_B_1_URL);
ClassPoolDomain domainB = createClassPoolDomain("B", root, false);
- ClassPool poolB = createDelegatingClassPool(domainB, JAR_B, JAR_A);
+ ClassPool poolB = createDelegatingClassPool(domainB, JAR_B_1_URL, JAR_A_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessUsesOwnCopy(poolA, poolB);
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/SimpleDelegatingClassPoolTestCase.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/SimpleDelegatingClassPoolTestCase.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/test/SimpleDelegatingClassPoolTestCase.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -1,5 +1,7 @@
package org.jboss.test.classpool.test;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_1_URL;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_A;
import static org.jboss.test.classpool.support.SupportClasses.CLASS_B;
import javassist.ClassPool;
@@ -51,7 +53,7 @@
public void testAllClassesOnePool() throws Exception
{
ClassPoolDomain domain = createClassPoolDomain("SIMPLE", null, false);
- ClassPool pool = createDelegatingClassPool(domain, JAR_A, JAR_B);
+ ClassPool pool = createDelegatingClassPool(domain, JAR_A_1_URL, JAR_B_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessAllClassesOnePool(pool);
@@ -73,8 +75,8 @@
public void testOnePoolPerClassLoadedByA() throws Exception
{
ClassPoolDomain domain = createClassPoolDomain("SIMPLE", null, false);
- ClassPool poolA = createDelegatingClassPool(domain, JAR_A);
- ClassPool poolB = createDelegatingClassPool(domain, JAR_B);
+ ClassPool poolA = createDelegatingClassPool(domain, JAR_A_1_URL);
+ ClassPool poolB = createDelegatingClassPool(domain, JAR_B_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessOnePoolPerClassLoadedByA(poolA, poolB);
@@ -94,8 +96,8 @@
public void testOnePoolPerClassLoadedByB() throws Exception
{
ClassPoolDomain domain = createClassPoolDomain("SIMPLE", null, false);
- ClassPool poolA = createDelegatingClassPool(domain, JAR_A);
- ClassPool poolB = createDelegatingClassPool(domain, JAR_B);
+ ClassPool poolA = createDelegatingClassPool(domain, JAR_A_1_URL);
+ ClassPool poolB = createDelegatingClassPool(domain, JAR_B_1_URL);
//The first time we access the pool it will create the classes, second time will use the cache
accessOnePoolPerClassLoadedByB(poolA, poolB);
@@ -115,8 +117,8 @@
public void testCanLoadArrrayCtClass() throws Exception
{
ClassPoolDomain domain = createClassPoolDomain("SIMPLE", null, false);
- ClassPool poolA = createDelegatingClassPool(domain, JAR_A);
- ClassPool poolB = createDelegatingClassPool(domain, JAR_B);
+ ClassPool poolA = createDelegatingClassPool(domain, JAR_A_1_URL);
+ ClassPool poolB = createDelegatingClassPool(domain, JAR_B_1_URL);
accessCanLoadCtArray(poolA, poolB);
accessCanLoadCtArray(poolA, poolB);
}
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclClassLoaderSanityTestCase.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclClassLoaderSanityTestCase.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclClassLoaderSanityTestCase.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -21,6 +21,11 @@
*/
package org.jboss.test.classpool.ucl.test;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_2_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_2_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_C_1_URL;
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;
@@ -53,8 +58,8 @@
ClassLoader clB = null;
try
{
- clA = createGlobalClassLoader(JAR_A_1);
- clB = createGlobalClassLoader(JAR_B_1);
+ clA = createGlobalClassLoader(JAR_A_1_URL);
+ clB = createGlobalClassLoader(JAR_B_1_URL);
try
{
Class<?> aFromA = clA.loadClass(CLASS_A);
@@ -91,9 +96,9 @@
ClassLoader clC = null;
try
{
- clA = createGlobalClassLoader(JAR_A_1);
- clB = createGlobalClassLoader(JAR_B_1);
- clC = createChildClassLoader(JAR_C_1, false);
+ clA = createGlobalClassLoader(JAR_A_1_URL);
+ clB = createGlobalClassLoader(JAR_B_1_URL);
+ clC = createChildClassLoader(JAR_C_1_URL, false);
Class<?> aFromA = clA.loadClass(CLASS_A);
assertNotNull(aFromA);
@@ -124,8 +129,8 @@
public void testSiblingDomains() throws Exception
{
- ClassLoader clA = createChildClassLoader(JAR_A_1, true);
- ClassLoader clB = createChildClassLoader(JAR_B_1, false);
+ ClassLoader clA = createChildClassLoader(JAR_A_1_URL, true);
+ ClassLoader clB = createChildClassLoader(JAR_B_1_URL, false);
Class<?> clazzA = clA.loadClass(CLASS_A);
assertSame(clA, clazzA.getClassLoader());
@@ -141,10 +146,10 @@
ClassLoader clScoped = null;
try
{
- clScoped = createChildClassLoader(JAR_B_1, true);
+ clScoped = createChildClassLoader(JAR_B_1_URL, true);
assertCannotLoadClass(clScoped, CLASS_A);
- clGlobal = createGlobalClassLoader(JAR_A_1);
+ clGlobal = createGlobalClassLoader(JAR_A_1_URL);
Class<?> aFromChild = clScoped.loadClass(CLASS_A);
assertNotNull(aFromChild);
Class<?> aFromParent = clGlobal.loadClass(CLASS_A);
@@ -163,8 +168,8 @@
ClassLoader clGlobal = null;
try
{
- clGlobal = createGlobalClassLoader(JAR_A_1);
- ClassLoader clScoped = createChildClassLoader(JAR_A_2, true);
+ clGlobal = createGlobalClassLoader(JAR_A_1_URL);
+ ClassLoader clScoped = createChildClassLoader(JAR_A_2_URL, true);
Class<?> aFromParent = clGlobal.loadClass(CLASS_A);
assertNotNull(aFromParent);
Class<?> aFromChild = clScoped.loadClass(CLASS_A);
@@ -183,8 +188,8 @@
ClassLoader clGlobal = null;
try
{
- clGlobal = createGlobalClassLoader(JAR_A_1);
- ClassLoader clScoped = createChildClassLoader(JAR_A_2, false);
+ clGlobal = createGlobalClassLoader(JAR_A_1_URL);
+ ClassLoader clScoped = createChildClassLoader(JAR_A_2_URL, false);
Class<?> aFromParent = clGlobal.loadClass(CLASS_A);
assertNotNull(aFromParent);
Class<?> aFromChild = clScoped.loadClass(CLASS_A);
@@ -204,15 +209,15 @@
ClassLoader clGlobal = null;
try
{
- clGlobal = createGlobalClassLoader(JAR_A_1);
- ClassLoader clChildA = createChildURLClassLoader(clGlobal, JAR_B_1);
+ clGlobal = createGlobalClassLoader(JAR_A_1_URL);
+ ClassLoader clChildA = createChildURLClassLoader(clGlobal, JAR_B_1_URL);
Class<?> aFromA = clChildA.loadClass(CLASS_A);
assertSame(clGlobal, aFromA.getClassLoader());
Class<?> bFromA = clChildA.loadClass(CLASS_B);
assertSame(clChildA, bFromA.getClassLoader());
- ClassLoader clChildB = createChildURLClassLoader(clGlobal, JAR_A_2);
+ ClassLoader clChildB = createChildURLClassLoader(clGlobal, JAR_A_2_URL);
Class<?> aFromB = clChildB.loadClass(CLASS_A);
assertSame(clGlobal, aFromB.getClassLoader());
}
@@ -230,10 +235,10 @@
{
try
{
- clA = createGlobalClassLoader(JAR_A_1);
+ clA = createGlobalClassLoader(JAR_A_1_URL);
assertCannotLoadClass(clA, CLASS_B);
- clB = createGlobalClassLoader(JAR_B_1);
+ clB = createGlobalClassLoader(JAR_B_1_URL);
Class<?> bFromA = clA.loadClass(CLASS_B);
assertSame(clB, bFromA.getClassLoader());
}
@@ -285,11 +290,11 @@
public void testUclWithParentClassLoader() throws Exception
{
- ClassLoader parent = createChildURLClassLoader(null, JAR_B_1);
+ ClassLoader parent = createChildURLClassLoader(null, JAR_B_1_URL);
ClassLoader global = null;
try
{
- global = createGlobalClassLoaderWithParent(JAR_A_1, parent);
+ global = createGlobalClassLoaderWithParent(JAR_A_1_URL, parent);
Class<?> aFromGlobal = global.loadClass(CLASS_A);
assertSame(global, aFromGlobal.getClassLoader());
Class<?> bFromGlobal = global.loadClass(CLASS_B);
@@ -306,16 +311,16 @@
public void testUclWithParentClassLoaderAndSameClassInDomain() throws Exception
{
- ClassLoader parent = createChildURLClassLoader(null, JAR_B_1);
+ ClassLoader parent = createChildURLClassLoader(null, JAR_B_1_URL);
ClassLoader globalA = null;
ClassLoader globalB = null;
try
{
- globalA = createGlobalClassLoaderWithParent(JAR_A_1, parent);
+ globalA = createGlobalClassLoaderWithParent(JAR_A_1_URL, parent);
Class<?> aFromGlobal = globalA.loadClass(CLASS_A);
assertSame(globalA, aFromGlobal.getClassLoader());
- globalB = createGlobalClassLoader(JAR_B_2);
+ globalB = createGlobalClassLoader(JAR_B_2_URL);
Class<?> bFromGlobalA = globalA.loadClass(CLASS_B);
assertSame(globalB, bFromGlobalA.getClassLoader());
Class<?> bFromParent = parent.loadClass(CLASS_B);
@@ -336,9 +341,9 @@
ClassLoader globalC = null;
try
{
- globalA = createGlobalClassLoader(JAR_A_1);
- globalB = createGlobalClassLoader(JAR_A_1);
- globalC = createGlobalClassLoader(JAR_A_1);
+ globalA = createGlobalClassLoader(JAR_A_1_URL);
+ globalB = createGlobalClassLoader(JAR_A_1_URL);
+ globalC = createGlobalClassLoader(JAR_A_1_URL);
Class<?> aFromA = globalA.loadClass(CLASS_A);
Class<?> aFromB = globalB.loadClass(CLASS_A);
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclClassPoolTest.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclClassPoolTest.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclClassPoolTest.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -44,6 +44,7 @@
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.test.AbstractTestCaseWithSetup;
import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.classpool.support.SupportArchives;
import org.jboss.test.classpool.support.SupportClasses;
import org.jboss.test.classpool.ucl.support.ParentLastURLClassLoader;
@@ -55,13 +56,6 @@
@SuppressWarnings("all")
public class UclClassPoolTest extends AbstractTestCaseWithSetup
{
- public final static URL JAR_A_1 = getURLRelativeToProjectRoot(SupportClasses.JAR_A_1);
- public final static URL JAR_A_2 = getURLRelativeToProjectRoot(SupportClasses.JAR_A_2);
- public final static URL JAR_B_1 = getURLRelativeToProjectRoot(SupportClasses.JAR_B_1);
- public final static URL JAR_B_2 = getURLRelativeToProjectRoot(SupportClasses.JAR_B_2);
- public final static URL JAR_C_1 = getURLRelativeToProjectRoot(SupportClasses.JAR_C_1);
- public final static URL JAR_C_2 = getURLRelativeToProjectRoot(SupportClasses.JAR_C_2);
-
private MBeanServer server;
private LoaderRepository globalRepository;
@@ -107,25 +101,6 @@
delegate.enableSecurity = enableSecurity;
return delegate;
}
-
- protected static URL getURLRelativeToProjectRoot(String relativePath)
- {
- try
- {
- URL url = UclClassPoolTest.class.getProtectionDomain().getCodeSource().getLocation();
- String location = url.toString();
- int index = location.lastIndexOf("/target/") + "/target/".length();
- location = location.substring(0, index) + "archives/";
-
- location = location + relativePath;
- return new URL(location);
- }
- catch (MalformedURLException e)
- {
- // AutoGenerated
- throw new RuntimeException(e);
- }
- }
@Override
protected void setUp() throws Exception
Modified: projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclDelegatingClassPoolTestCase.java
===================================================================
--- projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclDelegatingClassPoolTestCase.java 2009-12-01 22:52:38 UTC (rev 97263)
+++ projects/jboss-classpool/trunk/src/test/java/org/jboss/test/classpool/ucl/test/UclDelegatingClassPoolTestCase.java 2009-12-01 22:53:47 UTC (rev 97264)
@@ -21,6 +21,11 @@
*/
package org.jboss.test.classpool.ucl.test;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_A_2_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_1_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_B_2_URL;
+import static org.jboss.test.classpool.support.SupportArchives.JAR_C_1_URL;
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;
@@ -64,8 +69,8 @@
{
try
{
- globalA = createGlobalClassPool(JAR_A_1);
- globalB = createGlobalClassPool(JAR_B_1);
+ globalA = createGlobalClassPool(JAR_A_1_URL);
+ globalB = createGlobalClassPool(JAR_B_1_URL);
//Call twice to ensure that we hit the cache as well as creating the CtClases
accessGlobalScope(globalA, globalB);
@@ -106,9 +111,9 @@
ClassPool poolC = null;
try
{
- poolA = createGlobalClassPool(JAR_A_1);
- poolB = createGlobalClassPool(JAR_B_1);
- poolC = createChildClassPool(JAR_C_1, false);
+ poolA = createGlobalClassPool(JAR_A_1_URL);
+ poolB = createGlobalClassPool(JAR_B_1_URL);
+ poolC = createChildClassPool(JAR_C_1_URL, false);
//Call twice to ensure that we hit the cache as well as creating the CtClases
accessChildDomain(poolA, poolB, poolC);
@@ -147,8 +152,8 @@
public void testSiblingDomains() throws Exception
{
- ClassPool poolA = createChildClassPool(JAR_A_1, true);
- ClassPool poolB = createChildClassPool(JAR_B_1, false);
+ ClassPool poolA = createChildClassPool(JAR_A_1_URL, true);
+ ClassPool poolB = createChildClassPool(JAR_B_1_URL, false);
try
{
@@ -177,10 +182,10 @@
ClassPool scopedPool = null;
try
{
- scopedPool = createChildClassPool(JAR_B_1, true);
+ scopedPool = createChildClassPool(JAR_B_1_URL, true);
assertCannotLoadCtClass(scopedPool, CLASS_A);
- globalPool = createGlobalClassPool(JAR_A_1);
+ globalPool = createGlobalClassPool(JAR_A_1_URL);
CtClass aFromChild = scopedPool.get(CLASS_A);
assertNotNull(aFromChild);
CtClass aFromParent = globalPool.get(CLASS_A);
@@ -204,8 +209,8 @@
ClassPool scopedPool = null;
try
{
- globalPool = createGlobalClassPool(JAR_A_1);
- scopedPool = createChildClassPool(JAR_A_2, true);
+ globalPool = createGlobalClassPool(JAR_A_1_URL);
+ scopedPool = createChildClassPool(JAR_A_2_URL, true);
CtClass aFromParent = globalPool.get(CLASS_A);
assertNotNull(aFromParent);
CtClass aFromChild = scopedPool.get(CLASS_A);
@@ -226,8 +231,8 @@
ClassPool scopedPool = null;
try
{
- globalPool = createGlobalClassPool(JAR_A_1);
- scopedPool = createChildClassPool(JAR_A_2, false);
+ globalPool = createGlobalClassPool(JAR_A_1_URL);
+ scopedPool = createChildClassPool(JAR_A_2_URL, false);
CtClass aFromParent = globalPool.get(CLASS_A);
assertNotNull(aFromParent);
CtClass aFromChild = scopedPool.get(CLASS_A);
@@ -250,8 +255,8 @@
ClassPool childB = null;
try
{
- globalPool = createGlobalClassPool(JAR_A_1);
- childA = createChildURLClassPool(globalPool, JAR_B_1);
+ globalPool = createGlobalClassPool(JAR_A_1_URL);
+ childA = createChildURLClassPool(globalPool, JAR_B_1_URL);
//Try loading A from child first
CtClass aFromA = childA.get(CLASS_A);
@@ -266,7 +271,7 @@
assertSame(childA, bFromA.getClassPool());
//Should get the cached copy from the parent
- childB = createChildURLClassPool(globalPool, JAR_A_2);
+ childB = createChildURLClassPool(globalPool, JAR_A_2_URL);
CtClass aFromB = childB.get(CLASS_A);
assertSame(globalPool, aFromB.getClassPool());
}
@@ -286,8 +291,8 @@
ClassPool childB = null;
try
{
- globalPool = createGlobalClassPool(JAR_A_1);
- childA = createChildURLClassPoolParentLast(globalPool, JAR_B_1);
+ globalPool = createGlobalClassPool(JAR_A_1_URL);
+ childA = createChildURLClassPoolParentLast(globalPool, JAR_B_1_URL);
//Try loading A from child first
CtClass aFromA = childA.get(CLASS_A);
@@ -302,7 +307,7 @@
assertSame(childA, bFromA.getClassPool());
//Should get the child copy
- childB = createChildURLClassPoolParentLast(globalPool, JAR_A_2);
+ childB = createChildURLClassPoolParentLast(globalPool, JAR_A_2_URL/* TODO why can't I use JARA1_URL instead?/*JAR_A_1_URL*/);
CtClass aFromB = childB.get(CLASS_A);
assertSame(childB, aFromB.getClassPool());
}
@@ -322,9 +327,9 @@
ClassPool childB = null;
try
{
- globalPoolA = createGlobalClassPool(JAR_A_1);
- globalPoolB = createGlobalClassPool(JAR_B_1);
- childC = createChildURLClassPool(globalPoolA, JAR_C_1);
+ globalPoolA = createGlobalClassPool(JAR_A_1_URL);
+ globalPoolB = createGlobalClassPool(JAR_B_1_URL);
+ childC = createChildURLClassPool(globalPoolA, JAR_C_1_URL);
//Try loading A from child first
CtClass bFromC = childC.get(CLASS_B);
@@ -339,7 +344,7 @@
assertSame(childC, cFromC.getClassPool());
//Should get the cached copy from the parent
- childB = createChildURLClassPool(globalPoolA, JAR_B_2);
+ childB = createChildURLClassPool(globalPoolA, JAR_B_2_URL);
CtClass bFromB = childB.get(CLASS_B);
assertSame(globalPoolB, bFromB.getClassPool());
}
@@ -360,10 +365,10 @@
{
try
{
- poolA = createGlobalClassPool(JAR_A_1);
+ poolA = createGlobalClassPool(JAR_A_1_URL);
assertCannotLoadCtClass(poolA, CLASS_B);
- poolB = createGlobalClassPool(JAR_B_1);
+ poolB = createGlobalClassPool(JAR_B_1_URL);
CtClass bFromA = poolA.get(CLASS_B);
assertSame(poolB, bFromA.getClassPool());
}
@@ -420,8 +425,8 @@
ClassPool global = null;
try
{
- parent = createChildURLClassPool(null, JAR_B_1);
- global = createGlobalClassPoolWithParent(JAR_A_1, parent);
+ parent = createChildURLClassPool(null, JAR_B_1_URL);
+ global = createGlobalClassPoolWithParent(JAR_A_1_URL, parent);
CtClass aFromGlobal = global.get(CLASS_A);
assertSame(global, aFromGlobal.getClassPool());
@@ -453,15 +458,15 @@
ClassPool globalB = null;
try
{
- parent = createChildURLClassPool(null, JAR_B_1);
- globalA = createGlobalClassPoolWithParent(JAR_A_1, parent);
+ parent = createChildURLClassPool(null, JAR_B_1_URL);
+ globalA = createGlobalClassPoolWithParent(JAR_A_1_URL, parent);
CtClass aFromGlobal = globalA.get(CLASS_A);
assertSame(globalA, aFromGlobal.getClassPool());
CtClass aFromGlobal2 = globalA.get(CLASS_A);
assertSame(aFromGlobal, aFromGlobal2);
- globalB = createGlobalClassPool(JAR_B_2);
+ globalB = createGlobalClassPool(JAR_B_2_URL);
CtClass bFromGlobalA = globalA.get(CLASS_B);
assertSame(globalB, bFromGlobalA.getClassPool());
CtClass bFromGlobalA2 = globalA.get(CLASS_B);
@@ -491,9 +496,9 @@
{
final String PARENT = "parent.Parent";
final String CHILD = "child.Child";
- parent = createChildURLClassPool(null, JAR_B_1);
- global = createGlobalClassPoolWithParent(JAR_A_1, parent);
- child = createChildURLClassPool(global, JAR_C_1);
+ parent = createChildURLClassPool(null, JAR_B_1_URL);
+ global = createGlobalClassPoolWithParent(JAR_A_1_URL, parent);
+ child = createChildURLClassPool(global, JAR_C_1_URL);
assertCannotLoadCtClass(parent, PARENT);
assertCannotLoadCtClass(global, PARENT);
@@ -554,9 +559,9 @@
ClassPool child = null;
try
{
- globalA = createGlobalClassPool(JAR_A_1);
- globalB = createGlobalClassPool(JAR_B_1);
- child = createChildURLClassPool(globalA, JAR_C_1);
+ globalA = createGlobalClassPool(JAR_A_1_URL);
+ globalB = createGlobalClassPool(JAR_B_1_URL);
+ child = createChildURLClassPool(globalA, JAR_C_1_URL);
final String A_CLASS = "a.Clazz";
final String B_CLASS = "b.Clazz";
@@ -621,9 +626,9 @@
ClassPool globalC = null;
try
{
- globalA = createGlobalClassPool(JAR_A_1);
- globalB = createGlobalClassPool(JAR_A_1);
- globalC = createGlobalClassPool(JAR_A_1);
+ globalA = createGlobalClassPool(JAR_A_1_URL);
+ globalB = createGlobalClassPool(JAR_A_1_URL);
+ globalC = createGlobalClassPool(JAR_A_1_URL);
CtClass aFromA = globalA.get(CLASS_A);
CtClass aFromB = globalB.get(CLASS_A);
@@ -646,8 +651,8 @@
ClassPool globalPoolB = null;
try
{
- globalPoolA = createGlobalClassPool(JAR_A_1);
- globalPoolB = createGlobalClassPool(JAR_B_1);
+ globalPoolA = createGlobalClassPool(JAR_A_1_URL);
+ globalPoolB = createGlobalClassPool(JAR_B_1_URL);
ClassLoader loaderA = globalPoolA.getClassLoader();
ClassLoader loaderB = globalPoolB.getClassLoader();
@@ -719,8 +724,8 @@
ClassPool globalPoolB = null;
try
{
- globalPoolA = createGlobalClassPool(JAR_A_1);
- globalPoolB = createGlobalClassPool(JAR_B_1);
+ globalPoolA = createGlobalClassPool(JAR_A_1_URL);
+ globalPoolB = createGlobalClassPool(JAR_B_1_URL);
ClassLoader loaderA = globalPoolA.getClassLoader();
ClassLoader loaderB = globalPoolB.getClassLoader();
More information about the jboss-cvs-commits
mailing list