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

[Ron Sigal]

  User: rsigal  
  Date: 06/12/20 03:57:15

  Modified:    src/tests/org/jboss/test/remoting/transport/bisocket  Tag:
                        remoting_2_x BisocketTestCase.java
  Log:
  JBREM-650: Added test for new server side control socket after control connection failure in two failure test methods.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +27 -8     JBossRemoting/src/tests/org/jboss/test/remoting/transport/bisocket/Attic/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/Attic/BisocketTestCase.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -b -r1.1.2.2 -r1.1.2.3
  --- BisocketTestCase.java	19 Dec 2006 06:13:07 -0000	1.1.2.2
  +++ BisocketTestCase.java	20 Dec 2006 08:57:15 -0000	1.1.2.3
  @@ -55,7 +55,7 @@
   
   /** 
    * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.1.2.2 $
  + * @version $Revision: 1.1.2.3 $
    * <p>
    * Copyright Nov 25, 2006
    * </p>
  @@ -1152,6 +1152,11 @@
         client.invoke(CALLBACK_TEST);
         assertEquals(2, callbackHandler.callbackCounter);
         
  +      field = BisocketClientInvoker.class.getDeclaredField("controlSocket");
  +      field.setAccessible(true);
  +      Socket newControlSocket = (Socket) field.get(clientInvoker);
  +      assertTrue(!controlSocket.equals(newControlSocket));
  +      
         client.removeListener(callbackHandler);
         client.disconnect();
      }
  @@ -1179,7 +1184,16 @@
         client.invoke(CALLBACK_TEST);
         assertEquals(1, callbackHandler.callbackCounter);
         
  -      Field field = Client.class.getDeclaredField("callbackConnectors");
  +      Iterator it = invocationHandler.callbackHandlers.iterator();
  +      ServerInvokerCallbackHandler serverInvokerCallbackHandler = (ServerInvokerCallbackHandler) it.next();
  +      Client callbackClient = serverInvokerCallbackHandler.getCallbackClient();
  +      assertTrue(callbackClient.getInvoker() instanceof BisocketClientInvoker);
  +      BisocketClientInvoker clientInvoker = (BisocketClientInvoker) callbackClient.getInvoker();
  +      Field field = BisocketClientInvoker.class.getDeclaredField("controlSocket");
  +      field.setAccessible(true);
  +      Socket serverSideControlSocket = (Socket) field.get(clientInvoker);
  +      
  +      field = Client.class.getDeclaredField("callbackConnectors");
         field.setAccessible(true);
         Map callbackConnectors = (Map) field.get(client);
         assertEquals(1, callbackConnectors.size());
  @@ -1193,7 +1207,7 @@
         Thread controlConnectionThread = (Thread) controlConnectionThreads.iterator().next();
         Class[] classes = BisocketServerInvoker.class.getDeclaredClasses();
         assertEquals(3, classes.length);
  -      Class invokerClass = null;
  +      Class controlConnectionThreadClass = null;
         for (int i = 0; i < classes.length; i++)
         {
            log.info(classes[i]);
  @@ -1202,16 +1216,16 @@
            log.info(className);
            if ("BisocketServerInvoker$ControlConnectionThread".equals(className))
            {
  -            invokerClass = classes[i];
  +            controlConnectionThreadClass = classes[i];
               break;
            }
         }
         
  -      assertTrue(invokerClass != null);
  -      field = invokerClass.getDeclaredField("controlSocket");
  +      assertTrue(controlConnectionThreadClass != null);
  +      field = controlConnectionThreadClass.getDeclaredField("controlSocket");
         field.setAccessible(true);
  -      Socket controlSocket = (Socket) field.get(controlConnectionThread);
  -      controlSocket.close();
  +      Socket clientSideControlSocket = (Socket) field.get(controlConnectionThread);
  +      clientSideControlSocket.close();
         
         Thread.sleep(TEST_PING_FREQUENCY * 2);
         client.invoke(CALLBACK_TEST);
  @@ -1219,6 +1233,11 @@
         Thread newControlConnectionThread = (Thread) controlConnectionThreads.iterator().next();
         assertTrue(!controlConnectionThread.equals(newControlConnectionThread));
         
  +      field = BisocketClientInvoker.class.getDeclaredField("controlSocket");
  +      field.setAccessible(true);
  +      Socket newServerSideControlSocket = (Socket) field.get(clientInvoker);
  +      assertTrue(!serverSideControlSocket.equals(newServerSideControlSocket));
  +      
         client.removeListener(callbackHandler);
         client.disconnect();
      }