You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/04/22 12:56:29 UTC
svn commit: r1328841 - in /camel/trunk/components/camel-jaxb/src:
main/java/org/apache/camel/converter/jaxb/ main/resources/org/
test/java/org/apache/camel/converter/jaxb/
test/java/org/apache/camel/example/ test/java/org/apache/camel/jaxb/
Author: davsclaus
Date: Sun Apr 22 10:56:29 2012
New Revision: 1328841
URL: http://svn.apache.org/viewvc?rev=1328841&view=rev
Log:
CAMEL-5204: Removed unused code from camel-jaxb.
Removed:
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/ExchangeDefinition.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/HeaderDefinition.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/IntegerHeader.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbConverter.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/LongHeader.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/MessageDefinition.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/ObjectHeader.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/PropertyDefinition.java
camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/StringHeader.java
camel/trunk/components/camel-jaxb/src/main/resources/org/
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbConverterTest.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/MessageTypeTest.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JAXBConverterMessageTypeTest.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/jaxb/DumpToXmlTest.java
Modified:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatTest.java
Modified: camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatTest.java?rev=1328841&r1=1328840&r2=1328841&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatTest.java (original)
+++ camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbDataFormatTest.java Sun Apr 22 10:56:29 2012
@@ -16,17 +16,6 @@
*/
package org.apache.camel.converter.jaxb;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultCamelContext;
@@ -34,21 +23,12 @@ import org.apache.camel.impl.DefaultExch
import org.junit.Before;
import org.junit.Test;
-
-import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.isA;
-import static org.mockito.Matchers.same;
-import static org.mockito.Mockito.*;
public class JaxbDataFormatTest {
private JaxbDataFormat jaxbDataFormat;
- private Marshaller marshallerMock;
- private JaxbDataFormat jaxbDataFormatMock;
- private Unmarshaller unmarshallerMock;
private CamelContext camelContext;
@Before
@@ -92,58 +72,4 @@ public class JaxbDataFormatTest {
assertFalse(jaxbDataFormat.needFiltering(exchange));
}
- @Test
- public void testMarshalFilteringDisabled() throws IOException, XMLStreamException, JAXBException {
- jaxbDataFormat.setFilterNonXmlChars(false);
-
- jaxbDataFormatMock = spy(jaxbDataFormat);
- marshallerMock = mock(Marshaller.class);
-
- Object graph = new Object();
- OutputStream stream = new ByteArrayOutputStream();
- jaxbDataFormatMock.marshal(new DefaultExchange(camelContext), graph, stream, marshallerMock);
-
- verify(marshallerMock).marshal(same(graph), same(stream));
- }
-
- @Test
- public void testMarshalFilteringEnabled() throws XMLStreamException, JAXBException {
- jaxbDataFormat.setFilterNonXmlChars(true);
-
- jaxbDataFormatMock = spy(jaxbDataFormat);
- marshallerMock = mock(Marshaller.class);
-
- Object graph = new Object();
- jaxbDataFormatMock.marshal(new DefaultExchange(camelContext), graph, new ByteArrayOutputStream(), marshallerMock);
-
- verify(marshallerMock).marshal(same(graph), isA(FilteringXmlStreamWriter.class));
- }
-
- @Test
- public void testUnmarshalFilteringDisabled() throws IOException, JAXBException {
- jaxbDataFormat.setFilterNonXmlChars(false);
-
- jaxbDataFormatMock = spy(jaxbDataFormat);
-
- unmarshallerMock = mock(Unmarshaller.class);
- doReturn(unmarshallerMock).when(jaxbDataFormatMock).createUnmarshaller();
-
- jaxbDataFormatMock.unmarshal(new DefaultExchange(camelContext), new ByteArrayInputStream(new byte[] {}));
-
- verify(unmarshallerMock).unmarshal((XMLStreamReader) argThat(instanceOf(XMLStreamReader.class)));
- }
-
- @Test
- public void testUnmarshalFilteringEnabled() throws IOException, JAXBException {
- jaxbDataFormat.setFilterNonXmlChars(true);
- jaxbDataFormatMock = spy(jaxbDataFormat);
-
- unmarshallerMock = mock(Unmarshaller.class);
- doReturn(unmarshallerMock).when(jaxbDataFormatMock).createUnmarshaller();
-
- jaxbDataFormatMock.unmarshal(new DefaultExchange(camelContext), new ByteArrayInputStream(new byte[] {}));
-
- verify(unmarshallerMock).unmarshal((XMLStreamReader) argThat(instanceOf(XMLStreamReader.class)));
- }
-
}