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

[Ron Sigal]

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

  Modified:    src/tests/org/jboss/test/remoting/transport/socket/ssl/basic  
                        InvokerClientTest.java InvokerServerTest.java
  Log:
  JBREM-650:  Added ability to override transport and, in some cases, port.
  
  Revision  Changes    Path
  1.6       +6 -1      JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/basic/InvokerClientTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InvokerClientTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/basic/InvokerClientTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- InvokerClientTest.java	28 Mar 2006 02:43:49 -0000	1.5
  +++ InvokerClientTest.java	27 Dec 2006 06:26:53 -0000	1.6
  @@ -50,7 +50,7 @@
            String trustStoreFilePath = this.getClass().getResource("../.truststore").getFile();
            System.setProperty("javax.net.ssl.trustStore", trustStoreFilePath);
   
  -         InvokerLocator locator = new InvokerLocator(getTransport() + "://" + host + ":" + port);
  +         InvokerLocator locator = new InvokerLocator(getTransport() + "://" + host + ":" + getPort());
            client = new Client(locator, "mock");
            client.connect();
         }
  @@ -86,6 +86,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.11      +7 -1      JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/basic/InvokerServerTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InvokerServerTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/basic/InvokerServerTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- InvokerServerTest.java	16 May 2006 03:45:44 -0000	1.10
  +++ InvokerServerTest.java	27 Dec 2006 06:26:53 -0000	1.11
  @@ -50,13 +50,14 @@
    */
   public class InvokerServerTest extends ServerTestCase implements SSLInvokerConstants
   {
  -   private int serverPort = port;
  +   private int serverPort;
      private Connector connector = null;
   
      private static final Logger log = Logger.getLogger(InvokerServerTest.class);
   
      public void init(Map metatdata) throws Exception
      {
  +      serverPort = getPort();
         if(serverPort < 0)
         {
            serverPort = TestUtil.getRandomPort();
  @@ -80,6 +81,11 @@
         return transport;
      }
      
  +   protected int getPort()
  +   {
  +      return port;
  +   }
  +   
      private ServerSocketFactory createServerSocketFactory()
            throws NoSuchAlgorithmException, KeyManagementException, IOException,
                   CertificateException, UnrecoverableKeyException, KeyStoreException