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

[Ron Sigal]

  User: rsigal  
  Date: 07/02/17 02:55:16

  Modified:    src/tests/org/jboss/test/remoting/transport/bisocket  Tag:
                        remoting_2_x BisocketTestCase.java
  Log:
  JBREM-650: Strengthened control connection failure tests.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.8   +31 -5     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.1.2.7
  retrieving revision 1.1.2.8
  diff -u -b -r1.1.2.7 -r1.1.2.8
  --- BisocketTestCase.java	13 Feb 2007 11:37:43 -0000	1.1.2.7
  +++ BisocketTestCase.java	17 Feb 2007 07:55:16 -0000	1.1.2.8
  @@ -64,7 +64,7 @@
   
   /** 
    * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.1.2.7 $
  + * @version $Revision: 1.1.2.8 $
    * <p>
    * Copyright Nov 25, 2006
    * </p>
  @@ -100,8 +100,8 @@
         if (firstTime)
         {
            firstTime = false;
  -         Logger.getLogger("org.jboss.remoting").setLevel(Level.DEBUG);
  -         Logger.getLogger("org.jboss.test.remoting").setLevel(Level.DEBUG);
  +         Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
  +         Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
            String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
            PatternLayout layout = new PatternLayout(pattern);
            ConsoleAppender consoleAppender = new ConsoleAppender(layout);
  @@ -1185,7 +1185,20 @@
         controlSocket.close();
         log.info("CLOSED CONTROL SOCKET");
         
  -      Thread.sleep(TEST_PING_FREQUENCY * 2);
  +      // Shut down the only existing ServerThread on the server side, and therefore
  +      // the only existing pooled connection on the client side, forcing the
  +      // next invocation to depend on the creation of a new control connection.
  +      field = SocketServerInvoker.class.getDeclaredField("clientpool");
  +      field.setAccessible(true);
  +      LRUPool clientpool = (LRUPool) field.get(serverInvoker);
  +      Set serverThreads = clientpool.getContents();
  +      assertEquals(1, serverThreads.size());
  +      ((ServerThread)serverThreads.iterator().next()).shutdown();
  +      HashMap metadata = new HashMap();
  +      metadata.put(COUNTER, new Integer(0));
  +      client.invoke(INVOCATION_TEST, metadata);
  +      
  +      Thread.sleep(TEST_PING_FREQUENCY * 4);
         client.invoke(CALLBACK_TEST);
         assertEquals(2, callbackHandler.callbackCounter);
         
  @@ -1265,7 +1278,20 @@
         clientSideControlSocket.close();
         log.info("CLOSED CONTROL SOCKET");
         
  -      Thread.sleep(TEST_PING_FREQUENCY * 2);
  +      // Shut down the only existing ServerThread on the server side, and therefore
  +      // the only existing pooled connection on the client side, forcing the
  +      // next invocation to depend on the creation of a new control connection.
  +      field = SocketServerInvoker.class.getDeclaredField("clientpool");
  +      field.setAccessible(true);
  +      LRUPool clientpool = (LRUPool) field.get(connector.getServerInvoker());
  +      Set serverThreads = clientpool.getContents();
  +      assertEquals(1, serverThreads.size());
  +      ((ServerThread)serverThreads.iterator().next()).shutdown();
  +      HashMap metadata = new HashMap();
  +      metadata.put(COUNTER, new Integer(0));
  +      client.invoke(INVOCATION_TEST, metadata);
  +      
  +      Thread.sleep(TEST_PING_FREQUENCY * 4);
         client.invoke(CALLBACK_TEST);
         assertEquals(2, callbackHandler.callbackCounter);
         Thread newControlConnectionThread = (Thread) controlConnectionThreads.iterator().next();