[jboss-cvs] JBossAS SVN: r75860 - 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-15 22:27:03 -0400 (Tue, 15 Jul 2008)
New Revision: 75860

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java
Log:
[JBMETA-68] Enhance backwards-compat for JBossSessionPolicyDecorator to cover determineJndiName and determineLocalJndiName and provide test coverage to catch this case

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java	2008-07-16 02:26:42 UTC (rev 75859)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/jboss/jndipolicy/plugins/JBossSessionPolicyDecorator.java	2008-07-16 02:27:03 UTC (rev 75860)
@@ -180,7 +180,8 @@
          }
       }
 
-      throw new IllegalArgumentException("Can't find interface " + iface + " in " + this);
+      // Assume business remote
+      return KnownInterfaceType.BUSINESS_REMOTE;
    }
    
    private EjbDeploymentSummary getEjbDeploymentSummary()
@@ -248,6 +249,18 @@
       return this.determineResolvedJndiName(iface);
    }
 
+   @Override
+   public String determineJndiName()
+   {
+      return this.determineResolvedRemoteBusinessDefaultJndiName();
+   }
+
+   @Override
+   public String determineLocalJndiName()
+   {
+      return this.determineResolvedLocalBusinessDefaultJndiName();
+   }
+
    /**
     * Returns the resolved JNDI target to which the
     * EJB2.x Remote Home interface is to be bound

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-16 02:26:42 UTC (rev 75859)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/ResolveJndiNameDecoratorUnitTestCase.java	2008-07-16 02:27:03 UTC (rev 75860)
@@ -76,21 +76,34 @@
       String mappedName = "testResolvedJndiName-mapped-name";
       beanMD.setMappedName(mappedName);
       String expectedRemoteBusiness = mappedName;
-      String expectedHome = "testResolvedJndiNameWithMappedName-jndi-name/home";
-      
+      String expectedBase = "testResolvedJndiNameWithMappedName-jndi-name/";
+      String expectedLocalBusiness = expectedBase + "local";
+      String expectedLocalHome = expectedBase + "localHome";
+      String expectedHome = expectedBase + "home";
+
       // Resolve
       String resolvedRemoteBusiness = beanMD.getJndiName();
       String resolvedHome = beanMD.getHomeJndiName();
-      
+
       // Test
-      assertEquals("JNDI Target for default remote business interface in presense of mapped-name must be equal to mapped-name",expectedRemoteBusiness, resolvedRemoteBusiness);
-      assertEquals("JNDI Target for Remote Home in presense of a mapped-name is invalid",expectedHome, resolvedHome);
-      
+      assertEquals(
+            "JNDI Target for default remote business interface in presense of mapped-name must be equal to mapped-name",
+            expectedRemoteBusiness, resolvedRemoteBusiness);
+      assertEquals("JNDI Target for Remote Home in presense of a mapped-name is invalid", expectedHome, resolvedHome);
+
       // Test Deprecated, backwards-compat behavior (may be removed when these methods no longer exist, JBMETA-68)
-      String resolvedDeprecatedRemote = beanMD.determineResolvedJndiName(KnownInterfaces.REMOTE, null);
+      String resolvedDeprecatedRemoteDefault = beanMD.determineJndiName();
+      String resolvedDeprecatedRemoteDefault2 = beanMD.determineResolvedJndiName(KnownInterfaces.REMOTE, null);
+      String resolvedDeprecatedLocalDefault = beanMD.determineLocalJndiName();
+      String resolvedDeprecatedLocalDefault2 = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL, null);
+      String resolvedDeprecatedLocalHome = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL_HOME, null);
       String resolvedDeprecatedHome = beanMD.determineResolvedJndiName(KnownInterfaces.HOME, null);
       assertEquals(expectedHome, resolvedDeprecatedHome);
-      assertEquals(expectedRemoteBusiness, resolvedDeprecatedRemote);
+      assertEquals(expectedRemoteBusiness, resolvedDeprecatedRemoteDefault);
+      assertEquals(expectedRemoteBusiness, resolvedDeprecatedRemoteDefault2);
+      assertEquals(expectedLocalBusiness, resolvedDeprecatedLocalDefault);
+      assertEquals(expectedLocalBusiness, resolvedDeprecatedLocalDefault2);
+      assertEquals(expectedLocalHome, resolvedDeprecatedLocalHome);
    }
 
    @SuppressWarnings(value="deprecation")
@@ -119,11 +132,15 @@
 
       // Test Deprecated, backwards-compat behavior (may be removed when these methods no longer exist, JBMETA-68)
       String resolvedJndiNameRemoteD = beanMD.determineResolvedJndiName(KnownInterfaces.REMOTE, null);
+      String resolvedJndiNameRemoteD2 = beanMD.determineJndiName();
       assertEquals(expectedRemote, resolvedJndiNameRemoteD);
+      assertEquals(expectedRemote, resolvedJndiNameRemoteD2);
       String resolvedJndiNameHomeD = beanMD.determineResolvedJndiName(KnownInterfaces.HOME, null);
       assertEquals(expectedHome, resolvedJndiNameHomeD);
       String resolvedJndiNameLocalD = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL, null);
+      String resolvedJndiNameLocalD2 = beanMD.determineLocalJndiName();
       assertEquals(expectedLocal, resolvedJndiNameLocalD);
+      assertEquals(expectedLocal, resolvedJndiNameLocalD2);
       String resolvedJndiNameLocalHomeD = beanMD.determineResolvedJndiName(KnownInterfaces.LOCAL_HOME, null);
       assertEquals(expectedLocalHome, resolvedJndiNameLocalHomeD);
    }