diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java index 569031fd53..b055192105 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverterTests.java @@ -16,14 +16,10 @@ package org.springframework.http.converter.xml; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.lang.reflect.Type; import java.util.Collection; import java.util.List; import java.util.Set; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -41,10 +37,13 @@ import org.springframework.core.io.Resource; import org.springframework.http.MockHttpInputMessage; import org.springframework.http.converter.HttpMessageNotReadableException; +import static org.junit.Assert.*; + /** * Test fixture for {@link Jaxb2CollectionHttpMessageConverter}. * * @author Arjen Poutsma + * @author Rossen Stoyanchev */ public class Jaxb2CollectionHttpMessageConverterTests { @@ -71,6 +70,7 @@ public class Jaxb2CollectionHttpMessageConverterTests { typeSetType = new ParameterizedTypeReference>() {}.getType(); } + @Test public void canRead() throws Exception { assertTrue(converter.canRead(rootElementListType, null, null)); @@ -151,9 +151,14 @@ public class Jaxb2CollectionHttpMessageConverterTests { } }; - Collection result = converter.read(rootElementListType, null, inputMessage); - assertEquals(1, result.size()); - assertEquals("", result.iterator().next().external); + try { + Collection result = converter.read(rootElementListType, null, inputMessage); + assertEquals(1, result.size()); + assertEquals("", result.iterator().next().external); + } + catch (HttpMessageNotReadableException ex) { + // Some parsers raise exception by default + } } @Test @@ -207,6 +212,7 @@ public class Jaxb2CollectionHttpMessageConverterTests { } + @SuppressWarnings("unused") @XmlRootElement public static class RootElement { @@ -270,9 +276,6 @@ public class Jaxb2CollectionHttpMessageConverterTests { public int hashCode() { return s.hashCode(); } - - - } } diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java index 6b437f396f..21a8050969 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTest.java @@ -22,10 +22,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import static org.custommonkey.xmlunit.XMLAssert.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -41,7 +37,16 @@ import org.springframework.http.MockHttpInputMessage; import org.springframework.http.MockHttpOutputMessage; import org.springframework.http.converter.HttpMessageNotReadableException; -/** @author Arjen Poutsma */ +import static org.custommonkey.xmlunit.XMLAssert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + + +/** + * @author Arjen Poutsma + * @author Rossen Stoyanchev + */ public class Jaxb2RootElementHttpMessageConverterTest { private Jaxb2RootElementHttpMessageConverter converter; @@ -66,6 +71,7 @@ public class Jaxb2RootElementHttpMessageConverterTest { rootElementCglib = (RootElement) proxy.getProxy(); } + @Test public void canRead() throws Exception { assertTrue("Converter does not support reading @XmlRootElement", converter.canRead(RootElement.class, null)); @@ -197,7 +203,6 @@ public class Jaxb2RootElementHttpMessageConverterTest { } public static class RootElementSubclass extends RootElement { - } } diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java index a73e1b18b5..69d6624444 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java @@ -52,6 +52,7 @@ import static org.junit.Assert.assertTrue; /** * @author Arjen Poutsma + * @author Rossen Stoyanchev */ public class SourceHttpMessageConverterTests { @@ -254,4 +255,4 @@ public class SourceHttpMessageConverterTests { outputMessage.getHeaders().getContentType()); } -} +} \ No newline at end of file