[jboss-cvs] JBossAS SVN: r75471 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directory.

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

Author: ALRubinger
Date: 2008-07-08 01:32:56 -0400 (Tue, 08 Jul 2008)
New Revision: 75471

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java
Log:
[JBMETA-68] Port Entity Resolution tests using JNDI Policy Decorator

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2008-07-08 05:07:22 UTC (rev 75470)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossEnterpriseBeanMetaData.java	2008-07-08 05:32:56 UTC (rev 75471)
@@ -574,8 +574,10 @@
     * Determine the localJndiName.
     * 
     * @return the localJndiName.
+    * @deprecated JBMETA-68
     */
    @XmlTransient
+   @Deprecated
    public String determineLocalJndiName()
    {
       if (localJndiName != null)

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java	2008-07-08 05:07:22 UTC (rev 75470)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java	2008-07-08 05:32:56 UTC (rev 75471)
@@ -33,10 +33,12 @@
 import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.JBossSessionPolicyDecorator;
 import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.JbossEntityPolicyDecorator;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DeploymentSummary;
+import org.jboss.metadata.ejb.jboss.jndipolicy.spi.JbossEnterpriseBeanJndiNameResolver;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.JbossSessionBeanJndiNameResolver;
 import org.jboss.metadata.ejb.jboss.jndipolicy.spi.KnownInterfaces;
 import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
 import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
+import org.jboss.util.xml.JBossEntityResolver;
 
 /**
  * Tests that the JNDI Policy Decorators for Object Model 
@@ -264,22 +266,53 @@
     */
    public void testResolvedJndiNamesWithKnownIfacesEntity()
    {
-      JBossEnterpriseBeanMetaData beanMD = getEntityMetaData();
-      JBossEntityBeanMetaData sbeanMD = (JBossEntityBeanMetaData) beanMD;
-      sbeanMD.setLocal("org.jboss.ifaces.LocalIF");
-      sbeanMD.setLocalHome("org.jboss.ifaces.LocalHomeIF");
-      sbeanMD.setHome("org.jboss.ifaces.HomeIF");
-      sbeanMD.setRemote("org.jboss.ifaces.RemoteIF");
+      // Obtain MD
+      JBossEntityBeanMetaData beanMD = getEntityMetaData();
+      
+      // Declare Interfaces
+      String local = "org.jboss.ifaces.LocalIF";
+      String localHome = "org.jboss.ifaces.LocalHomeIF";
+      String home = "org.jboss.ifaces.HomeIF";
+      String remote = "org.jboss.ifaces.RemoteIF";
+      String randomInterface = "org.jboss.test.some.IFace";
 
-      String resolvedJndiName = beanMD.determineResolvedJndiName(null, null);
-      assertEquals("testResolvedJndiNamesWithKnownIfacesEntity-jndi-name", resolvedJndiName);
-      String resolvedJndiNameHome = beanMD.determineResolvedJndiName("org.jboss.ifaces.HomeIF", null);
-      assertEquals("testResolvedJndiNamesWithKnownIfacesEntity-jndi-name/home", resolvedJndiNameHome);
-      String resolvedJndiNameLocalHome = beanMD.determineResolvedJndiName("org.jboss.ifaces.LocalHomeIF", null);
-      assertEquals("testResolvedJndiNamesWithKnownIfacesEntity-jndi-name/localHome", resolvedJndiNameLocalHome);
-      String resolvedJndiNameIface = beanMD.determineResolvedJndiName("org.jboss.test.some.IFace", null);
-      assertEquals("testResolvedJndiNamesWithKnownIfacesEntity-jndi-name/org.jboss.test.some.IFace",
-            resolvedJndiNameIface);
+      // Manually set interfaces on MD
+      beanMD.setLocal(local);
+      beanMD.setLocalHome(localHome);
+      beanMD.setHome(home);
+      beanMD.setRemote(remote);
+      
+      // Define expected results
+      String expectedRemote = "testResolvedJndiNamesWithKnownIfacesEntity-jndi-name";
+      String expectedHome = "testResolvedJndiNamesWithKnownIfacesEntity-jndi-name/home";
+      String expectedLocalHome = "testResolvedJndiNamesWithKnownIfacesEntity-jndi-name/localHome";
+      String expectedRandomInterface = "testResolvedJndiNamesWithKnownIfacesEntity-jndi-name/" + randomInterface;
+      
+      // Resolve
+      String resolvedDefault = JbossEnterpriseBeanJndiNameResolver.resolveJndiName(beanMD, null);
+      String resolvedHomeUsingInterface = JbossEnterpriseBeanJndiNameResolver.resolveJndiName(beanMD, home);
+      String resolvedHomeUsingType = JbossEnterpriseBeanJndiNameResolver.resolveJndiName(beanMD, KnownInterfaces.HOME);
+      String resolvedLocalHomeUsingInterface = JbossEnterpriseBeanJndiNameResolver.resolveJndiName(beanMD, localHome);
+      String resolvedLocalHomeUsingType = JbossEnterpriseBeanJndiNameResolver.resolveJndiName(beanMD, KnownInterfaces.LOCAL_HOME);
+      String resolvedInterfaceSpecific = JbossEnterpriseBeanJndiNameResolver.resolveJndiName(beanMD, randomInterface);
+      
+      // Test
+      assertEquals(expectedRemote, resolvedDefault);
+      assertEquals(expectedHome, resolvedHomeUsingInterface);
+      assertEquals(expectedHome, resolvedHomeUsingType);
+      assertEquals(expectedLocalHome, resolvedLocalHomeUsingInterface);
+      assertEquals(expectedLocalHome, resolvedLocalHomeUsingType);
+      assertEquals(expectedRandomInterface, resolvedInterfaceSpecific);
+
+      // Test Deprecated, backwards-compat behavior (may be removed when these methods no longer exist, JBMETA-68)
+      String resolvedJndiNameD = beanMD.determineResolvedJndiName(null, null);
+      assertEquals(expectedRemote, resolvedJndiNameD);
+      String resolvedJndiNameHomeD = beanMD.determineResolvedJndiName(home, null);
+      assertEquals(expectedHome, resolvedJndiNameHomeD);
+      String resolvedJndiNameLocalHomeD = beanMD.determineResolvedJndiName(localHome, null);
+      assertEquals(expectedLocalHome, resolvedJndiNameLocalHomeD);
+      String resolvedJndiNameIfaceD = beanMD.determineResolvedJndiName(randomInterface, null);
+      assertEquals(expectedRandomInterface, resolvedJndiNameIfaceD);
    }
 
    /**
@@ -321,7 +354,6 @@
       assertEquals(expectedLocalHome,resolvedJndiNameLocalHomeUsingResolver);
       assertEquals(expectedLocalHome,resolvedJndiNameLocalHomeUsingResolverType);
       
-      
       // Test Deprecated, backwards-compat behavior (may be removed when these methods no longer exist, JBMETA-68)
       String resolvedJndiNameRemoteD = beanMD.determineResolvedJndiName(KnownInterfaces.REMOTE, null);
       assertEquals(expectedRemote, resolvedJndiNameRemoteD);
@@ -408,7 +440,7 @@
     * jndiName = getName() + "-jndi-name"
     * @return JBossEntityBeanMetaData
     */
-   protected JBossEnterpriseBeanMetaData getEntityMetaData()
+   protected JBossEntityBeanMetaData getEntityMetaData()
    {
       String name = super.getName();
       JBossMetaData jbossMetaData = new JBossMetaData();