From 40733d1c5e8f0d4638edca09ef20b4506adefc85 Mon Sep 17 00:00:00 2001 From: Arjen Poutsma Date: Wed, 1 Apr 2009 13:31:51 +0000 Subject: [PATCH] Polishing git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@908 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../ServletAnnotationControllerTests.java | 31 ++----------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java index ff444f268c9..62dd293a9ca 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java @@ -778,16 +778,7 @@ public class ServletAnnotationControllerTests { @Test public void relativePathDispatchingController() throws Exception { - @SuppressWarnings("serial") DispatcherServlet servlet = new DispatcherServlet() { - @Override - protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) { - GenericWebApplicationContext wac = new GenericWebApplicationContext(); - wac.registerBeanDefinition("controller", - new RootBeanDefinition(MyRelativePathDispatchingController.class)); - wac.refresh(); - return wac; - } - }; + initServlet(MyRelativePathDispatchingController.class); servlet.init(new MockServletConfig()); MockHttpServletRequest request = new MockHttpServletRequest("GET", "/myApp/myHandle"); @@ -813,15 +804,7 @@ public class ServletAnnotationControllerTests { @Test public void nullCommandController() throws Exception { - @SuppressWarnings("serial") DispatcherServlet servlet = new DispatcherServlet() { - @Override - protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) { - GenericWebApplicationContext wac = new GenericWebApplicationContext(); - wac.registerBeanDefinition("controller", new RootBeanDefinition(MyNullCommandController.class)); - wac.refresh(); - return wac; - } - }; + initServlet(MyNullCommandController.class); servlet.init(new MockServletConfig()); MockHttpServletRequest request = new MockHttpServletRequest("GET", "/myPath"); @@ -833,15 +816,7 @@ public class ServletAnnotationControllerTests { @Test public void equivalentMappingsWithSameMethodName() throws Exception { - @SuppressWarnings("serial") DispatcherServlet servlet = new DispatcherServlet() { - @Override - protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) { - GenericWebApplicationContext wac = new GenericWebApplicationContext(); - wac.registerBeanDefinition("controller", new RootBeanDefinition(ChildController.class)); - wac.refresh(); - return wac; - } - }; + initServlet(ChildController.class); servlet.init(new MockServletConfig()); MockHttpServletRequest request = new MockHttpServletRequest("GET", "/child/test");