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

[Ron Sigal]

  User: rsigal  
  Date: 07/11/02 19:40:29

  Modified:    src/tests/org/jboss/test/remoting/transport/bisocket  Tag:
                        remoting_2_x BisocketTestCase.java
  Log:
  JBREM-800: In testControlConnectionFailureBeforeFirstCallback(): (1) test that control connection is replaced and callback is possible; (2) eliminate irrelevent shutting down of ServerThread.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.18  +10 -27    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.17
  retrieving revision 1.1.2.18
  diff -u -b -r1.1.2.17 -r1.1.2.18
  --- BisocketTestCase.java	2 Nov 2007 19:23:04 -0000	1.1.2.17
  +++ BisocketTestCase.java	2 Nov 2007 23:40:29 -0000	1.1.2.18
  @@ -67,7 +67,7 @@
   
   /** 
    * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.1.2.17 $
  + * @version $Revision: 1.1.2.18 $
    * <p>
    * Copyright Nov 25, 2006
    * </p>
  @@ -1574,7 +1574,7 @@
         field.setAccessible(true);
         Map controlConnectionThreadMap = (Map) field.get(cbsi);
         assertEquals(1, controlConnectionThreadMap.size());
  -      Thread t = (Thread) controlConnectionThreadMap.values().iterator().next();
  +      Thread t1 = (Thread) controlConnectionThreadMap.values().iterator().next();
         Class[] classes = BisocketServerInvoker.class.getDeclaredClasses();
         Class controlConnectionThreadClass = null;
         
  @@ -1592,43 +1592,26 @@
         }
         
         assertNotNull(controlConnectionThreadClass);
  -      assertEquals(t.getClass(), controlConnectionThreadClass);
  +      assertEquals(t1.getClass(), controlConnectionThreadClass);
         field = controlConnectionThreadClass.getDeclaredField("controlSocket");
         field.setAccessible(true);
  -      Socket controlSocket = (Socket) field.get(t);
  +      Socket controlSocket = (Socket) field.get(t1);
         assertNotNull(controlSocket);
         controlSocket.close();
         log.info("CLOSED CONTROL SOCKET");
         
  -      // 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);
  -      ServerInvoker serverInvoker = connector.getServerInvoker();
  -      assertTrue(serverInvoker instanceof BisocketServerInvoker);
  -      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);
  -      
  +      log.info("*****************  PingTimerTask failure EXPECTED *********************");
         field = controlConnectionThreadClass.getDeclaredField("MAX_INITIAL_ATTEMPTS");
         field.setAccessible(true);
         int MAX_INITIAL_ATTEMPTS = ((Integer) field.get(null)).intValue();
  -      
  -      Thread.sleep(TEST_PING_FREQUENCY * MAX_INITIAL_ATTEMPTS);
  -      log.info("**********************  EXCEPTION EXPECTED ****************************");
  -      client.invoke(CALLBACK_TEST);
  +      Thread.sleep(TEST_PING_FREQUENCY * (MAX_INITIAL_ATTEMPTS + 1) + 5000);
         log.info("***********************************************************************");
  -      // Callback should not be possible because contol connection is disabled.
  -      assertEquals(0, callbackHandler.callbackCounter);
         
  -      Thread.sleep(TEST_PING_FREQUENCY * MAX_INITIAL_ATTEMPTS);
  -      client.invoke(CALLBACK_TEST);
         // Callback should be possible because control connection has been replaced.
  +      assertEquals(1, controlConnectionThreadMap.size());
  +      Thread t2 = (Thread) controlConnectionThreadMap.values().iterator().next();
  +      assertNotSame(t2, t1);
  +      client.invoke(CALLBACK_TEST);
         assertEquals(1, callbackHandler.callbackCounter);
         
         client.removeListener(callbackHandler);