From 527776cde4ef0349c478f89aa22a58e40691f6f7 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 7 May 2013 17:32:31 +0200 Subject: [PATCH] Removed JDK 8 workaround (not necessary anymore with build 88) --- .../MockMultipartHttpServletRequestBuilderTests.java | 10 ++-------- .../standalone/FileUploadControllerTests.java | 12 +++--------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java index b38f71d8910..e7108df57af 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockMultipartHttpServletRequestBuilderTests.java @@ -39,14 +39,8 @@ public class MockMultipartHttpServletRequestBuilderTests { assertEquals(MockMultipartHttpServletRequestBuilder.class, result.getClass()); MockMultipartHttpServletRequestBuilder builder = (MockMultipartHttpServletRequestBuilder) result; - try { - MockHttpServletRequest request = builder.buildRequest(new MockServletContext()); - assertEquals("UTF-8", request.getCharacterEncoding()); - } - catch (NoSuchMethodError err) { - // TODO: on JDK 8 - no idea why - err.printStackTrace(); - } + MockHttpServletRequest request = builder.buildRequest(new MockServletContext()); + assertEquals("UTF-8", request.getCharacterEncoding()); } } \ No newline at end of file diff --git a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java index 6ae141a2ac7..40407f72c13 100644 --- a/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java +++ b/spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java @@ -40,15 +40,9 @@ public class FileUploadControllerTests { @Test public void readString() throws Exception { MockMultipartFile file = new MockMultipartFile("file", "orig", null, "bar".getBytes()); - try { - standaloneSetup(new FileUploadController()).build() - .perform(fileUpload("/fileupload").file(file)) - .andExpect(model().attribute("message", "File 'orig' uploaded successfully")); - } - catch (NoSuchMethodError err) { - // TODO: on JDK 8 - no idea why - err.printStackTrace(); - } + standaloneSetup(new FileUploadController()).build() + .perform(fileUpload("/fileupload").file(file)) + .andExpect(model().attribute("message", "File 'orig' uploaded successfully")); }