From 1a9cfefcbb0f89b6f2efdaf75d218194c5117be8 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 31 Jul 2017 10:45:18 +0200 Subject: [PATCH] Fix test failure Issue: SPR-15548 Closes gh-1488 --- .../xml/MappingJackson2XmlHttpMessageConverterTests.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java index 4a887b1c87..66989976dc 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java @@ -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); }