[jbossws-commits] JBossWS SVN: r4769 - in legacy/branches/jbossws-1.2.1.GA_JBWS-1803: jbossws-tests/src/java/org/jboss/test/ws/common/soap and 1 other directories.

Author: mageshbk(a)jboss.com Date: 2007-10-16 03:40:29 -0400 (Tue, 16 Oct 2007) New Revision: 4769 Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java Log: [JBWS-1803] Fixed test cases that failed after the update Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-10-16 07:22:47 UTC (rev 4768) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-core/src/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-10-16 07:40:29 UTC (rev 4769) @@ -39,8 +39,13 @@ import org.jboss.ws.WSException; import org.jboss.ws.core.HTTPMessageImpl; import org.jboss.ws.core.MessageAbstraction; +import org.jboss.ws.core.soap.EnvelopeBuilder; +import org.jboss.ws.core.soap.EnvelopeBuilderDOM; +import org.jboss.ws.core.soap.MessageContextAssociation; +import org.jboss.ws.core.soap.SOAPBodyImpl; +import org.jboss.ws.core.soap.SOAPContentElement; import org.jboss.ws.core.jaxrpc.Style; -import org.jboss.ws.core.soap.*; +import org.jboss.ws.core.soap.XMLFragment; import org.jboss.ws.core.utils.DOMUtils; import org.w3c.dom.Element; @@ -103,6 +108,7 @@ { if (style == Style.RPC) { + soapBody.removeContents(); EnvelopeBuilderDOM builder = new EnvelopeBuilderDOM(style); Element domBodyElement = DOMUtils.sourceToElement(source); builder.buildBodyElementRpc(soapBody, domBodyElement); Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-10-16 07:22:47 UTC (rev 4768) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/common/soap/SOAPContentElementTestCase.java 2007-10-16 07:40:29 UTC (rev 4769) @@ -184,7 +184,7 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); soapMessage.writeTo(baos); - String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:ns1='http://handlerservice1.org/wsdl'><String_1>wo... header was added</String_1></ns1:hello></env:Body></env:Envelope>"; + String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns:ns1='http://handlerservice1.org/wsdl'><String_1>wo... header was added</String_1></ns1:hello></env:Body></env:Envelope>"; assertEquals(expEnv, baos.toString()); } } Modified: legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java =================================================================== --- legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-10-16 07:22:47 UTC (rev 4768) +++ legacy/branches/jbossws-1.2.1.GA_JBWS-1803/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2007-10-16 07:40:29 UTC (rev 4769) @@ -41,7 +41,7 @@ */ public class ExceptionTestCase extends JBossWSTest { - private String targetNS = "http://exception.jaxws.ws.test.jboss.org/"; + private String targetNS = "http://exception.samples.jaxws.ws.test.jboss.org/"; private ExceptionEndpoint proxy; public static Test suite()