SPR-5539: Add XML HttpMessageConverters

org.springframework.web/src/test/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverterTest.java

@@ -0,0 +1,60 @@
+package org.springframework.http.converter.xml;
+
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.http.MediaType;
+import org.springframework.http.MockHttpInputMessage;
+import org.springframework.http.MockHttpOutputMessage;
+import org.springframework.oxm.Marshaller;
+import org.springframework.oxm.Unmarshaller;
+
+/** @author Arjen Poutsma */
+public class MarshallingHttpMessageConverterTest {
+
+	private MarshallingHttpMessageConverter converter;
+
+	private Marshaller marshaller;
+
+	private Unmarshaller unmarshaller;
+
+	@Before
+	public void setUp() {
+		marshaller = createMock(Marshaller.class);
+		unmarshaller = createMock(Unmarshaller.class);
+
+		converter = new MarshallingHttpMessageConverter(marshaller, unmarshaller);
+	}
+
+	@Test
+	public void read() throws Exception {
+		String body = "<root>Hello World</root>";
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+
+		expect(unmarshaller.unmarshal(isA(StreamSource.class))).andReturn(body);
+
+		replay(marshaller, unmarshaller);
+		String result = (String) converter.read(Object.class, inputMessage);
+		assertEquals("Invalid result", body, result);
+		verify(marshaller, unmarshaller);
+	}
+
+	@Test
+	public void write() throws Exception {
+		String body = "<root>Hello World</root>";
+		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
+
+		marshaller.marshal(eq(body), isA(StreamResult.class));
+
+		replay(marshaller, unmarshaller);
+		converter.write(body, outputMessage);
+		assertEquals("Invalid content-type", new MediaType("application", "xml"),
+				outputMessage.getHeaders().getContentType());
+		verify(marshaller, unmarshaller);
+	}
+}

org.springframework.web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTest.java

@@ -0,0 +1,89 @@
+package org.springframework.http.converter.xml;
+
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamSource;
+
+import static org.custommonkey.xmlunit.XMLAssert.*;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+
+import org.springframework.http.MediaType;
+import org.springframework.http.MockHttpInputMessage;
+import org.springframework.http.MockHttpOutputMessage;
+import org.springframework.util.FileCopyUtils;
+
+/** @author Arjen Poutsma */
+public class SourceHttpMessageConverterTest {
+
+	@Test
+	public void readDOMSource() throws Exception {
+		SourceHttpMessageConverter<DOMSource> converter = new SourceHttpMessageConverter<DOMSource>();
+		String body = "<root>Hello World</root>";
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		DOMSource result = converter.read(DOMSource.class, inputMessage);
+		Document document = (Document) result.getNode();
+		assertEquals("Invalid result", "root", document.getDocumentElement().getLocalName());
+	}
+
+	@Test
+	public void readSAXSource() throws Exception {
+		SourceHttpMessageConverter<SAXSource> converter = new SourceHttpMessageConverter<SAXSource>();
+		String body = "<root>Hello World</root>";
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		SAXSource result = converter.read(SAXSource.class, inputMessage);
+		InputSource inputSource = result.getInputSource();
+		String s = FileCopyUtils.copyToString(new InputStreamReader(inputSource.getByteStream()));
+		assertXMLEqual("Invalid result", body, s);
+	}
+
+	@Test
+	public void readStreamSource() throws Exception {
+		SourceHttpMessageConverter<StreamSource> converter = new SourceHttpMessageConverter<StreamSource>();
+		String body = "<root>Hello World</root>";
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		StreamSource result = converter.read(StreamSource.class, inputMessage);
+		String s = FileCopyUtils.copyToString(new InputStreamReader(result.getInputStream()));
+		assertXMLEqual("Invalid result", body, s);
+	}
+
+	@Test
+	public void readSource() throws Exception {
+		SourceHttpMessageConverter<Source> converter = new SourceHttpMessageConverter<Source>();
+		String body = "<root>Hello World</root>";
+		MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8"));
+		inputMessage.getHeaders().setContentType(new MediaType("application", "xml"));
+		converter.read(Source.class, inputMessage);
+	}
+
+	@Test
+	public void write() throws Exception {
+		DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+		documentBuilderFactory.setNamespaceAware(true);
+		Document document = documentBuilderFactory.newDocumentBuilder().newDocument();
+		Element rootElement = document.createElement("root");
+		document.appendChild(rootElement);
+		rootElement.setTextContent("Hello World");
+		DOMSource domSource = new DOMSource(document);
+
+		SourceHttpMessageConverter<Source> converter = new SourceHttpMessageConverter<Source>();
+		MockHttpOutputMessage outputMessage = new MockHttpOutputMessage();
+		converter.write(domSource, outputMessage);
+		assertXMLEqual("Invalid result", "<root>Hello World</root>",
+				outputMessage.getBodyAsString(Charset.forName("UTF-8")));
+		assertEquals("Invalid content-type", new MediaType("application", "xml"),
+				outputMessage.getHeaders().getContentType());
+	}
+
+
+}