[jboss-cvs] JBossAS SVN: r81412 - in projects/jpa/trunk/deployers/src: test/java/org/jboss/jpa/deployers/test/resolvers and 1 other directory.

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

Author: wolfc
Date: 2008-11-21 05:06:41 -0500 (Fri, 21 Nov 2008)
New Revision: 81412

Modified:
   projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/DefaultPersistenceUnitDependencyResolver.java
   projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/DefaultPersistenceUnitDependencyResolverTestCase.java
Log:
JBAS-6229: using simple name of deployment unit instead of full name when matching up

Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/DefaultPersistenceUnitDependencyResolver.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/DefaultPersistenceUnitDependencyResolver.java	2008-11-21 09:56:15 UTC (rev 81411)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/DefaultPersistenceUnitDependencyResolver.java	2008-11-21 10:06:41 UTC (rev 81412)
@@ -100,7 +100,7 @@
          name = path.substring(0, i);
       for(DeploymentUnit child : current.getChildren())
       {
-         if(child.getName().equals(name))
+         if(child.getSimpleName().equals(name))
             return child;
       }
       throw new IllegalArgumentException("Can't find a deployment unit named " + name + " at " + current);

Modified: projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/DefaultPersistenceUnitDependencyResolverTestCase.java
===================================================================
--- projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/DefaultPersistenceUnitDependencyResolverTestCase.java	2008-11-21 09:56:15 UTC (rev 81411)
+++ projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/DefaultPersistenceUnitDependencyResolverTestCase.java	2008-11-21 10:06:41 UTC (rev 81412)
@@ -37,6 +37,7 @@
 import org.jboss.metadata.jpa.spec.PersistenceMetaData;
 import org.jboss.virtual.VFS;
 import org.jboss.virtual.VirtualFile;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -45,14 +46,17 @@
  */
 public class DefaultPersistenceUnitDependencyResolverTestCase
 {
-   @Test
-   public void resolveDefaultPersistenceUnit() throws Exception
+   private static DefaultPersistenceUnitDependencyResolver resolver;
+   private static VFSDeploymentUnit deploymentUnit;
+   
+   @BeforeClass
+   public static void beforeClass() throws Exception
    {
-      DefaultPersistenceUnitDependencyResolver resolver = new DefaultPersistenceUnitDependencyResolver();
+      resolver = new DefaultPersistenceUnitDependencyResolver();
       resolver.setJavaEEModuleInformer(new SimpleJavaEEModuleInformer());
       
-      String common = "/org/jboss/jpa/deployers/test/parsing";
-      URL url = getClass().getResource(common);
+      String common = "/org/jboss/jpa/deployers/test";
+      URL url = DefaultPersistenceUnitDependencyResolverTestCase.class.getResource(common);
       assertNotNull(url);
       VirtualFile root = VFS.getRoot(url);
       assertNotNull(root);
@@ -63,22 +67,45 @@
       deployer.create();
       deployer.start();
       
-      VFSDeploymentContext deploymentContext = new AbstractVFSDeploymentContext(root, "");
-      deploymentContext.setMetaDataLocations(Collections.singletonList(root));
-      VFSDeploymentUnit deploymentUnit = new AbstractVFSDeploymentUnit(deploymentContext);
+      VirtualFile file = root.getChild("parsing");
       
+      VFSDeploymentContext parent = new AbstractVFSDeploymentContext(root, "");
+      
+      VFSDeploymentContext deploymentContext = new AbstractVFSDeploymentContext(file, "");
+      deploymentContext.setMetaDataLocations(Collections.singletonList(file));
+      deploymentContext.setParent(parent);
+      parent.addChild(deploymentContext);
+      
+      deploymentUnit = new AbstractVFSDeploymentUnit(deploymentContext);
+      
       deployer.deploy(deploymentUnit);
       PersistenceMetaData metaData = deploymentUnit.getAttachment(PersistenceMetaData.class);
       assertNotNull(metaData);
-      
+   }
+   
+   @Test
+   public void resolveDefaultPersistenceUnitEmpty() throws Exception
+   {
       // We want the default persistence unit
-      String persistenceUnitName = null;
+      String persistenceUnitName = "";
       String beanName = resolver.resolvePersistenceUnitSupplier(deploymentUnit, persistenceUnitName);
       assertEquals("persistence.unit:unitName=#dummy", beanName);
-      
+   }
+   
+   @Test
+   public void resolveDefaultPersistenceUnitNull() throws Exception
+   {
       // We want the default persistence unit
-      persistenceUnitName = "";
-      beanName = resolver.resolvePersistenceUnitSupplier(deploymentUnit, persistenceUnitName);
+      String persistenceUnitName = null;
+      String beanName = resolver.resolvePersistenceUnitSupplier(deploymentUnit, persistenceUnitName);
       assertEquals("persistence.unit:unitName=#dummy", beanName);
    }
+   
+   @Test
+   public void testRelativePersistenceUnit() throws Exception
+   {
+      String persistenceUnitName = "../parsing#dummy";
+      String beanName = resolver.resolvePersistenceUnitSupplier(deploymentUnit, persistenceUnitName);
+      assertEquals("persistence.unit:unitName=#dummy", beanName);
+   }
 }