[jboss-cvs] JBossAS SVN: r96123 - in projects/jboss-deployers/trunk/deployers-vfs/src/test: resources/reflect and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-11-07 14:16:20 -0500 (Sat, 07 Nov 2009)
New Revision: 96123

Added:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/clmd/
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/clmd/META-INF/
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/clmd/META-INF/clmd-beans.xml
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/clmd/META-INF/jboss-classloading.xml
Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ClassPoolTestCase.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java
Log:
More CLMD tests.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ClassPoolTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ClassPoolTestCase.java	2009-11-07 18:56:22 UTC (rev 96122)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ClassPoolTestCase.java	2009-11-07 19:16:20 UTC (rev 96123)
@@ -182,15 +182,24 @@
       }
    }
 
-
    public void testHierarchyNonDeploymentModule() throws Exception
    {
+      testHierarchy("tif");
+   }
+
+   public void testClassLoadingMetaDataModule() throws Exception
+   {
+      testHierarchy("clmd");
+   }
+
+   public void testHierarchy(String name) throws Exception
+   {
       URL location = AnyServlet.class.getProtectionDomain().getCodeSource().getLocation();
       System.setProperty("jboss.tests.url", location.toExternalForm());
       try
       {
          AssembledDirectory jar = createJar();
-         addPath(jar, "/reflect/tif", "META-INF");
+         addPath(jar, "/reflect/" + name, "META-INF");
 
          Deployment deployment = createVFSDeployment(jar);
          DeployerClient main = getDeployerClient();

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java	2009-11-07 18:56:22 UTC (rev 96122)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java	2009-11-07 19:16:20 UTC (rev 96123)
@@ -248,12 +248,22 @@
 
    public void testHierarchyNonDeploymentModule() throws Exception
    {
+      testHierarchy("tif");
+   }
+
+   public void testClassLoadingMetaDataModule() throws Exception
+   {
+      testHierarchy("clmd");
+   }
+
+   public void testHierarchy(String name) throws Exception
+   {
       URL location = AnyServlet.class.getProtectionDomain().getCodeSource().getLocation();
       System.setProperty("jboss.tests.url", location.toExternalForm());
       try
       {
          AssembledDirectory jar = createJar();
-         addPath(jar, "/reflect/tif", "META-INF");
+         addPath(jar, "/reflect/" + name, "META-INF");
 
          Deployment deployment = createVFSDeployment(jar);
          DeployerClient main = getDeployerClient();

Copied: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/clmd/META-INF/clmd-beans.xml (from rev 96122, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/tif/META-INF/tif-beans.xml)
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/clmd/META-INF/clmd-beans.xml	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/clmd/META-INF/clmd-beans.xml	2009-11-07 19:16:20 UTC (rev 96123)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <classloader name="anys-classloader" xmlns="urn:jboss:classloader:1.0">
+    <requirements>
+      <package name="org.jboss.test.deployers.vfs.reflect.support.jar"/>
+    </requirements>
+    <capabilities>
+      <package name="org.jboss.test.deployers.vfs.reflect.support.web"/>
+    </capabilities>
+    <root>${jboss.tests.url}</root>
+  </classloader>
+
+  <classloader name="tif-classloader" xmlns="urn:jboss:classloader:1.0">
+    <requirements>
+      <package name="org.jboss.test.deployers.vfs.reflect.support.web"/>
+    </requirements>
+    <capabilities>
+      <package name="org.jboss.test.deployers.vfs.reflect.support.tif"/>
+    </capabilities>
+    <root>${jboss.tests.url}</root>
+  </classloader>
+
+  <bean name="AnyServlet" class="org.jboss.test.deployers.vfs.reflect.support.web.AnyServlet">
+    <classloader><inject bean="anys-classloader:0.0.0"/></classloader>
+  </bean>
+
+  <bean name="TifTester" class="org.jboss.test.deployers.vfs.reflect.support.tif.TIFTester">
+    <classloader><inject bean="tif-classloader:0.0.0"/></classloader>
+  </bean>
+
+</deployment>

Added: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/clmd/META-INF/jboss-classloading.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/clmd/META-INF/jboss-classloading.xml	                        (rev 0)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/reflect/clmd/META-INF/jboss-classloading.xml	2009-11-07 19:16:20 UTC (rev 96123)
@@ -0,0 +1,5 @@
+<classloading xmlns="urn:jboss:classloading:1.0">
+  <capabilities>
+    <package name="org.jboss.test.deployers.vfs.reflect.support.jar"/>
+  </capabilities>
+</classloading>