From 6907b50b36227c15fad5cbd9c8e94207fdd0b049 Mon Sep 17 00:00:00 2001 From: Greg Turnquist Date: Mon, 2 Nov 2015 17:01:08 -0600 Subject: [PATCH] SWS-922 Upgrade to Axiom 1.2.15 --- build.gradle | 3 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- .../soap/axiom/AxiomSoapMessageFactory.java | 4 +-- ...JaxbElementPayloadMethodProcessorTest.java | 9 ++++--- ...RootElementPayloadMethodProcessorTest.java | 11 +++++--- .../ws/soap/AbstractSoapMessageTestCase.java | 18 +++++++++---- .../ws/soap/axiom/AxiomSoap11MessageTest.java | 5 ++++ .../AxiomSoap11NonCachingMessageTest.java | 8 +++++- .../ws/soap/axiom/AxiomSoap12MessageTest.java | 5 ++++ .../AxiomSoap12NonCachingMessageTest.java | 9 +++++-- .../ws/soap/saaj/SaajSoap11MessageTest.java | 16 +++++++++--- .../ws/soap/saaj/SaajSoap12MessageTest.java | 10 +++++++ .../PayloadValidatingInterceptorTest.java | 5 ++-- .../soap11/AbstractSoap11MessageTestCase.java | 19 ++++++++++---- .../soap12/AbstractSoap12MessageTestCase.java | 26 ++++++++++++------- 15 files changed, 112 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index a1fe4e3d..f945c837 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ configure(allprojects) { ext.springVersion = "4.0.9.RELEASE" ext.springSecurityVersion = "3.2.7.RELEASE" - ext.axiomVersion = "1.2.14" + ext.axiomVersion = "1.2.15" apply plugin: "java" @@ -59,6 +59,7 @@ configure(allprojects) { testCompile("junit:junit:4.10") testCompile("org.easymock:easymock:3.1") testCompile("xmlunit:xmlunit:1.5") + testCompile("com.sun.mail:javax.mail:1.5.4") testRuntime("org.codehaus.woodstox:woodstox-core-asl:4.2.0") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 92ebd4e2..126e7bae 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Tue Dec 15 09:56:17 CST 2015 +#Tue Dec 15 10:03:30 CST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java index 3b9ee1e8..d3e90bd3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java @@ -271,7 +271,7 @@ public class AxiomSoapMessageFactory implements SoapMessageFactory, Initializing XMLStreamReader reader = inputFactory.createXMLStreamReader(inputStream, getCharSetEncoding(contentType)); String envelopeNamespace = getSoapEnvelopeNamespace(contentType); StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(reader, soapFactory, envelopeNamespace); - SOAPMessage soapMessage = builder.getSoapMessage(); + SOAPMessage soapMessage = builder.getSOAPMessage(); return new AxiomSoapMessage(soapMessage, soapAction, payloadCaching, langAttributeOnSoap11FaultString); } @@ -297,7 +297,7 @@ public class AxiomSoapMessageFactory implements SoapMessageFactory, Initializing throw new AxiomSoapMessageCreationException( "Unknown attachment type: [" + attachments.getAttachmentSpecType() + "]"); } - return new AxiomSoapMessage(builder.getSoapMessage(), attachments, soapAction, payloadCaching, + return new AxiomSoapMessage(builder.getSOAPMessage(), attachments, soapAction, payloadCaching, langAttributeOnSoap11FaultString); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java index c0c8d1ef..6baeaa75 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/JaxbElementPayloadMethodProcessorTest.java @@ -25,8 +25,6 @@ import javax.xml.namespace.QName; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; -import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; -import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; @@ -42,6 +40,11 @@ import org.springframework.ws.soap.axiom.AxiomSoapMessage; import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory; import org.springframework.xml.transform.StringResult; +import static org.custommonkey.xmlunit.XMLAssert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class JaxbElementPayloadMethodProcessorTest { private JaxbElementPayloadMethodProcessor processor; @@ -141,7 +144,7 @@ public class JaxbElementPayloadMethodProcessorTest { response.writeTo(bos); String messageResult = bos.toString("UTF-8"); - assertXMLEqual("" + + assertXMLEqual("" + "Foo" + "", messageResult); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java index 09aa7a6e..dd3766a8 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/XmlRootElementPayloadMethodProcessorTest.java @@ -29,8 +29,6 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.sax.SAXSource; -import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; -import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; import org.xml.sax.ContentHandler; @@ -52,6 +50,11 @@ import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory; import org.springframework.xml.sax.AbstractXmlReader; import org.springframework.xml.transform.StringResult; +import static org.custommonkey.xmlunit.XMLAssert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class XmlRootElementPayloadMethodProcessorTest { private XmlRootElementPayloadMethodProcessor processor; @@ -207,7 +210,7 @@ public class XmlRootElementPayloadMethodProcessorTest { response.writeTo(bos); String messageResult = bos.toString("UTF-8"); - assertXMLEqual("" + + assertXMLEqual("" + "Foo" + "", messageResult); @@ -230,7 +233,7 @@ public class XmlRootElementPayloadMethodProcessorTest { response.writeTo(bos); String messageResult = bos.toString("UTF-8"); - assertXMLEqual("" + + assertXMLEqual("" + "Foo" + "", messageResult); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java index 490121ac..d0f5e8d2 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java @@ -24,6 +24,9 @@ import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; +import org.junit.Test; +import org.xml.sax.SAXParseException; + import org.springframework.core.io.Resource; import org.springframework.util.StringUtils; import org.springframework.ws.mime.AbstractMimeMessageTestCase; @@ -36,14 +39,19 @@ import org.springframework.xml.transform.StringResult; import org.springframework.xml.validation.XmlValidator; import org.springframework.xml.validation.XmlValidatorFactory; -import org.junit.Test; -import org.xml.sax.SAXParseException; - -import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; -import static org.junit.Assert.*; +import static org.custommonkey.xmlunit.XMLAssert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public abstract class AbstractSoapMessageTestCase extends AbstractMimeMessageTestCase { + protected abstract String getNS(); + + protected String getHeader() { + return "<" + getNS() + ":Header/>"; + } + protected SoapMessage soapMessage; @Override diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java index 9f7c936b..7d618b14 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11MessageTest.java @@ -23,6 +23,11 @@ import org.springframework.ws.soap.soap11.AbstractSoap11MessageTestCase; public class AxiomSoap11MessageTest extends AbstractSoap11MessageTestCase { + @Override + protected String getNS() { + return "soapenv"; + } + @Override protected SoapMessage createSoapMessage() throws Exception { SOAPFactory axiomFactory = OMAbstractFactory.getSOAP11Factory(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java index 0457a7b0..2893c20e 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap11NonCachingMessageTest.java @@ -17,15 +17,21 @@ package org.springframework.ws.soap.axiom; import org.apache.axiom.om.impl.llom.OMSourcedElementImpl; -import static org.junit.Assert.*; import org.springframework.ws.soap.SoapBody; import org.springframework.ws.soap.SoapMessage; import org.springframework.ws.soap.SoapVersion; import org.springframework.ws.soap.soap11.AbstractSoap11MessageTestCase; +import static org.junit.Assert.*; + public class AxiomSoap11NonCachingMessageTest extends AbstractSoap11MessageTestCase { + @Override + protected String getNS() { + return "soapenv"; + } + @Override protected SoapMessage createSoapMessage() throws Exception { AxiomSoapMessageFactory messageFactory = new AxiomSoapMessageFactory(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java index 21c9ed96..00ee7e85 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12MessageTest.java @@ -23,6 +23,11 @@ import org.springframework.ws.soap.soap12.AbstractSoap12MessageTestCase; public class AxiomSoap12MessageTest extends AbstractSoap12MessageTestCase { + @Override + protected String getNS() { + return "soapenv"; + } + @Override protected SoapMessage createSoapMessage() throws Exception { SOAPFactory axiomFactory = OMAbstractFactory.getSOAP12Factory(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java index 84defa95..42562fae 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/axiom/AxiomSoap12NonCachingMessageTest.java @@ -16,17 +16,22 @@ package org.springframework.ws.soap.axiom; +import org.apache.axiom.om.impl.llom.OMSourcedElementImpl; + import org.springframework.ws.soap.SoapBody; import org.springframework.ws.soap.SoapMessage; import org.springframework.ws.soap.SoapVersion; import org.springframework.ws.soap.soap12.AbstractSoap12MessageTestCase; -import org.apache.axiom.om.impl.llom.OMSourcedElementImpl; - import static org.junit.Assert.*; public class AxiomSoap12NonCachingMessageTest extends AbstractSoap12MessageTestCase { + @Override + protected String getNS() { + return "soapenv"; + } + @Override protected SoapMessage createSoapMessage() throws Exception { AxiomSoapMessageFactory messageFactory = new AxiomSoapMessageFactory(); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java index da886844..50a24eff 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java @@ -25,14 +25,14 @@ import javax.xml.soap.SOAPMessage; import javax.xml.transform.Result; import javax.xml.transform.Source; +import org.junit.Test; + import org.springframework.ws.soap.SoapMessage; import org.springframework.ws.soap.soap11.AbstractSoap11MessageTestCase; import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; -import org.junit.Test; - -import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; +import static org.custommonkey.xmlunit.XMLAssert.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -40,6 +40,16 @@ public class SaajSoap11MessageTest extends AbstractSoap11MessageTestCase { private SOAPMessage saajMessage; + @Override + protected String getNS() { + return "SOAP-ENV"; + } + + @Override + protected String getHeader() { + return ""; + } + @Override protected final SoapMessage createSoapMessage() throws Exception { MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java index 4e778ad4..109c5583 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java @@ -33,6 +33,16 @@ import static org.junit.Assert.assertTrue; public class SaajSoap12MessageTest extends AbstractSoap12MessageTestCase { + @Override + protected String getNS() { + return "env"; + } + + @Override + protected String getHeader() { + return ""; + } + private SOAPMessage saajMessage; @Override diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java index 74a2f8bd..1254a260 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/server/endpoint/interceptor/PayloadValidatingInterceptorTest.java @@ -27,7 +27,6 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamSource; -import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -55,6 +54,8 @@ import org.springframework.ws.transport.TransportInputStream; import org.springframework.xml.validation.ValidationErrorHandler; import org.springframework.xml.xsd.SimpleXsdSchema; +import static org.custommonkey.xmlunit.XMLAssert.*; + public class PayloadValidatingInterceptorTest { private PayloadValidatingInterceptor interceptor; @@ -302,7 +303,7 @@ public class PayloadValidatingInterceptorTest { ByteArrayOutputStream os = new ByteArrayOutputStream(); messageContext.getResponse().writeTo(os); assertXMLEqual( - "" + "" + + "" + "" + "" + "" + "soapenv:Client" + "Validation error" + "" + "Message 1" + diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java index 3f405f1f..4375fcfe 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java @@ -24,8 +24,6 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.stream.StreamSource; import junit.framework.Assert; -import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; -import static org.junit.Assert.*; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -39,6 +37,11 @@ import org.springframework.ws.soap.SoapVersion; import org.springframework.ws.transport.MockTransportOutputStream; import org.springframework.xml.transform.StringSource; +import static org.custommonkey.xmlunit.XMLAssert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public abstract class AbstractSoap11MessageTestCase extends AbstractSoapMessageTestCase { @Override @@ -64,7 +67,7 @@ public abstract class AbstractSoap11MessageTestCase extends AbstractSoapMessageT soapMessage.writeTo(tos); String result = bos.toString("UTF-8"); assertXMLEqual( - "", + "<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://schemas.xmlsoap.org/soap/envelope/'>" + getHeader() + "<" + getNS() + ":Body>", result); String contentType = tos.getHeaders().get("Content-Type"); assertTrue("Invalid Content-Type set", contentType.indexOf(SoapVersion.SOAP_11.getContentType()) != -1); @@ -99,6 +102,12 @@ public abstract class AbstractSoap11MessageTestCase extends AbstractSoapMessageT Document expected = documentBuilder.newDocument(); Element envelope = expected.createElementNS("http://schemas.xmlsoap.org/soap/envelope/", "Envelope"); expected.appendChild(envelope); + + if (!getHeader().isEmpty()) { + Element header = expected.createElementNS("http://schemas.xmlsoap.org/soap/envelope/", "Header"); + envelope.appendChild(header); + } + Element body = expected.createElementNS("http://schemas.xmlsoap.org/soap/envelope/", "Body"); envelope.appendChild(body); Element payload = expected.createElementNS("http://www.springframework.org", "payload"); @@ -123,7 +132,7 @@ public abstract class AbstractSoap11MessageTestCase extends AbstractSoapMessageT String result = bos.toString("UTF-8"); assertXMLEqual( - "", + "<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://schemas.xmlsoap.org/soap/envelope/'>" + getHeader() + "<" + getNS() + ":Body>", result); } @@ -148,7 +157,7 @@ public abstract class AbstractSoap11MessageTestCase extends AbstractSoapMessageT String result = bos.toString("UTF-8"); assertXMLEqual( - "", + "<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://schemas.xmlsoap.org/soap/envelope/'>" + getHeader() + "<" + getNS() + ":Body>", result); } diff --git a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java index b5ae4865..ed8e9115 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java @@ -23,6 +23,10 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.stream.StreamSource; +import junit.framework.Assert; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.InputStreamSource; @@ -34,12 +38,10 @@ import org.springframework.ws.transport.MockTransportOutputStream; import org.springframework.ws.transport.TransportConstants; import org.springframework.xml.transform.StringSource; -import junit.framework.Assert; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; -import static org.junit.Assert.*; +import static org.custommonkey.xmlunit.XMLAssert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public abstract class AbstractSoap12MessageTestCase extends AbstractSoapMessageTestCase { @@ -67,7 +69,7 @@ public abstract class AbstractSoap12MessageTestCase extends AbstractSoapMessageT soapMessage.writeTo(tos); String result = bos.toString("UTF-8"); assertXMLEqual( - "", + "<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://www.w3.org/2003/05/soap-envelope'>" + getHeader() + "<" + getNS() + ":Body>", result); String contentType = tos.getHeaders().get(TransportConstants.HEADER_CONTENT_TYPE); assertTrue("Invalid Content-Type set", @@ -104,6 +106,12 @@ public abstract class AbstractSoap12MessageTestCase extends AbstractSoapMessageT Document expected = documentBuilder.newDocument(); Element envelope = expected.createElementNS("http://www.w3.org/2003/05/soap-envelope", "Envelope"); expected.appendChild(envelope); + + if (!getHeader().isEmpty()) { + Element header = expected.createElementNS("http://www.w3.org/2003/05/soap-envelope", "Header"); + envelope.appendChild(header); + } + Element body = expected.createElementNS("http://www.w3.org/2003/05/soap-envelope", "Body"); envelope.appendChild(body); Element payload = expected.createElementNS("http://www.springframework.org", "payload"); @@ -128,7 +136,7 @@ public abstract class AbstractSoap12MessageTestCase extends AbstractSoapMessageT String result = bos.toString("UTF-8"); assertXMLEqual( - "", + "<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://www.w3.org/2003/05/soap-envelope'>" + getHeader() + "<" + getNS() + ":Body>", result); } @@ -153,7 +161,7 @@ public abstract class AbstractSoap12MessageTestCase extends AbstractSoapMessageT String result = bos.toString("UTF-8"); assertXMLEqual( - "", + "<" + getNS() + ":Envelope xmlns:" + getNS() + "='http://www.w3.org/2003/05/soap-envelope'>" + getHeader() + "<" + getNS() + ":Body>", result); }