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

[Ron Sigal]

  User: rsigal  
  Date: 07/11/07 02:57:06

  Modified:    src/tests/org/jboss/test/remoting/transport/web  Tag:
                        remoting_2_x WebInvokerTestClient.java
  Log:
  JBREM-800:  (1) Moved oneway invocations to beginning of testPostInvocationSub() so they don't execute after the client has disconnected or server has shut down; (2) gave the oneway invocations their own copies of the metadata map with HEADER properties.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.13.4.6  +13 -8     JBossRemoting/src/tests/org/jboss/test/remoting/transport/web/WebInvokerTestClient.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WebInvokerTestClient.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/web/WebInvokerTestClient.java,v
  retrieving revision 1.13.4.5
  retrieving revision 1.13.4.6
  diff -u -b -r1.13.4.5 -r1.13.4.6
  --- WebInvokerTestClient.java	2 Nov 2007 06:54:19 -0000	1.13.4.5
  +++ WebInvokerTestClient.java	7 Nov 2007 07:57:06 -0000	1.13.4.6
  @@ -97,12 +97,22 @@
            }
            
            addHeaders(headerProps);
  -
            metadata.put("HEADER", headerProps);
   
  -         Object response = null;
  +         
  +         Properties headerProps1 = new Properties(headerProps);
  +         HashMap onewayMetadata1 = new HashMap(metadata);
  +         onewayMetadata1.put("HEADER", headerProps1);
  +         remotingClient.invokeOneway("Do something", onewayMetadata1, true);
  + 
  +         Properties headerProps2 = new Properties(headerProps);
  +         HashMap onewayMetadata2 = new HashMap(metadata);
  +         onewayMetadata2.put("HEADER", headerProps2);
  +         remotingClient.invokeOneway("Do something", onewayMetadata2, false);
  +         Thread.sleep(100);
   
            // test with null return expected
  +         Object response = null;
            response = remotingClient.invoke(WebInvocationHandler.NULL_RETURN_PARAM, metadata);
            log.debug("First response should be null and was: " + response);
            assertNull(response);
  @@ -133,11 +143,6 @@
   
            checkUserAgent(remotingClient, metadata);
   
  -         HashMap onewayMetadata1 = new HashMap(metadata);
  -         HashMap onewayMetadata2 = new HashMap(metadata);
  -         remotingClient.invokeOneway("Do something", onewayMetadata1, true);
  -         remotingClient.invokeOneway("Do something", onewayMetadata2, false);
  -         
            makeExceptionInvocation(remotingClient, metadata);
            
         }