[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/retry ...

[Ron Sigal]

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

  Modified:    src/tests/org/jboss/test/remoting/transport/socket/connection/retry  
                        SocketRetryServer.java SocketRetryClient.java
  Log:
  JBREM-650:  Added ability to override transport and, in some cases, port.
  
  Revision  Changes    Path
  1.2       +11 -1     JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/retry/SocketRetryServer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SocketRetryServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/retry/SocketRetryServer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SocketRetryServer.java	14 May 2006 05:29:57 -0000	1.1
  +++ SocketRetryServer.java	27 Dec 2006 06:26:54 -0000	1.2
  @@ -21,7 +21,7 @@
   
      public void setUp() throws Exception
      {
  -      String locatorUri = "socket://localhost:8888" + "/?" + SocketClientInvoker.SO_TIMEOUT_FLAG + "=" + 1000 + "&" +
  +      String locatorUri = getTransport() + "://localhost:" + getPort() + "/?" + SocketClientInvoker.SO_TIMEOUT_FLAG + "=" + 1000 + "&" +
                             SocketServerInvoker.CHECK_CONNECTION_KEY + "=" + Boolean.FALSE;
   
         connector = new Connector(locatorUri);
  @@ -59,6 +59,16 @@
         }
      }
   
  +   protected String getTransport()
  +   {
  +      return "socket";
  +   }
  +   
  +   protected int getPort()
  +   {
  +      return 8888;
  +   }
  +   
      public class TestInvocationHandler implements ServerInvocationHandler
      {
   
  
  
  
  1.2       +10 -1     JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/retry/SocketRetryClient.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SocketRetryClient.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/connection/retry/SocketRetryClient.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SocketRetryClient.java	14 May 2006 05:29:57 -0000	1.1
  +++ SocketRetryClient.java	27 Dec 2006 06:26:54 -0000	1.2
  @@ -66,7 +66,7 @@
   
         public void makeCalls(int sleepTime, int numOfCalls) throws Throwable
         {
  -         InvokerLocator locator = new InvokerLocator("socket://localhost:8888" + "/?" + SocketClientInvoker.SO_TIMEOUT_FLAG + "=" + 1000 + "&" +
  +         InvokerLocator locator = new InvokerLocator(getTransport() + "://localhost:" + getPort() + "/?" + SocketClientInvoker.SO_TIMEOUT_FLAG + "=" + 1000 + "&" +
                                                        SocketServerInvoker.CHECK_CONNECTION_KEY + "=" + Boolean.FALSE);
            Client client = new Client(locator);
            client.connect();
  @@ -116,4 +116,13 @@
         }
      }
   
  +   protected String getTransport()
  +   {
  +      return "socket";
  +   }
  +   
  +   protected int getPort()
  +   {
  +      return 8888;
  +   }
   }