[jboss-remoting-commits] JBoss Remoting SVN: r5122 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory.

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

Author: ron.sigal at jboss.com
Date: 2009-05-01 16:51:03 -0400 (Fri, 01 May 2009)
New Revision: 5122

Modified:
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory/SocketFactoryClassNameTestRoot.java
Log:
JBREM-1121: Added variation of existing test methods with "useAllSocketFactoryParams=true" in InvokerLocator.

Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory/SocketFactoryClassNameTestRoot.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory/SocketFactoryClassNameTestRoot.java	2009-05-01 20:41:26 UTC (rev 5121)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/socketfactory/SocketFactoryClassNameTestRoot.java	2009-05-01 20:51:03 UTC (rev 5122)
@@ -77,11 +77,11 @@
       log.info("entering " + getName());
       
       // Start server.
-      setupServer();
+      setupServer(false);
       
       // Create client.
       String clientLocatorURI = locatorURI;
-      clientLocatorURI += "/?" + Remoting.SOCKET_FACTORY_CLASS_NAME + "=" + getSocketFactoryClass().getName();
+      clientLocatorURI += "&" + Remoting.SOCKET_FACTORY_CLASS_NAME + "=" + getSocketFactoryClass().getName();
       InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
       HashMap clientConfig = new HashMap();
       clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
@@ -111,7 +111,7 @@
       log.info("entering " + getName());
       
       // Start server.
-      setupServer();
+      setupServer(false);
       
       // Create client.
       InvokerLocator clientLocator = new InvokerLocator(locatorURI);
@@ -139,6 +139,73 @@
    }
    
    
+   public void testSocketFactoryClassNameInLocatorWithUseAllParams() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer(true);
+      
+      // Create client.
+      String clientLocatorURI = locatorURI;
+      clientLocatorURI += "&" + Remoting.SOCKET_FACTORY_CLASS_NAME + "=" + getSocketFactoryClass().getName();
+      InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraClientConfig(clientConfig);
+      Client client = new Client(clientLocator, clientConfig);
+      client.connect();
+      log.info("client is connected to " + clientLocatorURI);
+      
+      // Test connections.
+      assertEquals("abc", client.invoke("abc"));
+      log.info("connection is good");
+      
+      // Verify client invoker is using configured SocketFactory.
+      AbstractInvoker invoker = (AbstractInvoker) client.getInvoker();
+      SocketFactory socketFactory = invoker.getSocketFactory();
+      log.info("SocketFactory: " + socketFactory);
+      assertTrue(getSocketFactoryClass().isInstance(socketFactory));
+
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testSocketFactoryClassNameInConfigMapWithUseAllParams() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer(true);
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      clientConfig.put(Remoting.SOCKET_FACTORY_CLASS_NAME, getSocketFactoryClass().getName());
+      addExtraClientConfig(clientConfig);
+      Client client = new Client(clientLocator, clientConfig);
+      client.connect();
+      log.info("client is connected");
+      
+      // Test connections.
+      assertEquals("abc", client.invoke("abc"));
+      log.info("connection is good");
+      
+      // Verify client invoker is using configured SocketFactory.
+      AbstractInvoker invoker = (AbstractInvoker) client.getInvoker();
+      SocketFactory socketFactory = invoker.getSocketFactory();
+      log.info("SocketFactory: " + socketFactory);
+      assertTrue(getSocketFactoryClass().isInstance(socketFactory));
+      
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
    protected abstract String getTransport();
 
 
@@ -152,11 +219,20 @@
    protected void addExtraServerConfig(Map config) {}
    
 
-   protected void setupServer() throws Exception
+   protected void setupServer(boolean useAllParams) throws Exception
    {
       host = InetAddress.getLocalHost().getHostAddress();
       port = PortUtil.findFreePort(host);
-      locatorURI = getTransport() + "://" + host + ":" + port; 
+      locatorURI = getTransport() + "://" + host + ":" + port + "/?x=x";
+      String metadata = System.getProperty("remoting.metadata");
+      if (metadata != null)
+      {
+         locatorURI += "&" + metadata;
+      }
+      if (useAllParams)
+      {
+         locatorURI += "&" + Remoting.USE_ALL_SOCKET_FACTORY_PARAMS + "=true";
+      }
       serverLocator = new InvokerLocator(locatorURI);
       log.info("Starting remoting server with locator uri of: " + locatorURI);
       HashMap config = new HashMap();