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 bde4919b..7ed435e0 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 @@ -20,6 +20,8 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPMessage; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.stream.StreamSource; @@ -30,6 +32,7 @@ import org.springframework.core.io.Resource; import org.springframework.ws.soap.AbstractSoapMessageTestCase; import org.springframework.ws.soap.SoapBody; import org.springframework.ws.soap.SoapVersion; +import org.springframework.ws.soap.saaj.SaajSoapMessage; import org.springframework.ws.transport.MockTransportOutputStream; import org.springframework.ws.transport.TransportConstants; import org.springframework.xml.transform.StringSource; @@ -74,7 +77,12 @@ public abstract class AbstractSoap12MessageTestCase extends AbstractSoapMessageT contentType.contains(SoapVersion.SOAP_12.getContentType())); assertNull(TransportConstants.HEADER_SOAP_ACTION + " header must not be found", tos.getHeaders().get(TransportConstants.HEADER_SOAP_ACTION)); - assertTrue("Invalid Content-Type set: " + contentType, contentType.contains(soapAction)); + String l = ""; + if (soapMessage instanceof SaajSoapMessage) { + MessageFactory messageFactory = MessageFactory.newInstance("SOAP_1_2_PROTOCOL"); + l = messageFactory.getClass().getName(); + } + assertTrue("Invalid Content-Type set: " + contentType + " " + l, contentType.contains(soapAction)); String resultAccept = tos.getHeaders().get("Accept"); assertNotNull("Invalid accept header", resultAccept); }