[jboss-cvs] JBossAS SVN: r72861 - in projects/jboss-deployers/trunk: deployers-impl and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 29 04:54:05 EDT 2008
Author: alesj
Date: 2008-04-29 04:54:05 -0400 (Tue, 29 Apr 2008)
New Revision: 72861
Added:
projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockResourceVisitorDeployerUnitTestCase.java
Modified:
projects/jboss-deployers/trunk/build/pom.xml
projects/jboss-deployers/trunk/deployers-impl/pom.xml
projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java
projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java
projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java
projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java
Log:
[JBDEPLOY-13]; abstract resource visitor deployer tests.
Modified: projects/jboss-deployers/trunk/build/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/build/pom.xml 2008-04-29 08:38:51 UTC (rev 72860)
+++ projects/jboss-deployers/trunk/build/pom.xml 2008-04-29 08:54:05 UTC (rev 72861)
@@ -32,6 +32,7 @@
<version.jboss.vfs>2.0.0-SNAPSHOT</version.jboss.vfs>
<version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
<version.junit>4.4</version.junit>
+ <version.javassist>3.7.1.GA</version.javassist>
</properties>
<build>
@@ -300,6 +301,11 @@
<artifactId>jboss-aop</artifactId>
<version>${version.jboss.aop}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${version.javassist}</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
Modified: projects/jboss-deployers/trunk/deployers-impl/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/pom.xml 2008-04-29 08:38:51 UTC (rev 72860)
+++ projects/jboss-deployers/trunk/deployers-impl/pom.xml 2008-04-29 08:54:05 UTC (rev 72861)
@@ -74,6 +74,10 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss.deployers</groupId>
Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java 2008-04-29 08:38:51 UTC (rev 72860)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java 2008-04-29 08:54:05 UTC (rev 72861)
@@ -77,17 +77,28 @@
{
if (forceAnnotations)
throw new RuntimeException(e);
- else if (log.isTraceEnabled())
- log.trace("Exception reading resource: " + resource.getResourceName(), e);
+
+ logThrowable(resource, e);
}
catch (Throwable t)
{
- if (log.isTraceEnabled())
- log.trace("Exception reading resource: " + resource.getResourceName(), t);
+ logThrowable(resource, t);
}
}
/**
+ * Log throwable.
+ *
+ * @param resource the resource we're visiting
+ * @param t the throwable
+ */
+ protected void logThrowable(ResourceContext resource, Throwable t)
+ {
+ if (log.isTraceEnabled())
+ log.trace("Exception reading resource: " + resource.getResourceName(), t);
+ }
+
+ /**
* Handle CtClass for annotations.
*
* @param ctClass the ct class instance
Modified: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java 2008-04-29 08:38:51 UTC (rev 72860)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/DeployersClassLoadingTestSuite.java 2008-04-29 08:54:05 UTC (rev 72861)
@@ -28,6 +28,7 @@
import org.jboss.test.deployers.classloading.test.MockClassLoaderDependenciesUnitTestCase;
import org.jboss.test.deployers.classloading.test.SubDeploymentMockClassLoaderUnitTestCase;
import org.jboss.test.deployers.classloading.test.UndeployOrderClassLoaderUnitTestCase;
+import org.jboss.test.deployers.classloading.test.MockResourceVisitorDeployerUnitTestCase;
/**
* Deployers Deployer Test Suite.
@@ -49,6 +50,7 @@
suite.addTest(MockClassLoaderDependenciesUnitTestCase.suite());
suite.addTest(UndeployOrderClassLoaderUnitTestCase.suite());
suite.addTest(SubDeploymentMockClassLoaderUnitTestCase.suite());
+ suite.addTest(MockResourceVisitorDeployerUnitTestCase.suite());
return suite;
}
Modified: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java 2008-04-29 08:38:51 UTC (rev 72860)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/support/MockDeploymentClassLoaderPolicyModule.java 2008-04-29 08:54:05 UTC (rev 72861)
@@ -22,14 +22,22 @@
package org.jboss.test.deployers.classloading.support;
import java.util.List;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Arrays;
import java.util.concurrent.CopyOnWriteArrayList;
+import java.net.URL;
import org.jboss.classloader.test.support.MockClassLoaderHelper;
import org.jboss.classloader.test.support.MockClassLoaderPolicy;
+import org.jboss.classloader.spi.filter.ClassFilter;
import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
import org.jboss.classloading.spi.metadata.Capability;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaDataFactory;
+import org.jboss.classloading.spi.visitor.ResourceVisitor;
+import org.jboss.classloading.spi.visitor.ResourceFilter;
+import org.jboss.classloading.spi.visitor.ResourceContext;
import org.jboss.deployers.plugins.classloading.AbstractDeploymentClassLoaderPolicyModule;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -115,4 +123,66 @@
policy.setDelegates(getDelegates());
return policy;
}
+
+ /**
+ * 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);
+ }
+ }
+ }
}
Modified: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java 2008-04-29 08:38:51 UTC (rev 72860)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/ClassLoaderDependenciesTest.java 2008-04-29 08:54:05 UTC (rev 72861)
@@ -43,6 +43,7 @@
import org.jboss.deployers.plugins.classloading.AbstractClassLoaderDescribeDeployer;
import org.jboss.deployers.spi.attachments.MutableAttachments;
import org.jboss.deployers.spi.attachments.PredeterminedManagedObjectAttachments;
+import org.jboss.deployers.spi.deployer.Deployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.test.deployers.AbstractDeployerTest;
import org.jboss.test.deployers.classloading.support.MockClassLoaderDescribeDeployer;
@@ -217,7 +218,7 @@
assertNull("Did not expect domain " + name, system.getDomain(name));
}
- protected DeployerClient getMainDeployer()
+ protected DeployerClient getMainDeployer(Deployer... deployers)
{
ClassLoading classLoading = new ClassLoading();
system = new DefaultClassLoaderSystem();
@@ -230,6 +231,15 @@
deployer2.setClassLoading(classLoading);
deployer2.setSystem(system);
+ if (deployers != null && deployers.length > 0)
+ {
+ Deployer[] allDeployers = new Deployer[deployers.length + 2];
+ allDeployers[0] = deployer1;
+ allDeployers[1] = deployer2;
+ System.arraycopy(deployers, 0, allDeployers, 2, deployers.length);
+ return createMainDeployer(allDeployers);
+ }
+
return createMainDeployer(deployer1, deployer2);
}
}
Modified: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java 2008-04-29 08:38:51 UTC (rev 72860)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java 2008-04-29 08:54:05 UTC (rev 72861)
@@ -32,7 +32,7 @@
import org.jboss.test.deployers.classloading.support.b.B;
/**
- * HeuristicAllOrNothingUnitTestCase.
+ * MockClassLoaderDependenciesUnitTestCase.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
Copied: projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockResourceVisitorDeployerUnitTestCase.java (from rev 72857, projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockClassLoaderDependenciesUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockResourceVisitorDeployerUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/trunk/deployers-impl/src/tests/org/jboss/test/deployers/classloading/test/MockResourceVisitorDeployerUnitTestCase.java 2008-04-29 08:54:05 UTC (rev 72861)
@@ -0,0 +1,134 @@
+/*
+* 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.deployers.classloading.test;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.jboss.classloader.plugins.ClassLoaderUtils;
+import org.jboss.classloading.spi.visitor.ResourceContext;
+import org.jboss.classloading.spi.visitor.ResourceFilter;
+import org.jboss.classloading.spi.visitor.ResourceVisitor;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.plugins.classloading.AbstractResourceVisitorDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.test.deployers.classloading.support.a.A;
+
+/**
+ * MockResourceVisitorDeployerUnitTestCase.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class MockResourceVisitorDeployerUnitTestCase extends ClassLoaderDependenciesTest
+{
+ private final Set<String> resources = new HashSet<String>();
+ private ResourceVisitor visitor = new ResourceVisitor()
+ {
+ public ResourceFilter getFilter()
+ {
+ return null;
+ }
+
+ public void visit(ResourceContext resource)
+ {
+ resources.add(resource.getResourceName());
+ }
+ };
+
+ public static Test suite()
+ {
+ return new TestSuite(MockResourceVisitorDeployerUnitTestCase.class);
+ }
+
+ public MockResourceVisitorDeployerUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testSimpleResourceVisitor() throws Exception
+ {
+ DeployerClient deployer = getMainDeployer(new AbstractResourceVisitorDeployer(visitor));
+ testResourceVisitor(deployer);
+ }
+
+ public void testCreateResourceVisitor() throws Exception
+ {
+ DeployerClient deployer = getMainDeployer(new AbstractResourceVisitorDeployer()
+ {
+ protected ResourceVisitor createVisitor(DeploymentUnit unit)
+ {
+ return visitor;
+ }
+ });
+ testResourceVisitor(deployer);
+ }
+
+ public void testResourceVisitorWithFilter() throws Exception
+ {
+ DeployerClient deployer = getMainDeployer(new AbstractResourceVisitorDeployer()
+ {
+ protected ResourceVisitor createVisitor(DeploymentUnit unit)
+ {
+ return visitor;
+ }
+
+ protected ResourceFilter createFilter(DeploymentUnit unit)
+ {
+ return new ResourceFilter()
+ {
+ public boolean accepts(ResourceContext resource)
+ {
+ return resource.getResourceName().equals(ClassLoaderUtils.packageNameToPath(A.class.getName()));
+ }
+ };
+ }
+ });
+ testResourceVisitor(deployer);
+ }
+
+ protected void testResourceVisitor(DeployerClient deployer) throws Exception
+ {
+ Deployment deployment = createSimpleDeployment(NameA);
+ addClassLoadingMetaData(deployment, deployment.getName(), null, A.class);
+
+ DeploymentUnit unit = assertDeploy(deployer, deployment);
+ try
+ {
+ assertEquals(A, deployer2.deployed);
+ assertEquals(NONE, deployer2.undeployed);
+
+ ClassLoader cl = unit.getClassLoader();
+ assertLoadClass(cl, A.class);
+
+ String expectedPath = ClassLoaderUtils.packageNameToPath(A.class.getName());
+ assertEquals(expectedPath, resources.iterator().next());
+ }
+ finally
+ {
+ resources.clear();
+ assertUndeploy(deployer, deployment);
+ }
+ }
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list