[jboss-cvs] JBossAS SVN: r96129 - projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test.

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

Author: alesj
Date: 2009-11-08 06:36:00 -0500 (Sun, 08 Nov 2009)
New Revision: 96129

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ReflectTest.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java
Log:
Add child first test.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ReflectTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ReflectTest.java	2009-11-08 11:22:01 UTC (rev 96128)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/ReflectTest.java	2009-11-08 11:36:00 UTC (rev 96129)
@@ -278,19 +278,31 @@
 
    protected Deployment createIsolatedDeployment(String name, String parentDomain, Class<?> reference) throws Exception
    {
+      return createIsolatedDeployment(name, parentDomain, reference, null);
+   }
+
+   protected Deployment createIsolatedDeployment(String name, String parentDomain, Class<?> reference, ClassLoadingMetaData clmd) throws Exception
+   {
       AssembledDirectory jar = createJar(name, reference);
       Deployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(jar);
 
+      if (clmd == null)
+         clmd = createDefaultClassLoadingMetaData(name, parentDomain);
+
+      MutableAttachments attachments = (MutableAttachments)deployment.getPredeterminedManagedObjects();
+      attachments.addAttachment(ClassLoadingMetaData.class, clmd);
+
+      return deployment;
+   }
+
+   protected ClassLoadingMetaData createDefaultClassLoadingMetaData(String name, String parentDomain)
+   {
       ClassLoadingMetaData clmd = new ClassLoadingMetaData();
       clmd.setDomain(name + "_Domain");
       clmd.setParentDomain(parentDomain);
       clmd.setImportAll(true);
       clmd.setExportAll(ExportAll.NON_EMPTY);
       clmd.setVersion(Version.DEFAULT_VERSION);
-
-      MutableAttachments attachments = (MutableAttachments)deployment.getPredeterminedManagedObjects();
-      attachments.addAttachment(ClassLoadingMetaData.class, clmd);
-
-      return deployment;
+      return clmd;
    }
 }
\ No newline at end of file

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-08 11:22:01 UTC (rev 96128)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/reflect/test/TypeInfoTest.java	2009-11-08 11:36:00 UTC (rev 96129)
@@ -21,15 +21,16 @@
  */
 package org.jboss.test.deployers.vfs.reflect.test;
 
+import java.net.URL;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.net.URL;
 
+import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
 import org.jboss.deployers.client.spi.DeployerClient;
 import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.reflect.spi.TypeInfo;
 import org.jboss.reflect.spi.TypeInfoFactory;
 import org.jboss.test.deployers.vfs.reflect.support.crm.CrmFacade;
@@ -135,10 +136,8 @@
       }
    }
 
-   public void testIsolatedJars() throws Exception
+   public void testIsolatedJars(Deployment d1, Deployment d2) throws Exception
    {
-      Deployment d1 = createIsolatedDeployment("j1.jar");
-      Deployment d2 = createIsolatedDeployment("j2.jar");
       DeployerClient main = getDeployerClient();
       main.deploy(d1, d2);
       try
@@ -168,6 +167,22 @@
       }
    }
 
+   public void testIsolatedJars() throws Exception
+   {
+      Deployment d1 = createIsolatedDeployment("j1.jar");
+      Deployment d2 = createIsolatedDeployment("j2.jar");
+      testIsolatedJars(d1, d2);
+   }
+
+   public void testHierarchyJarsChildFirst() throws Exception
+   {
+      Deployment d1 = createIsolatedDeployment("j1.jar");
+      ClassLoadingMetaData clmd = createDefaultClassLoadingMetaData("j2.jar", "j1.jar_Domain");
+      clmd.setJ2seClassLoadingCompliance(false);
+      Deployment d2 = createIsolatedDeployment("j2.jar", "j1.jar_Domain", PlainJavaBean.class, clmd);
+      testIsolatedJars(d1, d2);
+   }
+
    protected void testDomainHierarchy(String top, String left, String right, Deployment... deployments) throws DeploymentException, ClassNotFoundException
    {
       DeployerClient main = getDeployerClient();