[jboss-cvs] JBossAS SVN: r101528 - in projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency: support/d and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 26 06:52:34 EST 2010
Author: alesj
Date: 2010-02-26 06:52:33 -0500 (Fri, 26 Feb 2010)
New Revision: 101528
Added:
projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/
projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/D.java
Removed:
projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/D.java
Modified:
projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java
projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/test/MockResourceVisitorUnitTestCase.java
Log:
Port additional tests.
Copied: projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d (from rev 101526, projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d)
Deleted: projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/D.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/D.java 2010-02-26 11:27:12 UTC (rev 101526)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/D.java 2010-02-26 11:52:33 UTC (rev 101528)
@@ -1,32 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.classloading.dependency.support.d;
-
-/**
- * D.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class D
-{
-}
Copied: projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/D.java (from rev 101526, projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/D.java)
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/D.java (rev 0)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/D.java 2010-02-26 11:52:33 UTC (rev 101528)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.classloading.dependency.support.d;
+
+/**
+ * D.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class D
+{
+}
Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java 2010-02-26 11:43:26 UTC (rev 101527)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java 2010-02-26 11:52:33 UTC (rev 101528)
@@ -21,14 +21,22 @@
*/
package org.jboss.test.classloading.dependency.test;
-import junit.framework.Test;
-
+import org.jboss.classloader.spi.ClassLoaderDomain;
+import org.jboss.classloader.spi.ClassLoaderSystem;
+import org.jboss.classloader.spi.ParentPolicy;
+import org.jboss.classloader.spi.filter.ClassFilterUtils;
+import org.jboss.classloader.spi.filter.PackageClassFilter;
import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
+import org.jboss.classloading.spi.metadata.ExportAll;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.test.classloading.dependency.support.a.A;
import org.jboss.test.classloading.dependency.support.b.B;
+import org.jboss.test.classloading.dependency.support.c.C;
+import org.jboss.test.classloading.dependency.support.d.D;
+import junit.framework.Test;
+
/**
* HierarchicalDomainUnitTestCase.
*
@@ -467,4 +475,117 @@
}
assertNoClassLoader(contextB);
}
+
+ public void testExplicitRequirementsInDefaultDomain() throws Exception
+ {
+ testExplicitRequirementsInDomain(ClassLoaderSystem.DEFAULT_DOMAIN_NAME, true, true);
+ }
+
+ public void testExplicitRequirementsInNewDomain() throws Exception
+ {
+ testExplicitRequirementsInDomain("SomeNewDomain", false, false);
+ }
+
+ public void testExplicitRequirementsInNewDomainWithJavaOnly() throws Exception
+ {
+ String domainName = "SomeNewDomain";
+ ClassLoaderDomain domain = system.createAndRegisterDomain(domainName, ParentPolicy.BEFORE_BUT_JAVA_ONLY, system.getDefaultDomain());
+ try
+ {
+ testExplicitRequirementsInDomain(domainName, true, true);
+ }
+ finally
+ {
+ system.unregisterDomain(domain);
+ }
+ }
+
+ public void testExplicitRequirementsInNewDomainWithFilter() throws Exception
+ {
+ String domainName = "SomeNewDomain";
+ ParentPolicy parentPolicy = new ParentPolicy(new PackageClassFilter(new String[]{D.class.getPackage().getName()}), ClassFilterUtils.NOTHING);
+ ClassLoaderDomain domain = system.createAndRegisterDomain(domainName, parentPolicy, system.getDefaultDomain());
+ try
+ {
+ testExplicitRequirementsInDomain(domainName, true, false);
+ }
+ finally
+ {
+ system.unregisterDomain(domain);
+ }
+ }
+
+ protected void testExplicitRequirementsInDomain(String domain, boolean failC, boolean failD) throws Exception
+ {
+ ClassLoadingMetaDataFactory factory = ClassLoadingMetaDataFactory.getInstance();
+ MockClassLoadingMetaData c = new MockClassLoadingMetaData("c");
+ c.setPathsAndPackageNames(C.class, D.class);
+ c.setImportAll(true);
+ c.setExportAll(ExportAll.NON_EMPTY);
+ KernelControllerContext contextC = install(c);
+ try
+ {
+ MockClassLoadingMetaData b = new MockClassLoadingMetaData("b");
+ b.setDomain(domain);
+ b.setPathsAndPackageNames(B.class);
+ b.getRequirements().addRequirement(factory.createRequirePackage(A.class.getPackage().getName()));
+ KernelControllerContext contextB = install(b);
+ try
+ {
+ assertNoClassLoader(contextB);
+
+ MockClassLoadingMetaData a = new MockClassLoadingMetaData("a");
+ a.setDomain(domain);
+ a.setPathsAndPackageNames(A.class);
+ a.getCapabilities().addCapability(factory.createPackage(A.class.getPackage().getName()));
+ KernelControllerContext contextA = install(a);
+ try
+ {
+ ClassLoader clA = assertClassLoader(contextA);
+ assertLoadClass(A.class, clA);
+ assertLoadClassFail(B.class, clA);
+
+ ClassLoader clB = assertClassLoader(contextB);
+ assertLoadClass(A.class, clA);
+ assertLoadClass(B.class, clB);
+
+ ClassLoader clC = assertClassLoader(contextC);
+ assertLoadClass(C.class, clC);
+ if (ClassLoaderSystem.DEFAULT_DOMAIN_NAME.equals(domain))
+ {
+ assertLoadClass(A.class, clC, clA);
+ assertLoadClass(B.class, clC, clB);
+ }
+ else
+ {
+ assertLoadClassFail(A.class, clC);
+ assertLoadClassFail(B.class, clC);
+ }
+
+ if (failC)
+ assertLoadClassFail(C.class.getName(), clB);
+ else
+ assertLoadClass(C.class.getName(), clB, clC);
+
+ if (failD)
+ assertLoadClassFail(D.class.getName(), clB);
+ else
+ assertLoadClass(D.class.getName(), clB, clC);
+ }
+ finally
+ {
+ uninstall(contextA);
+ }
+ }
+ finally
+ {
+ uninstall(contextB);
+ }
+ assertNoClassLoader(contextB);
+ }
+ finally
+ {
+ uninstall(contextC);
+ }
+ }
}
Modified: projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/test/MockResourceVisitorUnitTestCase.java
===================================================================
--- projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/test/MockResourceVisitorUnitTestCase.java 2010-02-26 11:43:26 UTC (rev 101527)
+++ projects/jboss-cl/branches/Branch_2_0/classloading/src/test/java/org/jboss/test/classloading/dependency/test/MockResourceVisitorUnitTestCase.java 2010-02-26 11:52:33 UTC (rev 101528)
@@ -25,14 +25,13 @@
import java.util.HashSet;
import java.util.Set;
-import junit.framework.Test;
import org.jboss.classloader.plugins.ClassLoaderUtils;
import org.jboss.classloader.spi.filter.PackageClassFilter;
import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoaderPolicyModule;
import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
+import org.jboss.classloading.spi.visitor.ResourceContext;
import org.jboss.classloading.spi.visitor.ResourceFilter;
import org.jboss.classloading.spi.visitor.ResourceVisitor;
-import org.jboss.classloading.spi.visitor.ResourceContext;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.test.classloading.dependency.support.MockFederatedResourceVisitor;
import org.jboss.test.classloading.dependency.support.MockFilteredResourceVisitor;
@@ -41,7 +40,10 @@
import org.jboss.test.classloading.dependency.support.a.A;
import org.jboss.test.classloading.dependency.support.b.B;
import org.jboss.test.classloading.dependency.support.c.C;
+import org.jboss.test.classloading.dependency.support.d.D;
+import junit.framework.Test;
+
/**
* MockResourceVisitorUnitTestCase.
*
@@ -54,6 +56,7 @@
ClassLoaderUtils.packageNameToPath(A.class.getName()),
ClassLoaderUtils.packageNameToPath(B.class.getName()),
ClassLoaderUtils.packageNameToPath(C.class.getName()),
+ ClassLoaderUtils.packageNameToPath(D.class.getName()),
};
private static String[] classes = new String[]
@@ -61,6 +64,7 @@
ClassLoaderUtils.classNameToPath(A.class),
ClassLoaderUtils.classNameToPath(B.class),
ClassLoaderUtils.classNameToPath(C.class),
+ ClassLoaderUtils.classNameToPath(D.class),
};
public static Test suite()
@@ -84,7 +88,10 @@
{
MockClassLoadingMetaData a = createClassLoadingMetaData("a");
a.setIncluded(new PackageClassFilter(new String[]{A.class.getPackage().getName(), B.class.getPackage().getName()}));
- testMockClassLoadingMetaData(a);
+ Set<String> resources = new HashSet<String>(Arrays.asList(classes));
+ resources.remove(ClassLoaderUtils.classNameToPath(C.class));
+ resources.remove(ClassLoaderUtils.classNameToPath(D.class));
+ testMockClassLoadingMetaData(a, new MockResourceVisitor(), resources);
}
public void testExcluded() throws Exception
More information about the jboss-cvs-commits
mailing list