[jbossws-commits] JBossWS SVN: r3277 - in trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws: samples/wsaddressing and 1 other directory.

Author: heiko.braun(a)jboss.com Date: 2007-05-29 06:29:48 -0400 (Tue, 29 May 2007) New Revision: 3277 Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java Log: Merged from Branch_2_0 Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-05-29 10:20:21 UTC (rev 3276) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/HandlerLifecycleTestCase.java 2007-05-29 10:29:48 UTC (rev 3277) @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.StringTokenizer; import javax.xml.namespace.QName; import javax.xml.ws.BindingProvider; @@ -51,7 +52,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(HandlerLifecycleTestCase.class, "jaxws-handlerlifecycle.war"); + return JBossWSTestSetup.newTestSetup(HandlerLifecycleTestCase.class, "jaxws-handlerlifecycle.war, jaxws-handlerlifecycle-client.jar"); } public void setUp() throws Exception @@ -85,25 +86,43 @@ * All handlers return true */ public void testHandleMessageTrue() throws Exception - { - System.out.println("FIXME: [JBWS-1579] @EndpointConfig ignored on SEI"); - + { String testResponse = port.runTest(getName()); String trackerMessages = HandlerTracker.getListMessages(); List<String> expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:PostConstruct"); + expMessages.add("PreClientHandler2:PostConstruct"); expMessages.add("ClientHandler1:PostConstruct"); expMessages.add("ClientHandler2:PostConstruct"); expMessages.add("ClientHandler3:PostConstruct"); + expMessages.add("PostClientHandler1:PostConstruct"); + expMessages.add("PostClientHandler2:PostConstruct"); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Message:InBound"); expMessages.add("ClientHandler2:Message:InBound"); expMessages.add("ClientHandler1:Message:InBound"); + expMessages.add("PreClientHandler2:Message:InBound"); + expMessages.add("PreClientHandler1:Message:InBound"); + + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); assertEquals(expMessages.toString(), trackerMessages); trackerMessages = trackerPort.getListMessages(); @@ -159,10 +178,18 @@ String trackerMessages = HandlerTracker.getListMessages(); List<String> expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound:false"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); trackerMessages = trackerPort.getListMessages(); @@ -172,6 +199,20 @@ assertNull(testResponse); } + private void dumpTracker(String trackerMessages) + { + StringTokenizer tok = new StringTokenizer(trackerMessages, ","); + while(tok.hasMoreTokens()) + { + System.out.print("expMessages.add(\""); + String s = tok.nextToken().trim(); + if(s.startsWith("[")) s = s.substring(1); + if(s.endsWith("]")) s = s.substring(0, s.length()-1); + System.out.print(s); + System.out.print("\");\n"); + } + } + /** * ClientHandler2 throws a RuntimeException on outbound */ @@ -190,11 +231,25 @@ String trackerMessages = HandlerTracker.getListMessages(); List<String> expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound:ErrorInClientHandler2"); + + expMessages.add("PostClientHandler2:Fault:InBound"); + expMessages.add("PostClientHandler1:Fault:InBound"); expMessages.add("ClientHandler1:Fault:InBound"); + expMessages.add("PreClientHandler2:Fault:InBound"); + expMessages.add("PreClientHandler1:Fault:InBound"); + + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); trackerMessages = trackerPort.getListMessages(); @@ -224,19 +279,34 @@ expMessages.add("ServerHandler3:Close"); expMessages.add("PostServerHandler1:Close"); expMessages.add("PostServerHandler2:Close"); + assertEquals(expMessages.toString(), trackerMessages); trackerMessages = HandlerTracker.getListMessages(); expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Message:InBound"); expMessages.add("ClientHandler2:Message:InBound"); expMessages.add("ClientHandler1:Message:InBound"); + expMessages.add("PreClientHandler2:Message:InBound"); + expMessages.add("PreClientHandler1:Message:InBound"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); assertEquals("testServerHandler2Response", testResponse); @@ -271,19 +341,34 @@ expMessages.add("ServerHandler3:Close"); expMessages.add("PostServerHandler1:Close"); expMessages.add("PostServerHandler2:Close"); + assertEquals(expMessages.toString(), trackerMessages); trackerMessages = HandlerTracker.getListMessages(); expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Fault:InBound"); expMessages.add("ClientHandler2:Fault:InBound"); expMessages.add("ClientHandler1:Fault:InBound"); + expMessages.add("PreClientHandler2:Fault:InBound"); + expMessages.add("PreClientHandler1:Fault:InBound"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); assertEquals("ErrorInServerHandler2", testResponse); @@ -320,15 +405,29 @@ trackerMessages = HandlerTracker.getListMessages(); expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Message:InBound"); expMessages.add("ClientHandler2:Message:InBound"); expMessages.add("ClientHandler1:Message:InBound"); + expMessages.add("PreClientHandler2:Message:InBound"); + expMessages.add("PreClientHandler1:Message:InBound"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); assertEquals(getName() + "Response", testResponse); @@ -377,15 +476,29 @@ trackerMessages = HandlerTracker.getListMessages(); expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Fault:InBound"); expMessages.add("ClientHandler2:Fault:InBound"); expMessages.add("ClientHandler1:Fault:InBound"); + expMessages.add("PreClientHandler2:Fault:InBound"); + expMessages.add("PreClientHandler1:Fault:InBound"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); assertEquals("ErrorInServerHandler2", testResponse); @@ -400,14 +513,26 @@ String trackerMessages = HandlerTracker.getListMessages(); List<String> expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Message:InBound"); expMessages.add("ClientHandler2:Message:InBound:false"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); trackerMessages = trackerPort.getListMessages(); @@ -456,15 +581,29 @@ String trackerMessages = HandlerTracker.getListMessages(); List<String> expMessages = new ArrayList<String>(); + + expMessages.add("PreClientHandler1:Message:OutBound"); + expMessages.add("PreClientHandler2:Message:OutBound"); expMessages.add("ClientHandler1:Message:OutBound"); expMessages.add("ClientHandler2:Message:OutBound"); expMessages.add("ClientHandler3:Message:OutBound"); + expMessages.add("PostClientHandler1:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:OutBound"); + expMessages.add("PostClientHandler2:Message:InBound"); + expMessages.add("PostClientHandler1:Message:InBound"); expMessages.add("ClientHandler3:Message:InBound"); expMessages.add("ClientHandler2:Message:InBound:ErrorInClientHandler2"); expMessages.add("ClientHandler1:Fault:InBound"); + expMessages.add("PreClientHandler2:Fault:InBound"); + expMessages.add("PreClientHandler1:Fault:InBound"); + expMessages.add("PostClientHandler2:Close"); + expMessages.add("PostClientHandler1:Close"); expMessages.add("ClientHandler3:Close"); expMessages.add("ClientHandler2:Close"); expMessages.add("ClientHandler1:Close"); + expMessages.add("PreClientHandler2:Close"); + expMessages.add("PreClientHandler1:Close"); + assertEquals(expMessages.toString(), trackerMessages); trackerMessages = trackerPort.getListMessages(); Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java 2007-05-29 10:20:21 UTC (rev 3276) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.java 2007-05-29 10:29:48 UTC (rev 3277) @@ -22,12 +22,14 @@ package org.jboss.test.ws.jaxws.handlerlifecycle; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.soap.SOAPHandler; import javax.xml.ws.handler.soap.SOAPMessageContext; @@ -186,8 +188,32 @@ String testMethod; try { - SOAPElement soapElement = (SOAPElement)((SOAPMessageContext)msgContext).getMessage().getSOAPBody().getChildElements().next(); - soapElement = (SOAPElement)soapElement.getChildElements().next(); + + SOAPMessage message = ((SOAPMessageContext)msgContext).getMessage(); + SOAPElement soapElement = null; + Iterator it = message.getSOAPBody().getChildElements(); + + while (soapElement == null && it.hasNext()) + { + Object current = it.next(); + if (current instanceof SOAPElement) + { + soapElement = (SOAPElement)current; + } + } + + it = soapElement.getChildElements(); + soapElement = null; + + while (soapElement == null && it.hasNext()) + { + Object current = it.next(); + if (current instanceof SOAPElement) + { + soapElement = (SOAPElement)current; + } + } + testMethod = soapElement.getValue(); } catch (SOAPException e) Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-05-29 10:20:21 UTC (rev 3276) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.java 2007-05-29 10:29:48 UTC (rev 3277) @@ -61,7 +61,7 @@ String clientid = null; EndpointReference replyTo = addrProps.getReplyTo(); - ReferenceParameters refParams = replyTo.getReferenceParameters(); + ReferenceParameters refParams = replyTo!=null ? replyTo.getReferenceParameters() : null; if (refParams != null) { for (Object obj : refParams.getElements()) Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java 2007-05-29 10:20:21 UTC (rev 3276) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.java 2007-05-29 10:29:48 UTC (rev 3277) @@ -41,7 +41,6 @@ */ @WebService(name = "StatefulEndpoint", targetNamespace = "http://org.jboss.ws/samples/wsaddressing", serviceName = "TestService") @SOAPBinding(style = SOAPBinding.Style.RPC) -@EndpointConfig(configName = "Standard WSAddressing Endpoint") public interface StatefulEndpoint extends Remote { @WebMethod