Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Addes setDocument/getDocument to SoapMessage, for use in Wss4jSecurityInterceptor

Browse Source
This commit is contained in:
Arjen Poutsma
2010-09-13 11:48:09 +00:00
parent 9e2a646aed
commit aeee118f96
15 changed files with 408 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/test/java/org/springframework/ws/soap/AbstractSoapMessageTestCase.java
View File

@@ -130,4 +130,14 @@ public abstract class AbstractSoapMessageTestCase extends AbstractMimeMessageTes
@Test
public abstract void testWriteToTransportResponseAttachment() throws Exception;
@Test
public abstract void testToDocument() throws Exception;
@Test
public abstract void testSetLiveDocument() throws Exception;
@Test
public abstract void testSetOtherDocument() throws Exception;
}

2
core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap11MessageTest.java
View File

@@ -45,7 +45,7 @@ public class SaajSoap11MessageTest extends AbstractSoap11MessageTestCase {
MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL);
saajMessage = messageFactory.createMessage();
saajMessage.getSOAPHeader().detachNode();
return new SaajSoapMessage(saajMessage);
return new SaajSoapMessage(saajMessage, true, messageFactory);
}
@Test

2
core/src/test/java/org/springframework/ws/soap/saaj/SaajSoap12MessageTest.java
View File

@@ -40,7 +40,7 @@ public class SaajSoap12MessageTest extends AbstractSoap12MessageTestCase {
MessageFactory messageFactory = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL);
saajMessage = messageFactory.createMessage();
saajMessage.getSOAPHeader().detachNode();
return new SaajSoapMessage(saajMessage);
return new SaajSoapMessage(saajMessage, true, messageFactory);
}
public void testGetPayloadSource() throws Exception {

72
core/src/test/java/org/springframework/ws/soap/soap11/AbstractSoap11MessageTestCase.java
View File

@@ -16,7 +16,12 @@
package org.springframework.ws.soap.soap11;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamSource;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.ClassPathResource;
@@ -29,6 +34,8 @@ import org.springframework.ws.transport.MockTransportOutputStream;
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.*;
@@ -81,4 +88,69 @@ public abstract class AbstractSoap11MessageTestCase extends AbstractSoapMessageT
assertTrue("Content-Type for attachment message does not contains type=\"text/xml\"",
contentType.indexOf("type=\"text/xml\"") != -1);
}
@Override
public void testToDocument() throws Exception {
transformer.transform(new StringSource("<payload xmlns='http://www.springframework.org' />"),
soapMessage.getSoapBody().getPayloadResult());
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
Document expected = documentBuilder.newDocument();
Element envelope = expected.createElementNS("http://schemas.xmlsoap.org/soap/envelope/", "Envelope");
expected.appendChild(envelope);
Element body = expected.createElementNS("http://schemas.xmlsoap.org/soap/envelope/", "Body");
envelope.appendChild(body);
Element payload = expected.createElementNS("http://www.springframework.org", "payload");
body.appendChild(payload);
Document result = soapMessage.getDocument();
assertXMLEqual(expected, result);
}
@Override
public void testSetLiveDocument() throws Exception {
transformer.transform(new StringSource("<payload xmlns='http://www.springframework.org' />"),
soapMessage.getSoapBody().getPayloadResult());
Document document = soapMessage.getDocument();
soapMessage.setDocument(document);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
soapMessage.writeTo(bos);
String result = bos.toString("UTF-8");
assertXMLEqual(
"<Envelope xmlns='http://schemas.xmlsoap.org/soap/envelope/'><Body><payload xmlns='http://www.springframework.org' /></Body></Envelope>",
result);
}
@Override
public void testSetOtherDocument() throws Exception {
transformer.transform(new StringSource("<payload xmlns='http://www.springframework.org' />"),
soapMessage.getSoapBody().getPayloadResult());
ByteArrayOutputStream bos = new ByteArrayOutputStream();
soapMessage.writeTo(bos);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
DOMResult domResult = new DOMResult();
transformer.transform(new StreamSource(bis), domResult);
Document document = (Document) domResult.getNode();
soapMessage.setDocument(document);
bos = new ByteArrayOutputStream();
soapMessage.writeTo(bos);
String result = bos.toString("UTF-8");
assertXMLEqual(
"<Envelope xmlns='http://schemas.xmlsoap.org/soap/envelope/'><Body><payload xmlns='http://www.springframework.org' /></Body></Envelope>",
result);
}
}

74
core/src/test/java/org/springframework/ws/soap/soap12/AbstractSoap12MessageTestCase.java
View File

@@ -16,7 +16,12 @@
package org.springframework.ws.soap.soap12;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamSource;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.ClassPathResource;
@@ -30,6 +35,8 @@ 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.*;
@@ -85,4 +92,71 @@ public abstract class AbstractSoap12MessageTestCase extends AbstractSoapMessageT
contentType.indexOf("type=\"application/soap+xml\"") != -1);
}
@Override
public void testToDocument() throws Exception {
transformer.transform(new StringSource("<payload xmlns='http://www.springframework.org' />"),
soapMessage.getSoapBody().getPayloadResult());
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
documentBuilderFactory.setNamespaceAware(true);
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
Document expected = documentBuilder.newDocument();
Element envelope = expected.createElementNS("http://www.w3.org/2003/05/soap-envelope", "Envelope");
expected.appendChild(envelope);
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");
body.appendChild(payload);
Document result = soapMessage.getDocument();
assertXMLEqual(expected, result);
}
@Override
public void testSetLiveDocument() throws Exception {
transformer.transform(new StringSource("<payload xmlns='http://www.springframework.org' />"),
soapMessage.getSoapBody().getPayloadResult());
Document document = soapMessage.getDocument();
soapMessage.setDocument(document);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
soapMessage.writeTo(bos);
String result = bos.toString("UTF-8");
assertXMLEqual(
"<Envelope xmlns='http://www.w3.org/2003/05/soap-envelope'><Body><payload xmlns='http://www.springframework.org' /></Body></Envelope>",
result);
}
@Override
public void testSetOtherDocument() throws Exception {
transformer.transform(new StringSource("<payload xmlns='http://www.springframework.org' />"),
soapMessage.getSoapBody().getPayloadResult());
ByteArrayOutputStream bos = new ByteArrayOutputStream();
soapMessage.writeTo(bos);
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
DOMResult domResult = new DOMResult();
transformer.transform(new StreamSource(bis), domResult);
Document document = (Document) domResult.getNode();
soapMessage.setDocument(document);
bos = new ByteArrayOutputStream();
soapMessage.writeTo(bos);
String result = bos.toString("UTF-8");
assertXMLEqual(
"<Envelope xmlns='http://www.w3.org/2003/05/soap-envelope'><Body><payload xmlns='http://www.springframework.org' /></Body></Envelope>",
result);
}
}