|
|
|
@ -29,6 +29,7 @@ import org.springframework.core.io.ClassPathResource; |
|
|
|
|
import org.springframework.http.MediaType; |
|
|
|
|
import org.springframework.http.MockHttpInputMessage; |
|
|
|
|
import org.springframework.http.MockHttpOutputMessage; |
|
|
|
|
import org.springframework.http.converter.HttpMessageNotReadableException; |
|
|
|
|
import org.springframework.http.converter.json.MappingJacksonValue; |
|
|
|
|
|
|
|
|
|
import static org.hamcrest.CoreMatchers.*; |
|
|
|
@ -98,11 +99,12 @@ public class MappingJackson2XmlHttpMessageConverterTests { |
|
|
|
|
outputMessage.getHeaders().getContentType()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Test(expected = IOException.class) |
|
|
|
|
@Test |
|
|
|
|
public void readInvalidXml() throws IOException { |
|
|
|
|
String body = "FooBar"; |
|
|
|
|
MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8")); |
|
|
|
|
inputMessage.getHeaders().setContentType(new MediaType("application", "xml")); |
|
|
|
|
this.thrown.expect(HttpMessageNotReadableException.class); |
|
|
|
|
converter.read(MyBean.class, inputMessage); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -150,7 +152,7 @@ public class MappingJackson2XmlHttpMessageConverterTests { |
|
|
|
|
MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8")); |
|
|
|
|
inputMessage.getHeaders().setContentType(new MediaType("application", "xml")); |
|
|
|
|
|
|
|
|
|
this.thrown.expect(IOException.class); |
|
|
|
|
this.thrown.expect(HttpMessageNotReadableException.class); |
|
|
|
|
this.converter.read(MyBean.class, inputMessage); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -177,7 +179,7 @@ public class MappingJackson2XmlHttpMessageConverterTests { |
|
|
|
|
MockHttpInputMessage inputMessage = new MockHttpInputMessage(body.getBytes("UTF-8")); |
|
|
|
|
inputMessage.getHeaders().setContentType(new MediaType("application", "xml")); |
|
|
|
|
|
|
|
|
|
this.thrown.expect(IOException.class); |
|
|
|
|
this.thrown.expect(HttpMessageNotReadableException.class); |
|
|
|
|
this.converter.read(MyBean.class, inputMessage); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|