Moved Spring-WS to separate dir.

oxm/src/test/java/org/springframework/oxm/AbstractMarshallerTestCase.java

@@ -0,0 +1,116 @@
+/*
+ * Copyright 2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.oxm;
+
+import java.io.ByteArrayOutputStream;
+import java.io.StringWriter;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLEventWriter;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.custommonkey.xmlunit.XMLTestCase;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.springframework.xml.transform.StaxResult;
+import org.springframework.xml.transform.StringResult;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
+
+public abstract class AbstractMarshallerTestCase extends XMLTestCase {
+
+    protected Marshaller marshaller;
+
+    protected Object flights;
+
+    protected static final String EXPECTED_STRING =
+            "<tns:flights xmlns:tns=\"http://samples.springframework.org/flight\">" +
+                    "<tns:flight><tns:number>42</tns:number></tns:flight></tns:flights>";
+
+    protected final void setUp() throws Exception {
+        marshaller = createMarshaller();
+        flights = createFlights();
+        XMLUnit.setIgnoreWhitespace(true);
+    }
+
+    protected abstract Marshaller createMarshaller() throws Exception;
+
+    protected abstract Object createFlights();
+
+    public void testMarshalDOMResult() throws Exception {
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        documentBuilderFactory.setNamespaceAware(true);
+        DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
+        Document result = builder.newDocument();
+        DOMResult domResult = new DOMResult(result);
+        marshaller.marshal(flights, domResult);
+        Document expected = builder.newDocument();
+        Element flightsElement = expected.createElementNS("http://samples.springframework.org/flight", "tns:flights");
+        expected.appendChild(flightsElement);
+        Element flightElement = expected.createElementNS("http://samples.springframework.org/flight", "tns:flight");
+        flightsElement.appendChild(flightElement);
+        Element numberElement = expected.createElementNS("http://samples.springframework.org/flight", "tns:number");
+        flightElement.appendChild(numberElement);
+        Text text = expected.createTextNode("42");
+        numberElement.appendChild(text);
+        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        StringResult stringResult = new StringResult();
+        transformer.transform(new DOMSource(result), stringResult);
+        StringResult stringExpected = new StringResult();
+        transformer.transform(new DOMSource(expected), stringExpected);
+        assertXMLEqual("Marshaller writes invalid DOMResult", stringExpected.toString(), stringResult.toString());
+    }
+
+    public void testMarshalStreamResultWriter() throws Exception {
+        StringWriter writer = new StringWriter();
+        StreamResult result = new StreamResult(writer);
+        marshaller.marshal(flights, result);
+        assertXMLEqual("Marshaller writes invalid StreamResult", EXPECTED_STRING, writer.toString());
+    }
+
+    public void testMarshalStreamResultOutputStream() throws Exception {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        StreamResult result = new StreamResult(os);
+        marshaller.marshal(flights, result);
+        assertXMLEqual("Marshaller writes invalid StreamResult",
+                EXPECTED_STRING,
+                new String(os.toByteArray(), "UTF-8"));
+    }
+
+    public void testMarshalStaxResultXMLStreamWriter() throws Exception {
+        XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+        StringWriter writer = new StringWriter();
+        XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(writer);
+        StaxResult result = new StaxResult(streamWriter);
+        marshaller.marshal(flights, result);
+        assertXMLEqual("Marshaller writes invalid StreamResult", EXPECTED_STRING, writer.toString());
+    }
+
+    public void testMarshalStaxResultXMLEventWriter() throws Exception {
+        XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+        StringWriter writer = new StringWriter();
+        XMLEventWriter eventWriter = outputFactory.createXMLEventWriter(writer);
+        StaxResult result = new StaxResult(eventWriter);
+        marshaller.marshal(flights, result);
+        assertXMLEqual("Marshaller writes invalid StreamResult", EXPECTED_STRING, writer.toString());
+    }
+}

oxm/src/test/java/org/springframework/oxm/AbstractUnmarshallerTestCase.java

@@ -0,0 +1,106 @@
+/*
+ * Copyright 2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.oxm;
+
+import java.io.ByteArrayInputStream;
+import java.io.StringReader;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamSource;
+
+import junit.framework.TestCase;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+import org.springframework.xml.transform.StaxSource;
+
+public abstract class AbstractUnmarshallerTestCase extends TestCase {
+
+    protected Unmarshaller unmarshaller;
+
+    protected static final String INPUT_STRING =
+            "<tns:flights xmlns:tns=\"http://samples.springframework.org/flight\">" +
+                    "<tns:flight><tns:number>42</tns:number></tns:flight></tns:flights>";
+
+    protected final void setUp() throws Exception {
+        unmarshaller = createUnmarshaller();
+    }
+
+    protected abstract Unmarshaller createUnmarshaller() throws Exception;
+
+    protected abstract void testFlights(Object o);
+
+    public void testUnmarshalDomSource() throws Exception {
+        DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        Document document = builder.newDocument();
+        Element flightsElement = document.createElementNS("http://samples.springframework.org/flight", "tns:flights");
+        document.appendChild(flightsElement);
+        Element flightElement = document.createElementNS("http://samples.springframework.org/flight", "tns:flight");
+        flightsElement.appendChild(flightElement);
+        Element numberElement = document.createElementNS("http://samples.springframework.org/flight", "tns:number");
+        flightElement.appendChild(numberElement);
+        Text text = document.createTextNode("42");
+        numberElement.appendChild(text);
+        DOMSource source = new DOMSource(document);
+        Object flights = unmarshaller.unmarshal(source);
+        testFlights(flights);
+    }
+
+    public void testUnmarshalStreamSourceReader() throws Exception {
+        StreamSource source = new StreamSource(new StringReader(INPUT_STRING));
+        Object flights = unmarshaller.unmarshal(source);
+        testFlights(flights);
+    }
+
+    public void testUnmarshalStreamSourceInputStream() throws Exception {
+        StreamSource source = new StreamSource(new ByteArrayInputStream(INPUT_STRING.getBytes("UTF-8")));
+        Object flights = unmarshaller.unmarshal(source);
+        testFlights(flights);
+    }
+
+    public void testUnmarshalSAXSource() throws Exception {
+        XMLReader reader = XMLReaderFactory.createXMLReader();
+        SAXSource source = new SAXSource(reader, new InputSource(new StringReader(INPUT_STRING)));
+        Object flights = unmarshaller.unmarshal(source);
+        testFlights(flights);
+    }
+
+    public void testUnmarshalStaxSourceXmlStreamReader() throws Exception {
+        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+        XMLStreamReader streamReader = inputFactory.createXMLStreamReader(new StringReader(INPUT_STRING));
+        StaxSource source = new StaxSource(streamReader);
+        Object flights = unmarshaller.unmarshal(source);
+        testFlights(flights);
+    }
+
+    public void testUnmarshalStaxSourceXmlEventReader() throws Exception {
+        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+        XMLEventReader eventReader = inputFactory.createXMLEventReader(new StringReader(INPUT_STRING));
+        StaxSource source = new StaxSource(eventReader);
+        Object flights = unmarshaller.unmarshal(source);
+        testFlights(flights);
+    }
+}

oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTest.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.oxm.castor;
+
+import javax.xml.transform.sax.SAXResult;
+
+import org.easymock.MockControl;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.oxm.AbstractMarshallerTestCase;
+import org.springframework.oxm.Marshaller;
+import org.xml.sax.ContentHandler;
+
+public class CastorMarshallerTest extends AbstractMarshallerTestCase {
+
+    protected Marshaller createMarshaller() throws Exception {
+        CastorMarshaller marshaller = new CastorMarshaller();
+        ClassPathResource mappingLocation = new ClassPathResource("mapping.xml", CastorMarshaller.class);
+        marshaller.setMappingLocation(mappingLocation);
+        marshaller.afterPropertiesSet();
+        return marshaller;
+    }
+
+    protected Object createFlights() {
+        Flight flight = new Flight();
+        flight.setNumber(42L);
+        Flights flights = new Flights();
+        flights.addFlight(flight);
+        return flights;
+    }
+
+    public void testMarshalSaxResult() throws Exception {
+        MockControl handlerControl = MockControl.createControl(ContentHandler.class);
+        ContentHandler handlerMock = (ContentHandler) handlerControl.getMock();
+        handlerMock.startDocument();
+        handlerMock.startPrefixMapping("tns", "http://samples.springframework.org/flight");
+        handlerMock.startElement("http://samples.springframework.org/flight", "flights", "tns:flights", null);
+        handlerControl.setMatcher(MockControl.ALWAYS_MATCHER);
+        handlerMock.startElement("http://samples.springframework.org/flight", "flight", "tns:flight", null);
+        handlerControl.setMatcher(MockControl.ALWAYS_MATCHER);
+        handlerMock.startElement("http://samples.springframework.org/flight", "number", "tns:number", null);
+        handlerControl.setMatcher(MockControl.ALWAYS_MATCHER);
+        handlerMock.characters(new char[]{'4', '2'}, 0, 2);
+        handlerControl.setMatcher(MockControl.ARRAY_MATCHER);
+        handlerMock.endElement("http://samples.springframework.org/flight", "number", "tns:number");
+        handlerMock.endElement("http://samples.springframework.org/flight", "flight", "tns:flight");
+        handlerMock.endElement("http://samples.springframework.org/flight", "flights", "tns:flights");
+        handlerMock.endPrefixMapping("tns");
+        handlerMock.endDocument();
+
+        handlerControl.replay();
+        SAXResult result = new SAXResult(handlerMock);
+        marshaller.marshal(flights, result);
+        handlerControl.verify();
+    }
+
+}

oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTest.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.oxm.castor;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import javax.xml.transform.stream.StreamSource;
+
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.oxm.AbstractUnmarshallerTestCase;
+import org.springframework.oxm.Unmarshaller;
+
+public class CastorUnmarshallerTest extends AbstractUnmarshallerTestCase {
+
+    protected void testFlights(Object o) {
+        Flights flights = (Flights) o;
+        assertNotNull("Flights is null", flights);
+        assertEquals("Invalid amount of flight elements", 1, flights.getFlightCount());
+        Flight flight = flights.getFlight()[0];
+        assertNotNull("Flight is null", flight);
+        assertEquals("Number is invalid", 42L, flight.getNumber());
+    }
+
+    protected Unmarshaller createUnmarshaller() throws Exception {
+        CastorMarshaller marshaller = new CastorMarshaller();
+        ClassPathResource mappingLocation = new ClassPathResource("mapping.xml", CastorMarshaller.class);
+        marshaller.setMappingLocation(mappingLocation);
+        marshaller.afterPropertiesSet();
+        return marshaller;
+    }
+
+    public void testUnmarshalTargetClass() throws Exception {
+        CastorMarshaller unmarshaller = new CastorMarshaller();
+        unmarshaller.setTargetClass(Flights.class);
+        unmarshaller.afterPropertiesSet();
+        StreamSource source = new StreamSource(new ByteArrayInputStream(INPUT_STRING.getBytes("UTF-8")));
+        Object flights = unmarshaller.unmarshal(source);
+        testFlights(flights);
+    }
+
+    public void testSetBothTargetClassAndMapping() throws IOException {
+        try {
+            CastorMarshaller marshaller = new CastorMarshaller();
+            marshaller.setMappingLocation(new ClassPathResource("mapping.xml", CastorMarshaller.class));
+            marshaller.setTargetClass(getClass());
+            marshaller.afterPropertiesSet();
+            fail("IllegalArgumentException expected");
+        }
+        catch (IllegalArgumentException ex) {
+            // expected
+        }
+    }
+
+}

oxm/src/test/java/org/springframework/oxm/castor/CastorUtilsTest.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.oxm.castor;
+
+import junit.framework.TestCase;
+import org.exolab.castor.xml.MarshalException;
+import org.exolab.castor.xml.ValidationException;
+import org.exolab.castor.xml.XMLException;
+
+public class CastorUtilsTest extends TestCase {
+
+    public void testConvertMarshalException() {
+        assertTrue("Invalid exception conversion", CastorUtils
+                .convertXmlException(new MarshalException(""), true) instanceof CastorMarshallingFailureException);
+        assertTrue("Invalid exception conversion", CastorUtils
+                .convertXmlException(new MarshalException(""), false) instanceof CastorUnmarshallingFailureException);
+    }
+
+    public void testConvertValidationException() {
+        assertTrue("Invalid exception conversion", CastorUtils
+                .convertXmlException(new ValidationException(""), false) instanceof CastorValidationFailureException);
+    }
+
+    public void testConvertXMLException() {
+        assertTrue("Invalid exception conversion",
+                CastorUtils.convertXmlException(new XMLException(""), false) instanceof CastorSystemException);
+    }
+
+}

oxm/src/test/java/org/springframework/oxm/jaxb/AbstractJaxbMarshallerTestCase.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.oxm.jaxb;
+
+import javax.xml.transform.sax.SAXResult;
+
+import org.easymock.MockControl;
+import org.xml.sax.ContentHandler;
+
+import org.springframework.oxm.AbstractMarshallerTestCase;
+
+public abstract class AbstractJaxbMarshallerTestCase extends AbstractMarshallerTestCase {
+
+    public void testMarshalSaxResult() throws Exception {
+        MockControl handlerControl = MockControl.createStrictControl(ContentHandler.class);
+        ContentHandler handlerMock = (ContentHandler) handlerControl.getMock();
+        handlerMock.setDocumentLocator(null);
+        handlerControl.setMatcher(MockControl.ALWAYS_MATCHER);
+        handlerMock.startDocument();
+        handlerMock.startPrefixMapping("", "http://samples.springframework.org/flight");
+        handlerMock.startElement("http://samples.springframework.org/flight", "flights", "flights", null);
+        handlerControl.setMatcher(MockControl.ALWAYS_MATCHER);
+        handlerMock.startElement("http://samples.springframework.org/flight", "flight", "flight", null);
+        handlerControl.setMatcher(MockControl.ALWAYS_MATCHER);
+        handlerMock.startElement("http://samples.springframework.org/flight", "number", "number", null);
+        handlerControl.setMatcher(MockControl.ALWAYS_MATCHER);
+        handlerMock.characters(new char[]{'4', '2'}, 0, 2);
+        handlerControl.setMatcher(MockControl.ALWAYS_MATCHER);
+        handlerMock.endElement("http://samples.springframework.org/flight", "number", "number");
+        handlerMock.endElement("http://samples.springframework.org/flight", "flight", "flight");
+        handlerMock.endElement("http://samples.springframework.org/flight", "flights", "flights");
+        handlerMock.endPrefixMapping("");
+        handlerMock.endDocument();
+
+        handlerControl.replay();
+        SAXResult result = new SAXResult(handlerMock);
+        marshaller.marshal(flights, result);
+        handlerControl.verify();
+    }
+
+
+}

oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb1MarshallerTest.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.oxm.jaxb;
+
+import java.util.Collections;
+
+import org.springframework.oxm.Marshaller;
+import org.springframework.oxm.XmlMappingException;
+import org.springframework.oxm.jaxb1.FlightType;
+import org.springframework.oxm.jaxb1.Flights;
+import org.springframework.oxm.jaxb1.impl.FlightTypeImpl;
+import org.springframework.oxm.jaxb1.impl.FlightsImpl;
+
+public class Jaxb1MarshallerTest extends AbstractJaxbMarshallerTestCase {
+
+    private static final String CONTEXT_PATH = "org.springframework.oxm.jaxb1";
+
+    protected final Marshaller createMarshaller() throws Exception {
+        Jaxb1Marshaller marshaller = new Jaxb1Marshaller();
+        marshaller.setContextPath(CONTEXT_PATH);
+        marshaller.afterPropertiesSet();
+        return marshaller;
+    }
+
+    protected Object createFlights() {
+        FlightType flight = new FlightTypeImpl();
+        flight.setNumber(42L);
+        Flights flights = new FlightsImpl();
+        flights.getFlight().add(flight);
+        return flights;
+    }
+
+    public void testProperties() throws Exception {
+        Jaxb1Marshaller marshaller = new Jaxb1Marshaller();
+        marshaller.setContextPath(CONTEXT_PATH);
+        marshaller.setMarshallerProperties(
+                Collections.singletonMap(javax.xml.bind.Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE));
+        marshaller.afterPropertiesSet();
+    }
+
+    public void testNoContextPath() throws Exception {
+        try {
+            Jaxb1Marshaller marshaller = new Jaxb1Marshaller();
+            marshaller.afterPropertiesSet();
+            fail("Should have thrown an IllegalArgumentException");
+        }
+        catch (IllegalArgumentException e) {
+        }
+    }
+
+    public void testInvalidContextPath() throws Exception {
+        try {
+            Jaxb1Marshaller marshaller = new Jaxb1Marshaller();
+            marshaller.setContextPath("ab");
+            marshaller.afterPropertiesSet();
+            fail("Should have thrown an XmlMappingException");
+        }
+        catch (XmlMappingException ex) {
+        }
+    }
+
+}

oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb1UnmarshallerTest.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.oxm.jaxb;
+
+import org.springframework.oxm.AbstractUnmarshallerTestCase;
+import org.springframework.oxm.Unmarshaller;
+import org.springframework.oxm.jaxb1.FlightType;
+import org.springframework.oxm.jaxb1.Flights;
+
+public class Jaxb1UnmarshallerTest extends AbstractUnmarshallerTestCase {
+
+    protected Unmarshaller createUnmarshaller() throws Exception {
+        Jaxb1Marshaller marshaller = new Jaxb1Marshaller();
+        marshaller.setContextPath("org.springframework.oxm.jaxb1");
+        marshaller.setValidating(true);
+        marshaller.afterPropertiesSet();
+        return marshaller;
+    }
+
+    protected void testFlights(Object o) {
+        Flights flights = (Flights) o;
+        assertNotNull("Flights is null", flights);
+        assertEquals("Invalid amount of flight elements", 1, flights.getFlight().size());
+        FlightType flight = (FlightType) flights.getFlight().get(0);
+        assertNotNull("Flight is null", flight);
+        assertEquals("Number is invalid", 42L, flight.getNumber());
+    }
+
+}

oxm/src/test/java/org/springframework/oxm/jaxb/JaxbUtilsTest.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.oxm.jaxb;
+
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.MarshalException;
+import javax.xml.bind.UnmarshalException;
+import javax.xml.bind.ValidationException;
+
+import junit.framework.TestCase;
+
+public class JaxbUtilsTest extends TestCase {
+
+    public void testConvertMarshallingException() {
+        assertTrue("Invalid exception conversion",
+                JaxbUtils.convertJaxbException(new MarshalException("")) instanceof JaxbMarshallingFailureException);
+    }
+
+    public void testConvertUnmarshallingException() {
+        assertTrue("Invalid exception conversion", JaxbUtils
+                .convertJaxbException(new UnmarshalException("")) instanceof JaxbUnmarshallingFailureException);
+    }
+
+    public void testConvertValidationException() {
+        assertTrue("Invalid exception conversion",
+                JaxbUtils.convertJaxbException(new ValidationException("")) instanceof JaxbValidationFailureException);
+    }
+
+    public void testConvertJAXBException() {
+        assertTrue("Invalid exception conversion",
+                JaxbUtils.convertJaxbException(new JAXBException("")) instanceof JaxbSystemException);
+    }
+
+    public void testGetJaxbVersion() throws Exception {
+        assertEquals("Invalid JAXB version", JaxbUtils.JAXB_1, JaxbUtils.getJaxbVersion());
+    }
+}

oxm/src/test/java/org/springframework/oxm/jibx/FlightType.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.oxm.jibx;
+
+public class FlightType {
+
+    protected long number;
+
+    public long getNumber() {
+        return this.number;
+    }
+
+    public void setNumber(long number) {
+        this.number = number;
+    }
+}

oxm/src/test/java/org/springframework/oxm/jibx/Flights.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.oxm.jibx;
+
+import java.util.ArrayList;
+
+public class Flights {
+
+    protected ArrayList flightList = new ArrayList();
+
+    public void addFlight(FlightType flight) {
+        flightList.add(flight);
+    }
+
+    public FlightType getFlight(int index) {
+        return (FlightType) flightList.get(index);
+    }
+
+    public int sizeFlightList() {
+        return flightList.size();
+    }
+}

oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTest.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.oxm.jibx;
+
+import org.springframework.oxm.AbstractMarshallerTestCase;
+import org.springframework.oxm.Marshaller;
+
+public class JibxMarshallerTest extends AbstractMarshallerTestCase {
+
+    protected Marshaller createMarshaller() throws Exception {
+        JibxMarshaller marshaller = new JibxMarshaller();
+        marshaller.setTargetClass(Flights.class);
+        marshaller.afterPropertiesSet();
+        return marshaller;
+    }
+
+    protected Object createFlights() {
+        Flights flights = new Flights();
+        FlightType flight = new FlightType();
+        flight.setNumber(42L);
+        flights.addFlight(flight);
+        return flights;
+    }
+
+    public void testAfterPropertiesSetNoContextPath() throws Exception {
+        try {
+            JibxMarshaller marshaller = new JibxMarshaller();
+            marshaller.afterPropertiesSet();
+            fail("Should have thrown an IllegalArgumentException");
+        }
+        catch (IllegalArgumentException e) {
+        }
+    }
+
+}

oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTest.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.oxm.jibx;
+
+import org.springframework.oxm.AbstractUnmarshallerTestCase;
+import org.springframework.oxm.Unmarshaller;
+
+public class JibxUnmarshallerTest extends AbstractUnmarshallerTestCase {
+
+    protected Unmarshaller createUnmarshaller() throws Exception {
+        JibxMarshaller unmarshaller = new JibxMarshaller();
+        unmarshaller.setTargetClass(Flights.class);
+        unmarshaller.afterPropertiesSet();
+        return unmarshaller;
+    }
+
+    protected void testFlights(Object o) {
+        Flights flights = (Flights) o;
+        assertNotNull("Flights is null", flights);
+        assertEquals("Invalid amount of flight elements", 1, flights.sizeFlightList());
+        FlightType flight = (FlightType) flights.getFlight(0);
+        assertNotNull("Flight is null", flight);
+        assertEquals("Number is invalid", 42L, flight.getNumber());
+    }
+
+
+}

oxm/src/test/java/org/springframework/oxm/jibx/JibxUtilsTest.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.oxm.jibx;
+
+import junit.framework.TestCase;
+import org.jibx.runtime.JiBXException;
+import org.jibx.runtime.ValidationException;
+
+public class JibxUtilsTest extends TestCase {
+
+    public void testConvertMarshallingException() throws Exception {
+        assertTrue("Invalid exception conversion",
+                JibxUtils.convertJibxException(new JiBXException(""), true) instanceof JibxMarshallingFailureException);
+    }
+
+    public void testConvertUnmarshallingException() throws Exception {
+        assertTrue("Invalid exception conversion", JibxUtils
+                .convertJibxException(new JiBXException(""), false) instanceof JibxUnmarshallingFailureException);
+    }
+
+    public void testConvertValidationException() throws Exception {
+        assertTrue("Invalid exception conversion", JibxUtils
+                .convertJibxException(new ValidationException(""), true) instanceof JibxValidationFailureException);
+    }
+}

oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansMarshallerTest.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.oxm.xmlbeans;
+
+import java.io.ByteArrayOutputStream;
+
+import javax.xml.transform.stream.StreamResult;
+
+import org.springframework.oxm.AbstractMarshallerTestCase;
+import org.springframework.oxm.Marshaller;
+import org.springframework.samples.flight.FlightType;
+import org.springframework.samples.flight.FlightsDocument;
+import org.springframework.samples.flight.FlightsDocument.Flights;
+
+public class XmlBeansMarshallerTest extends AbstractMarshallerTestCase {
+
+    protected Marshaller createMarshaller() throws Exception {
+        return new XmlBeansMarshaller();
+    }
+
+    public void testMarshalNonXmlObject() throws Exception {
+        try {
+            this.marshaller.marshal(new Object(), new StreamResult(new ByteArrayOutputStream()));
+            fail("XmlBeansMarshaller did not throw ClassCastException for non-XmlObject");
+        }
+        catch (ClassCastException e) {
+            // Expected behavior
+        }
+    }
+
+    protected Object createFlights() {
+        FlightsDocument flightsDocument = FlightsDocument.Factory.newInstance();
+        Flights flights = flightsDocument.addNewFlights();
+        FlightType flightType = flights.addNewFlight();
+        flightType.setNumber(42L);
+        return flightsDocument;
+    }
+
+    public void testMarshalStaxResultXMLStreamWriter() throws Exception {
+        // Unfortu
+    }
+
+}

oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansUnmarshallerTest.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.oxm.xmlbeans;
+
+import org.springframework.oxm.AbstractUnmarshallerTestCase;
+import org.springframework.oxm.Unmarshaller;
+import org.springframework.samples.flight.FlightType;
+import org.springframework.samples.flight.FlightsDocument;
+import org.springframework.samples.flight.FlightsDocument.Flights;
+import org.springframework.xml.transform.StringSource;
+
+public class XmlBeansUnmarshallerTest extends AbstractUnmarshallerTestCase {
+
+    protected Unmarshaller createUnmarshaller() throws Exception {
+        return new XmlBeansMarshaller();
+    }
+
+    protected void testFlights(Object o) {
+        FlightsDocument flightsDocument = (FlightsDocument) o;
+        assertNotNull("FlightsDocument is null", flightsDocument);
+        Flights flights = flightsDocument.getFlights();
+        assertEquals("Invalid amount of flight elements", 1, flights.sizeOfFlightArray());
+        FlightType flight = flights.getFlightArray(0);
+        assertNotNull("Flight is null", flight);
+        assertEquals("Number is invalid", 42L, flight.getNumber());
+    }
+
+    public void testValidate() throws Exception {
+        ((XmlBeansMarshaller) unmarshaller).setValidating(true);
+        String invalidInput = "<tns:flights xmlns:tns=\"http://samples.springframework.org/flight\">" +
+                "<tns:flight><tns:number>abc</tns:number></tns:flight></tns:flights>";
+
+        try {
+            unmarshaller.unmarshal(new StringSource(invalidInput));
+            fail("Expected a XmlBeansValidationFailureException");
+        }
+        catch (XmlBeansValidationFailureException ex) {
+            // expected
+        }
+
+
+    }
+
+}

oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlBeansUtilsTest.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2005 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.oxm.xmlbeans;
+
+import junit.framework.TestCase;
+import org.apache.xmlbeans.XMLStreamValidationException;
+import org.apache.xmlbeans.XmlError;
+import org.apache.xmlbeans.XmlException;
+import org.xml.sax.SAXException;
+
+public class XmlBeansUtilsTest extends TestCase {
+
+    public void testConvertXMLStreamValidationException() {
+        assertTrue("Invalid exception conversion", XmlBeansUtils.convertXmlBeansException(
+                new XMLStreamValidationException(XmlError.forMessage("")),
+                true) instanceof XmlBeansValidationFailureException);
+
+    }
+
+    public void testConvertXmlException() {
+        assertTrue("Invalid exception conversion", XmlBeansUtils
+                .convertXmlBeansException(new XmlException(""), true) instanceof XmlBeansMarshallingFailureException);
+        assertTrue("Invalid exception conversion", XmlBeansUtils.convertXmlBeansException(new XmlException(""),
+                false) instanceof XmlBeansUnmarshallingFailureException);
+    }
+
+    public void testConvertSAXException() {
+        assertTrue("Invalid exception conversion", XmlBeansUtils
+                .convertXmlBeansException(new SAXException(""), true) instanceof XmlBeansMarshallingFailureException);
+        assertTrue("Invalid exception conversion", XmlBeansUtils.convertXmlBeansException(new SAXException(""),
+                false) instanceof XmlBeansUnmarshallingFailureException);
+    }
+
+    public void testFallbackException() {
+        assertTrue("Invalid exception conversion",
+                XmlBeansUtils.convertXmlBeansException(new Exception(""), false) instanceof XmlBeansSystemException);
+
+    }
+
+}

oxm/src/test/java/org/springframework/oxm/xmlbeans/XmlOptionsFactoryBeanTest.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.oxm.xmlbeans;
+
+import java.util.Collections;
+
+import junit.framework.TestCase;
+import org.apache.xmlbeans.XmlOptions;
+
+public class XmlOptionsFactoryBeanTest extends TestCase {
+
+    private XmlOptionsFactoryBean factoryBean;
+
+    protected void setUp() throws Exception {
+        factoryBean = new XmlOptionsFactoryBean();
+    }
+
+    public void testXmlOptionsFactoryBean() throws Exception {
+        factoryBean.setOptions(Collections.singletonMap(XmlOptions.SAVE_PRETTY_PRINT, Boolean.TRUE));
+        factoryBean.afterPropertiesSet();
+        XmlOptions xmlOptions = (XmlOptions) factoryBean.getObject();
+        assertNotNull("No XmlOptions returned", xmlOptions);
+        assertTrue("Option not set", xmlOptions.hasOption(XmlOptions.SAVE_PRETTY_PRINT));
+        assertFalse("Invalid option set", xmlOptions.hasOption(XmlOptions.LOAD_LINE_NUMBERS));
+    }
+}

oxm/src/test/java/org/springframework/oxm/xstream/Flight.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.oxm.xstream;
+
+public class Flight {
+
+    private long flightNumber;
+
+    public long getFlightNumber() {
+        return flightNumber;
+    }
+
+    public void setFlightNumber(long number) {
+        this.flightNumber = number;
+    }
+}

oxm/src/test/java/org/springframework/oxm/xstream/XStreamMarshallerTest.java

@@ -0,0 +1,142 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.oxm.xstream;
+
+import java.io.ByteArrayOutputStream;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.Properties;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLEventWriter;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.dom.DOMResult;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamResult;
+
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.extended.EncodedByteArrayConverter;
+import org.custommonkey.xmlunit.XMLTestCase;
+import org.easymock.MockControl;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
+import org.xml.sax.ContentHandler;
+
+import org.springframework.xml.transform.StaxResult;
+import org.springframework.xml.transform.StringResult;
+import org.springframework.xml.transform.StringSource;
+
+public class XStreamMarshallerTest extends XMLTestCase {
+
+    private static final String EXPECTED_STRING = "<flight><flightNumber>42</flightNumber></flight>";
+
+    private XStreamMarshaller marshaller;
+
+    private Flight flight;
+
+    protected void setUp() throws Exception {
+        marshaller = new XStreamMarshaller();
+        Properties aliases = new Properties();
+        aliases.setProperty("flight", Flight.class.getName());
+        marshaller.setAliases(aliases);
+        flight = new Flight();
+        flight.setFlightNumber(42L);
+    }
+
+    public void testMarshalDOMResult() throws Exception {
+        DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder builder = documentBuilderFactory.newDocumentBuilder();
+        Document document = builder.newDocument();
+        DOMResult domResult = new DOMResult(document);
+        marshaller.marshal(flight, domResult);
+        Document expected = builder.newDocument();
+        Element flightElement = expected.createElement("flight");
+        expected.appendChild(flightElement);
+        Element numberElement = expected.createElement("flightNumber");
+        flightElement.appendChild(numberElement);
+        Text text = expected.createTextNode("42");
+        numberElement.appendChild(text);
+        assertXMLEqual("Marshaller writes invalid DOMResult", expected, document);
+    }
+
+    public void testMarshalStreamResultWriter() throws Exception {
+        StringWriter writer = new StringWriter();
+        StreamResult result = new StreamResult(writer);
+        marshaller.marshal(flight, result);
+        assertXMLEqual("Marshaller writes invalid StreamResult", EXPECTED_STRING, writer.toString());
+    }
+
+    public void testMarshalStreamResultOutputStream() throws Exception {
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        StreamResult result = new StreamResult(os);
+        marshaller.marshal(flight, result);
+        String s = new String(os.toByteArray(), "UTF-8");
+        assertXMLEqual("Marshaller writes invalid StreamResult", EXPECTED_STRING, s);
+    }
+
+    public void testMarshalSaxResult() throws Exception {
+        MockControl handlerControl = MockControl.createStrictControl(ContentHandler.class);
+        handlerControl.setDefaultMatcher(MockControl.ALWAYS_MATCHER);
+        ContentHandler handlerMock = (ContentHandler) handlerControl.getMock();
+        handlerMock.startDocument();
+        handlerMock.startElement("", "flight", "flight", null);
+        handlerMock.startElement("", "number", "number", null);
+        handlerMock.characters(new char[]{'4', '2'}, 0, 2);
+        handlerMock.endElement("", "number", "number");
+        handlerMock.endElement("", "flight", "flight");
+        handlerMock.endDocument();
+
+        handlerControl.replay();
+        SAXResult result = new SAXResult(handlerMock);
+        marshaller.marshal(flight, result);
+        handlerControl.verify();
+    }
+
+    public void testMarshalStaxResultXMLStreamWriter() throws Exception {
+        XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+        StringWriter writer = new StringWriter();
+        XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(writer);
+        StaxResult result = new StaxResult(streamWriter);
+        marshaller.marshal(flight, result);
+        assertXMLEqual("Marshaller writes invalid StreamResult", EXPECTED_STRING, writer.toString());
+    }
+
+    public void testMarshalStaxResultXMLEventWriter() throws Exception {
+        XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+        StringWriter writer = new StringWriter();
+        XMLEventWriter eventWriter = outputFactory.createXMLEventWriter(writer);
+        StaxResult result = new StaxResult(eventWriter);
+        marshaller.marshal(flight, result);
+        assertXMLEqual("Marshaller writes invalid StreamResult", EXPECTED_STRING, writer.toString());
+    }
+
+    public void testConverters() throws Exception {
+        marshaller.setConverters(new Converter[]{new EncodedByteArrayConverter()});
+        byte[] buf = new byte[]{0x1, 0x2};
+        StringResult result = new StringResult();
+        marshaller.marshal(buf, result);
+        assertXMLEqual("<byte-array>AQI=</byte-array>", result.toString());
+        StringSource source = new StringSource(result.toString());
+        byte[] bufResult = (byte[]) marshaller.unmarshal(source);
+        assertTrue("Invalid result", Arrays.equals(buf, bufResult));
+    }
+
+
+}

oxm/src/test/java/org/springframework/oxm/xstream/XStreamUnmarshallerTest.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.oxm.xstream;
+
+import java.io.ByteArrayInputStream;
+import java.io.StringReader;
+import java.util.Properties;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamSource;
+
+import junit.framework.TestCase;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+
+import org.springframework.xml.transform.StaxSource;
+
+public class XStreamUnmarshallerTest extends TestCase {
+
+    protected static final String INPUT_STRING = "<flight><flightNumber>42</flightNumber></flight>";
+
+    private XStreamMarshaller unmarshaller;
+
+    protected void setUp() throws Exception {
+        unmarshaller = new XStreamMarshaller();
+        Properties aliases = new Properties();
+        aliases.setProperty("flight", Flight.class.getName());
+        unmarshaller.setAliases(aliases);
+    }
+
+    private void testFlight(Object o) {
+        assertTrue("Unmarshalled object is not Flights", o instanceof Flight);
+        Flight flight = (Flight) o;
+        assertNotNull("Flight is null", flight);
+        assertEquals("Number is invalid", 42L, flight.getFlightNumber());
+    }
+
+    public void testUnmarshalDomSource() throws Exception {
+        DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        Document document = builder.parse(new InputSource(new StringReader(INPUT_STRING)));
+        DOMSource source = new DOMSource(document);
+        Object flight = unmarshaller.unmarshal(source);
+        testFlight(flight);
+    }
+
+    public void testUnmarshalStaxSourceXmlStreamReader() throws Exception {
+        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+        XMLStreamReader streamReader = inputFactory.createXMLStreamReader(new StringReader(INPUT_STRING));
+        StaxSource source = new StaxSource(streamReader);
+        Object flights = unmarshaller.unmarshal(source);
+        testFlight(flights);
+    }
+
+    public void testUnmarshalStreamSourceInputStream() throws Exception {
+        StreamSource source = new StreamSource(new ByteArrayInputStream(INPUT_STRING.getBytes("UTF-8")));
+        Object flights = unmarshaller.unmarshal(source);
+        testFlight(flights);
+    }
+
+    public void testUnmarshalStreamSourceReader() throws Exception {
+        StreamSource source = new StreamSource(new StringReader(INPUT_STRING));
+        Object flights = unmarshaller.unmarshal(source);
+        testFlight(flights);
+    }
+}
+

oxm/src/test/java/org/springframework/oxm/xstream/XStreamUtilsTest.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.oxm.xstream;
+
+import com.thoughtworks.xstream.alias.CannotResolveClassException;
+import com.thoughtworks.xstream.io.StreamException;
+import junit.framework.TestCase;
+
+public class XStreamUtilsTest extends TestCase {
+
+    public void testConvertStreamException() {
+        assertTrue("Invalid exception conversion", XStreamUtils.convertXStreamException(
+                new StreamException(new Exception()), true) instanceof XStreamMarshallingFailureException);
+        assertTrue("Invalid exception conversion", XStreamUtils.convertXStreamException(
+                new StreamException(new Exception()), false) instanceof XStreamUnmarshallingFailureException);
+    }
+
+    public void testConvertCannotResolveClassException() {
+        assertTrue("Invalid exception conversion", XStreamUtils.convertXStreamException(
+                new CannotResolveClassException(""), true) instanceof XStreamMarshallingFailureException);
+        assertTrue("Invalid exception conversion", XStreamUtils.convertXStreamException(
+                new CannotResolveClassException(""), false) instanceof XStreamUnmarshallingFailureException);
+    }
+}