[jboss-cvs] JBossAS SVN: r77562 - projects/jboss-aspects/trunk/remoting/src/test/java/org/jboss/aspects/remoting/test/proxy.

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

Author: ron_sigal
Date: 2008-08-28 00:12:01 -0400 (Thu, 28 Aug 2008)
New Revision: 77562

Modified:
   projects/jboss-aspects/trunk/remoting/src/test/java/org/jboss/aspects/remoting/test/proxy/RemotingProxyFactoryTestCase.java
Log:
JBAS-4456: Added tests to cover alternative sources of JNDI name.

Modified: projects/jboss-aspects/trunk/remoting/src/test/java/org/jboss/aspects/remoting/test/proxy/RemotingProxyFactoryTestCase.java
===================================================================
--- projects/jboss-aspects/trunk/remoting/src/test/java/org/jboss/aspects/remoting/test/proxy/RemotingProxyFactoryTestCase.java	2008-08-28 04:10:41 UTC (rev 77561)
+++ projects/jboss-aspects/trunk/remoting/src/test/java/org/jboss/aspects/remoting/test/proxy/RemotingProxyFactoryTestCase.java	2008-08-28 04:12:01 UTC (rev 77562)
@@ -38,6 +38,15 @@
 import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
 
 
+/**
+ * Unit test for JBAS-4456.
+ * 
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright July 23, 2008
+ * </p>
+ */
 public class RemotingProxyFactoryTestCase extends TestCase
 {
    private static final String DEFAULT_SUFFIX_DEPLOYABLE_XML = "-beans.xml";
@@ -75,17 +84,38 @@
    }
    
    
-   public void testRemotingProxy() throws Throwable
+   /**
+    * Tests case in which RemotingProxyFactory is configured with jndiName property.
+    */
+   public void testRemotingProxyWithJNDINameFromProperty() throws Throwable
    {
       log.info("entering " + getName());
-      
-      String jndiName = "proxyTestJNDI";
+      doTestRemotingProxy("proxyTestJNDIproperty");
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   /**
+    * Tests case in which RemotingProxyFactory is not configured with jndiName property.
+    * Instead, the proxy is bound into JNDI through the use of the
+    * org.jboss.aop.microcontainer.aspects.jndi.JndiBinding annotation.
+    */
+   public void testRemotingProxyWithJNDINameFromAnnotation() throws Throwable
+   {
+      log.info("entering " + getName());
+      doTestRemotingProxy("proxyTestJNDIannotation");
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   private void doTestRemotingProxy(String jndiName) throws Throwable
+   {
       Properties env = new Properties();
       env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
       env.setProperty(Context.PROVIDER_URL, "jnp://localhost:1099");
       env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
       InitialContext ctx = new InitialContext(env);
-      System.out.println("getting SampleTarget");
+      System.out.println("getting SampleTarget bound to: " + jndiName);
       Object o = ctx.lookup(jndiName);
       Class<?>[] interfaces = o.getClass().getInterfaces();
       log.info("number of proxy interfaces: " + interfaces.length);
@@ -107,27 +137,14 @@
       assertTrue(r2 instanceof String);
       String s2 = (String) r2;
       assertEquals("abc" + "abc" + "xyz" + "|" + "abc" + "abc" + "xyz", s2);
-      log.info(getName() + " PASSES");
    }
    
    
    private URL getDeployableXmlUrl(Class<?> clazz) throws MalformedURLException
    {
-      // Initialize
-//      StringBuffer url = new StringBuffer(clazz.getName());
-
-      // Make a String
-      String flatten = clazz.getSimpleName().toString();
-
-      // Adjust for filename structure instead of package structure
-//      flatten = flatten.replace('.', '/');
-
-      // Append Suffix
-      flatten = flatten + DEFAULT_SUFFIX_DEPLOYABLE_XML;
-
-      // Return
-//      return new URL(flatten);
-      URL url = clazz.getResource(flatten);
+      String name = clazz.getSimpleName().toString();
+      name = name + DEFAULT_SUFFIX_DEPLOYABLE_XML;
+      URL url = clazz.getResource(name);
       return url;
    }