[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/timeout ...

[Ron Sigal]

  User: rsigal  
  Date: 07/02/22 04:41:51

  Modified:    src/tests/org/jboss/test/remoting/timeout  Tag: remoting_2_x
                        QuickDisconnectClientParent.java
  Log:
  JBREM-657, JBREM-701: Added logging, made timeouts overrideable.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +30 -12    JBossRemoting/src/tests/org/jboss/test/remoting/timeout/Attic/QuickDisconnectClientParent.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: QuickDisconnectClientParent.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/timeout/Attic/QuickDisconnectClientParent.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -b -r1.1.2.1 -r1.1.2.2
  --- QuickDisconnectClientParent.java	21 Feb 2007 09:45:36 -0000	1.1.2.1
  +++ QuickDisconnectClientParent.java	22 Feb 2007 09:41:50 -0000	1.1.2.2
  @@ -53,7 +53,7 @@
    * removeListener().
    * 
    * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.1.2.1 $
  + * @version $Revision: 1.1.2.2 $
    * <p>
    * Copyright Jan 24, 2007
    * </p>
  @@ -68,6 +68,9 @@
      
      public void setUp() throws Exception
      {
  +      System.out.println("*******************************************************");
  +      System.out.println("*****           EXCEPTIONS ARE EXPECTED           *****");
  +      System.out.println("*******************************************************");
         log.info("entering setUp() for " + getName());
         Client client = null;
         
  @@ -111,7 +114,6 @@
         config.put(Client.ENABLE_LEASE, "true");
         addClientConfig(config);
         final Client client = new Client(locator, config);
  -//      client.connect();
         try
         {
         client.connect();
  @@ -120,8 +122,11 @@
         {
            e.printStackTrace();
         }
  +      log.info("making first invocation");
         Object response = client.invoke("test");
         assertEquals("test", response);
  +      log.info("first invocation succeeds");
  +      
         
         new Thread()
         {
  @@ -137,7 +142,7 @@
                  // This invocation may use up a listening connection,
                  // depending on transport.
                     HashMap metadata = new HashMap();
  -                  metadata.put("timeout", "1000");
  +                  metadata.put("timeout", shortTimeoutString());
                     log.info("making invocation");
                     client.invoke("test", metadata);
                     log.info("made invocation");
  @@ -150,7 +155,7 @@
                  
                  // Set disconnectTimeout to 1 second.
                  log.info("calling client.disconnect()");
  -               client.setDisconnectTimeout(1000);
  +               client.setDisconnectTimeout(shortTimeout());
                  client.disconnect();
                  log.info("returned from client.disconnect()");
               }
  @@ -189,7 +194,6 @@
         config.put(Client.ENABLE_LEASE, "true");
         addClientConfig(config);
         final Client client = new Client(locator, config);
  -//      client.connect();
         try
         {
         client.connect();
  @@ -198,8 +202,10 @@
         {
            e.printStackTrace();
         }
  +      log.info("making first invocation");
         Object response = client.invoke("test");
         assertEquals("test", response);
  +      log.info("first invocation succeeds");
         
         Thread t = new Thread()
         {
  @@ -215,7 +221,7 @@
                  // This invocation may use up a listening connection,
                  // depending on transport.
                     HashMap metadata = new HashMap();
  -                  metadata.put("timeout", "1000");
  +                  metadata.put("timeout", shortTimeoutString());
                     log.info("making invocation");
                     client.invoke("test", metadata);
                     log.info("made invocation");
  @@ -268,7 +274,6 @@
         config.put(Client.ENABLE_LEASE, "true");
         addClientConfig(config);
         final Client client = new Client(locator, config);
  -//      client.connect();
         try
         {
         client.connect();
  @@ -277,8 +282,10 @@
         {
            e.printStackTrace();
         }
  +      log.info("making first invocation");
         Object response = client.invoke("test");
         assertEquals("test", response);
  +      log.info("first invocation succeeds");
         final InvokerCallbackHandler callbackHandler = new TestCallbackHandler();
         client.addListener(callbackHandler, new HashMap(), null, true);
         
  @@ -297,7 +304,7 @@
                  // This invocation may use up a listening connection,
                  // depending on transport.
                     HashMap metadata = new HashMap();
  -                  metadata.put("timeout", "1000");
  +                  metadata.put("timeout", shortTimeoutString());
                     log.info("making invocation");
                     client.invoke("test", metadata);
                     log.info("made invocation");
  @@ -308,7 +315,7 @@
                  }
                  
                  // Set disconnectTimeout to 1 second.
  -               client.setDisconnectTimeout(1000);
  +               client.setDisconnectTimeout(shortTimeout());
                  client.removeListener(callbackHandler);
                  removeListener.done = true;
                  log.info("returned from client.removeListener()");
  @@ -368,8 +375,10 @@
         {
            e.printStackTrace();
         }
  +      log.info("making first invocation");
         Object response = client.invoke("test");
         assertEquals("test", response);
  +      
         final InvokerCallbackHandler callbackHandler = new TestCallbackHandler();
         client.addListener(callbackHandler, new HashMap(), null, true);
         
  @@ -439,6 +448,15 @@
      {  
      }
      
  +   protected int shortTimeout()
  +   {
  +      return 1000;
  +   }
  +   
  +   protected String shortTimeoutString()
  +   {
  +      return "1000";
  +   }
      
      public class Holder {public boolean done;}