[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/builder ...

[Ron Sigal]

  User: rsigal  
  Date: 06/12/27 01:26:53

  Modified:    src/tests/org/jboss/test/remoting/transport/socket/ssl/builder  
                        SSLSocketInvokerTestClient.java
                        SSLSocketInvokerTestServer.java
  Log:
  JBREM-650:  Added ability to override transport and, in some cases, port.
  
  Revision  Changes    Path
  1.5       +7 -2      JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/builder/SSLSocketInvokerTestClient.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SSLSocketInvokerTestClient.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/builder/SSLSocketInvokerTestClient.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- SSLSocketInvokerTestClient.java	20 Jun 2006 17:19:00 -0000	1.4
  +++ SSLSocketInvokerTestClient.java	27 Dec 2006 06:26:53 -0000	1.5
  @@ -44,12 +44,12 @@
         System.setProperty("javax.net.ssl.trustStorePassword", "unit-tests-client");
   //         System.setProperty("javax.net.ssl.trustStorePassword", "secureexample");
   
  -      InvokerLocator locator = new InvokerLocator(getTransport() + "://" + host + ":" + port);
  +      InvokerLocator locator = new InvokerLocator(getTransport() + "://" + host + ":" + getPort());
   
         // create callback connector
         Map config = new HashMap();
         config.put(SSLSocketBuilder.REMOTING_SERVER_SOCKET_USE_CLIENT_MODE, "true");
  -      callbackConnector = new Connector(getTransport() + "://" + host + ":" + (port + 5), config);
  +      callbackConnector = new Connector(getTransport() + "://" + host + ":" + (getPort() + 5), config);
         callbackConnector.create();
         callbackConnector.addInvocationHandler("callback", new CallbackInvokerHandler());
         callbackConnector.start();
  @@ -99,6 +99,11 @@
         return transport;
      }
   
  +   protected int getPort()
  +   {
  +      return port;
  +   }
  +
      private Object makeInvocation(String method, String param) throws Throwable
      {
         Object ret = client.invoke(new NameBasedInvocation(method,
  
  
  
  1.4       +7 -1      JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/builder/SSLSocketInvokerTestServer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SSLSocketInvokerTestServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/builder/SSLSocketInvokerTestServer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- SSLSocketInvokerTestServer.java	26 May 2006 20:26:56 -0000	1.3
  +++ SSLSocketInvokerTestServer.java	27 Dec 2006 06:26:53 -0000	1.4
  @@ -29,7 +29,7 @@
    */
   public class SSLSocketInvokerTestServer extends ServerTestCase implements SSLInvokerConstants
   {
  -   private int serverPort = port;
  +   private int serverPort;
      private Connector connector = null;
      private SSLSocketBuilder socketBuilder = null;
   
  @@ -37,6 +37,7 @@
   
      public void init() throws Exception
      {
  +      serverPort = getPort();
         if (serverPort < 0)
         {
            serverPort = TestUtil.getRandomPort();
  @@ -117,6 +118,11 @@
         return transport;
      }
   
  +   protected int getPort()
  +   {
  +      return port;
  +   }
  +
      protected String getSubsystem()
      {
         return "mock";