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

[Ron Sigal]

  User: rsigal  
  Date: 06/12/29 01:46:32

  Modified:    src/tests/org/jboss/test/remoting/transport/bisocket 
                        BisocketTestCase.java
  Log:
  JBREM-650:  Added test method for restarted Connector.
  
  Revision  Changes    Path
  1.4       +49 -2     JBossRemoting/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BisocketTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- BisocketTestCase.java	29 Dec 2006 02:23:36 -0000	1.3
  +++ BisocketTestCase.java	29 Dec 2006 06:46:32 -0000	1.4
  @@ -60,7 +60,7 @@
   
   /** 
    * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    * <p>
    * Copyright Nov 25, 2006
    * </p>
  @@ -95,6 +95,7 @@
      {
         if (firstTime)
         {
  +         firstTime = false;
            Logger.getLogger("org.jboss.remoting").setLevel(Level.DEBUG);
            Logger.getLogger("org.jboss.test.remoting").setLevel(Level.DEBUG);
            String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
  @@ -286,7 +287,7 @@
            client.invokeOneway(CALLBACK_TEST);
         }
         
  -      Thread.sleep(100);
  +      Thread.sleep(500);
         assertEquals(invocationCount, callbackHandler.callbackCounter);
         assertEquals(0, pool.size());
         usedPooled = (Long) field.get(clientInvoker);
  @@ -1164,6 +1165,7 @@
         field.setAccessible(true);
         Socket controlSocket = (Socket) field.get(clientInvoker);
         controlSocket.close();
  +      log.info("CLOSED CONTROL SOCKET");
         
         Thread.sleep(TEST_PING_FREQUENCY * 2);
         client.invoke(CALLBACK_TEST);
  @@ -1243,6 +1245,7 @@
         field.setAccessible(true);
         Socket clientSideControlSocket = (Socket) field.get(controlConnectionThread);
         clientSideControlSocket.close();
  +      log.info("CLOSED CONTROL SOCKET");
         
         Thread.sleep(TEST_PING_FREQUENCY * 2);
         client.invoke(CALLBACK_TEST);
  @@ -1300,6 +1303,50 @@
      }
      
      
  +   public void testServerRestart() throws Throwable
  +   {
  +      log.info("entering " + getName());
  +      String host = InetAddress.getLocalHost().getHostName();
  +      String locatorURI = getTransport() + "://" + host + ":" + port; 
  +      InvokerLocator serverLocator = new InvokerLocator(locatorURI);
  +      log.info("Connecting to: " + serverLocator);
  +      HashMap config = new HashMap();
  +      config.put(InvokerLocator.FORCE_REMOTE, "true");
  +      config.put(Bisocket.IS_CALLBACK_SERVER, "true");
  +      config.put(Bisocket.PING_FREQUENCY, TEST_PING_FREQUENCY_STRING);
  +      addExtraClientConfig(config);
  +      Client client = new Client(serverLocator, config);
  +      client.connect();
  +      log.info("client is connected");
  +      assertTrue(client.getInvoker() instanceof BisocketClientInvoker);
  +      SimpleCallbackHandler callbackHandler = new SimpleCallbackHandler();
  +      client.addListener(callbackHandler, new HashMap());
  +      log.info("client added callback handler");
  +      client.invoke(CALLBACK_TEST);
  +      assertEquals(1, callbackHandler.callbackCounter);
  +      
  +      Connector oldConnector = connector;
  +      connector.stop();
  +      log.info("STOPPED CONNECTOR");
  +      setUp();
  +      log.info("RESTARTED CONNECTOR");
  +      assertTrue(!connector.equals(oldConnector));
  +      
  +      Thread.sleep(TEST_PING_FREQUENCY * 3);
  +      
  +      // It is beyond the scope of Remoting to fail over to a new server,
  +      // complete with registered callback handlers.
  +      client.addListener(callbackHandler, new HashMap());
  +      log.info("client added callback handler");
  +      
  +      client.invoke(CALLBACK_TEST);
  +      assertEquals(2, callbackHandler.callbackCounter);
  +
  +      client.removeListener(callbackHandler);
  +      client.disconnect();
  +   }
  +   
  +   
      public static void main(String[] args)
      {
         BisocketTestCase testCase = new BisocketTestCase();