[jboss-cvs] JBossAS SVN: r101525 - in projects/jboss-cl/trunk/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:27:09 EST 2010


Author: alesj
Date: 2010-02-26 06:27:08 -0500 (Fri, 26 Feb 2010)
New Revision: 101525

Added:
   projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/
   projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/D.java
Modified:
   projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java
   projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/MockResourceVisitorUnitTestCase.java
Log:
Test/example of filtered policy, along with requirements.

Added: projects/jboss-cl/trunk/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	                        (rev 0)
+++ projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/support/d/D.java	2010-02-26 11:27:08 UTC (rev 101525)
@@ -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/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java	2010-02-26 09:08:59 UTC (rev 101524)
+++ projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/HierarchicalDomainUnitTestCase.java	2010-02-26 11:27:08 UTC (rev 101525)
@@ -25,6 +25,8 @@
 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;
@@ -32,6 +34,7 @@
 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;
 
 /**
  * HierarchicalDomainUnitTestCase.
@@ -475,21 +478,21 @@
 
    public void testExplicitRequirementsInDefaultDomain() throws Exception
    {
-      testExplicitRequirementsInDomain(ClassLoaderSystem.DEFAULT_DOMAIN_NAME, true);
+      testExplicitRequirementsInDomain(ClassLoaderSystem.DEFAULT_DOMAIN_NAME, true, true);
    }
 
    public void testExplicitRequirementsInNewDomain() throws Exception
    {
-      testExplicitRequirementsInDomain("SomeNewDomain", false);
+      testExplicitRequirementsInDomain("SomeNewDomain", false, false);
    }
 
-   public void testExplicitRequirementsInNewDomainWithFilter() throws Exception
+   public void testExplicitRequirementsInNewDomainWithJavaOnly() throws Exception
    {
       String domainName = "SomeNewDomain";
       ClassLoaderDomain domain = system.createAndRegisterDomain(domainName, ParentPolicy.BEFORE_BUT_JAVA_ONLY, system.getDefaultDomain());
       try
       {
-         testExplicitRequirementsInDomain(domainName, true);
+         testExplicitRequirementsInDomain(domainName, true, true);
       }
       finally
       {
@@ -497,11 +500,26 @@
       }
    }
 
-   protected void testExplicitRequirementsInDomain(String domain, boolean fail) throws Exception
+   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);
+      c.setPathsAndPackageNames(C.class, D.class);
       c.setImportAll(true);
       c.setExportAll(ExportAll.NON_EMPTY);
       KernelControllerContext contextC = install(c);
@@ -544,10 +562,15 @@
                   assertLoadClassFail(B.class, clC);
                }
 
-               if (fail)
+               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
             {

Modified: projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/MockResourceVisitorUnitTestCase.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/MockResourceVisitorUnitTestCase.java	2010-02-26 09:08:59 UTC (rev 101524)
+++ projects/jboss-cl/trunk/classloading/src/test/java/org/jboss/test/classloading/dependency/test/MockResourceVisitorUnitTestCase.java	2010-02-26 11:27:08 UTC (rev 101525)
@@ -21,18 +21,14 @@
  */
 package org.jboss.test.classloading.dependency.test;
 
-import java.util.Arrays;
-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 +37,12 @@
 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 java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * MockResourceVisitorUnitTestCase.
  *
@@ -54,6 +55,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 +63,7 @@
       ClassLoaderUtils.classNameToPath(A.class),
       ClassLoaderUtils.classNameToPath(B.class),
       ClassLoaderUtils.classNameToPath(C.class),
+      ClassLoaderUtils.classNameToPath(D.class),
    };
 
    public static Test suite()
@@ -84,7 +87,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