[jboss-cvs] JBossAS SVN: r72735 - in projects/jboss-cl/trunk: classloading/src/main/org/jboss/classloading/spi/dependency/policy/mock and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Apr 25 12:32:18 EDT 2008


Author: alesj
Date: 2008-04-25 12:32:18 -0400 (Fri, 25 Apr 2008)
New Revision: 72735

Added:
   projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/support/MockResourceVisitor.java
   projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/MockResourceVisitorUnitTestCase.java
Modified:
   projects/jboss-cl/trunk/classloader/src/main/org/jboss/classloader/plugins/ClassLoaderUtils.java
   projects/jboss-cl/trunk/classloading/src/main/org/jboss/classloading/spi/dependency/policy/mock/MockClassLoaderPolicyModule.java
   projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/DependencyTestSuite.java
   projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/AbstractMockClassLoaderUnitTest.java
Log:
Initial resource visitor tests.

Modified: projects/jboss-cl/trunk/classloader/src/main/org/jboss/classloader/plugins/ClassLoaderUtils.java
===================================================================
--- projects/jboss-cl/trunk/classloader/src/main/org/jboss/classloader/plugins/ClassLoaderUtils.java	2008-04-25 15:44:12 UTC (rev 72734)
+++ projects/jboss-cl/trunk/classloader/src/main/org/jboss/classloader/plugins/ClassLoaderUtils.java	2008-04-25 16:32:18 UTC (rev 72735)
@@ -59,10 +59,27 @@
     */
    public static final String classNameToPath(final String className)
    {
+      if (className == null)
+         throw new IllegalArgumentException("Null className");
+
       return className.replace('.', '/') + ".class";
    }
 
    /**
+    * Convert a class into a path
+    *
+    * @param clazz the class
+    * @return the path
+    */
+   public static final String classNameToPath(final Class<?> clazz)
+   {
+      if (clazz == null)
+         throw new IllegalArgumentException("Null class");
+
+      return classNameToPath(clazz.getName());
+   }
+
+   /**
     * Convert a resource name to a class name
     * 
     * @param resourceName the resource name

Modified: projects/jboss-cl/trunk/classloading/src/main/org/jboss/classloading/spi/dependency/policy/mock/MockClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/main/org/jboss/classloading/spi/dependency/policy/mock/MockClassLoaderPolicyModule.java	2008-04-25 15:44:12 UTC (rev 72734)
+++ projects/jboss-cl/trunk/classloading/src/main/org/jboss/classloading/spi/dependency/policy/mock/MockClassLoaderPolicyModule.java	2008-04-25 16:32:18 UTC (rev 72735)
@@ -21,14 +21,22 @@
 */
 package org.jboss.classloading.spi.dependency.policy.mock;
 
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.jboss.classloader.spi.filter.ClassFilter;
 import org.jboss.classloader.test.support.MockClassLoaderHelper;
 import org.jboss.classloader.test.support.MockClassLoaderPolicy;
 import org.jboss.classloading.spi.dependency.policy.ClassLoaderPolicyModule;
 import org.jboss.classloading.spi.metadata.Capability;
 import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
+import org.jboss.classloading.spi.visitor.ResourceContext;
+import org.jboss.classloading.spi.visitor.ResourceFilter;
+import org.jboss.classloading.spi.visitor.ResourceVisitor;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
 
@@ -54,6 +62,68 @@
       super(classLoadingMetaData, contextName);
    }
 
+   /**
+    * Get collection from string array.
+    *
+    * @param strings the strings
+    * @return string collection
+    */
+   private static Collection<String> toCollection(String[] strings)
+   {
+      if (strings == null || strings.length == 0)
+         return Collections.emptySet();
+      else
+         return Arrays.asList(strings);
+   }
+
+   /**
+    * Get URL for path param.
+    *
+    * @param path the path
+    * @return path's URL
+    */
+   protected URL getURL(String path)
+   {
+      ClassLoader classLoader = getClassLoader();
+      if (classLoader == null)
+         throw new IllegalStateException("ClassLoader has not been constructed for " + getContextName());
+
+      return classLoader.getResource(path);
+   }
+
+   public void visit(ResourceVisitor visitor, ResourceFilter filter)
+   {
+      MockClassLoadingMetaData mclmd = getClassLoadingMetaData();
+      String[] paths = mclmd.getPaths();
+      if (paths != null && paths.length > 0)
+      {
+         ClassLoader classLoader = getClassLoader();
+         if (classLoader == null)
+            throw new IllegalStateException("ClassLoader has not been constructed for " + getContextName());
+
+         Collection<String> included = toCollection(mclmd.getIncludedClasses());
+         ClassFilter includedFilter = getIncluded();
+         Collection<String> excluded = toCollection(mclmd.getExcludedClasses());
+         ClassFilter excludedFilter = getExcluded();
+
+         for (String path : paths)
+         {
+            if (included.isEmpty() == false && included.contains(path) == false)
+               continue;
+            if (includedFilter != null && includedFilter.matchesResourcePath(path) == false)
+               continue;
+            if (excluded.isEmpty() == false && excluded.contains(path))
+               continue;
+            if (excludedFilter != null && excludedFilter.matchesResourcePath(path))
+               continue;
+
+            ResourceContext context = new ResourceContext(getURL(path), path, classLoader);
+            if (filter == null || filter.accepts(context))
+               visitor.visit(context);
+         }
+      }
+   }
+
    @Override
    protected List<Capability> determineCapabilities()
    {

Modified: projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/DependencyTestSuite.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/DependencyTestSuite.java	2008-04-25 15:44:12 UTC (rev 72734)
+++ projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/DependencyTestSuite.java	2008-04-25 16:32:18 UTC (rev 72735)
@@ -34,6 +34,7 @@
 import org.jboss.test.classloading.dependency.test.ReExportModuleUnitTestCase;
 import org.jboss.test.classloading.dependency.test.ReExportPackageUnitTestCase;
 import org.jboss.test.classloading.dependency.test.UsesPackageUnitTestCase;
+import org.jboss.test.classloading.dependency.test.MockResourceVisitorUnitTestCase;
 
 /**
  * Version Test Suite.
@@ -71,7 +72,8 @@
       suite.addTest(ReExportModuleUnitTestCase.suite());
       suite.addTest(ReExportPackageUnitTestCase.suite());
       suite.addTest(UsesPackageUnitTestCase.suite());
-      
+      suite.addTest(MockResourceVisitorUnitTestCase.suite());
+
       return suite;
    }
 }

Added: projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/support/MockResourceVisitor.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/support/MockResourceVisitor.java	                        (rev 0)
+++ projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/support/MockResourceVisitor.java	2008-04-25 16:32:18 UTC (rev 72735)
@@ -0,0 +1,52 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, 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.classloading.dependency.support;
+
+import java.util.Set;
+import java.util.HashSet;
+
+import org.jboss.classloading.spi.visitor.ResourceContext;
+import org.jboss.classloading.spi.visitor.ResourceFilter;
+import org.jboss.classloading.spi.visitor.ResourceVisitor;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class MockResourceVisitor implements ResourceVisitor
+{
+   private Set<String> resources = new HashSet<String>();
+
+   public ResourceFilter getFilter()
+   {
+      return null;
+   }
+
+   public void visit(ResourceContext resource)
+   {
+      resources.add(resource.getResourceName());
+   }
+
+   public Set<String> getResources()
+   {
+      return resources;
+   }
+}

Modified: projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/AbstractMockClassLoaderUnitTest.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/AbstractMockClassLoaderUnitTest.java	2008-04-25 15:44:12 UTC (rev 72734)
+++ projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/AbstractMockClassLoaderUnitTest.java	2008-04-25 16:32:18 UTC (rev 72735)
@@ -21,14 +21,8 @@
  */
 package org.jboss.test.classloading.dependency.test;
 
-import java.util.Collections;
-
 import junit.framework.Test;
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.InstallCallbackMetaData;
-import org.jboss.beans.metadata.plugins.UninstallCallbackMetaData;
 import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.beans.metadata.spi.CallbackMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.classloader.plugins.system.DefaultClassLoaderSystem;
 import org.jboss.classloader.spi.ClassLoaderDomain;
@@ -54,8 +48,6 @@
  */
 public abstract class AbstractMockClassLoaderUnitTest extends AbstractClassLoadingTest
 {
-   private Kernel kernel;
-   
    private KernelController controller;
 
    protected ClassLoaderSystem system;
@@ -106,11 +98,16 @@
    
    protected KernelControllerContext install(MockClassLoadingMetaData metaData) throws Exception
    {
+      return install(metaData, MockClassLoaderPolicyModule.class);
+   }
+
+   protected KernelControllerContext install(MockClassLoadingMetaData metaData, Class<? extends MockClassLoaderPolicyModule> clazz) throws Exception
+   {
       // Determine some properties
       String contextName = metaData.getName() + ":" + metaData.getVersion().toString(); 
       
       // Create the module
-      BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(contextName, MockClassLoaderPolicyModule.class.getName());
+      BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(contextName, clazz.getName());
       builder.addConstructorParameter(MockClassLoadingMetaData.class.getName(), metaData);
       builder.addConstructorParameter(String.class.getName(), contextName);
       builder.setNoClassLoader();
@@ -147,7 +144,7 @@
       // Bootstrap the kernel
       AbstractBootstrap bootstrap = new BasicBootstrap();
       bootstrap.run();
-      kernel = bootstrap.getKernel();
+      Kernel kernel = bootstrap.getKernel();
       controller = kernel.getController();
 
       system = new DefaultClassLoaderSystem();
@@ -155,19 +152,10 @@
       defaultDomain.setParentPolicy(ParentPolicy.BEFORE_BUT_JAVA_ONLY);
 
       BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("ClassLoading", ClassLoading.class.getName());
-      BeanMetaData beanMetaData = builder.getBeanMetaData();
-      
-      // TODO Add in/uncallbacks to the builder
-      AbstractBeanMetaData abmd = (AbstractBeanMetaData) beanMetaData;
-      InstallCallbackMetaData install = new InstallCallbackMetaData();
-      install.setMethodName("addModule");
-      install.setDependentState(ControllerState.CONFIGURED);
-      abmd.setInstallCallbacks(Collections.singletonList((CallbackMetaData) install));
-      UninstallCallbackMetaData uninstall = new UninstallCallbackMetaData();
-      uninstall.setMethodName("removeModule");
-      uninstall.setDependentState(ControllerState.CONFIGURED);
-      abmd.setUninstallCallbacks(Collections.singletonList((CallbackMetaData) uninstall));
-      install(beanMetaData);
+      builder.addMethodInstallCallback("addModule", null, null, ControllerState.CONFIGURED, null);
+      builder.addMethodUninstallCallback("removeModule", null, null, ControllerState.CONFIGURED, null);
+
+      install(builder.getBeanMetaData());
    }
 
    protected void tearDown() throws Exception

Copied: projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/MockResourceVisitorUnitTestCase.java (from rev 72628, projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/MockClassLoadingMetaDataUnitTestCase.java)
===================================================================
--- projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/MockResourceVisitorUnitTestCase.java	                        (rev 0)
+++ projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/MockResourceVisitorUnitTestCase.java	2008-04-25 16:32:18 UTC (rev 72735)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.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.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.classloading.dependency.support.MockResourceVisitor;
+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;
+
+/**
+ * MockResourceVisitorUnitTestCase.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class MockResourceVisitorUnitTestCase extends AbstractMockClassLoaderUnitTest
+{
+   private static String[] paths = new String[]
+   {
+      ClassLoaderUtils.classNameToPath(A.class),
+      ClassLoaderUtils.classNameToPath(B.class),
+      ClassLoaderUtils.classNameToPath(C.class),
+   };
+
+   public static Test suite()
+   {
+      return suite(MockResourceVisitorUnitTestCase.class);
+   }
+
+   public MockResourceVisitorUnitTestCase(String name)
+   {
+      super(name);
+   }
+
+   protected MockClassLoadingMetaData createClassLoadingMetaData(String name)
+   {
+      MockClassLoadingMetaData clmd = new MockClassLoadingMetaData(name);
+      clmd.setPaths(paths);
+      return clmd;
+   }
+
+   public void testIncluded() throws Exception
+   {
+      MockClassLoadingMetaData a = createClassLoadingMetaData("a");
+      a.setIncluded(new PackageClassFilter(new String[]{A.class.getPackage().getName(), B.class.getPackage().getName()}));
+      KernelControllerContext contextA = install(a);
+      try
+      {
+         MockClassLoaderPolicyModule module = assertModule(contextA);
+         module.registerClassLoaderPolicy(system);
+
+         MockResourceVisitor visitor = new MockResourceVisitor();
+         module.visit(visitor);
+
+         Set<String> resources = new HashSet<String>(Arrays.asList(paths));
+         resources.remove(ClassLoaderUtils.classNameToPath(C.class));
+         assertEquals(resources, visitor.getResources());
+      }
+      finally
+      {
+         uninstall(contextA);
+      }
+      assertNoModule(contextA);
+   }
+
+   public void testExcluded() throws Exception
+   {
+      MockClassLoadingMetaData a = createClassLoadingMetaData("a");
+      a.setExcluded(new PackageClassFilter(new String[]{C.class.getPackage().getName()}));
+      KernelControllerContext contextA = install(a);
+      try
+      {
+         MockClassLoaderPolicyModule module = assertModule(contextA);
+         module.registerClassLoaderPolicy(system);
+
+         MockResourceVisitor visitor = new MockResourceVisitor();
+         module.visit(visitor);
+
+         Set<String> resources = new HashSet<String>(Arrays.asList(paths));
+         resources.remove(ClassLoaderUtils.classNameToPath(C.class));
+         assertEquals(resources, visitor.getResources());
+      }
+      finally
+      {
+         uninstall(contextA);
+      }
+      assertNoModule(contextA);
+   }
+}
\ No newline at end of file




More information about the jboss-cvs-commits mailing list