Polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@908 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
parent
35a3940008
commit
40733d1c5e
|
|
@ -778,16 +778,7 @@ public class ServletAnnotationControllerTests {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void relativePathDispatchingController() throws Exception {
|
public void relativePathDispatchingController() throws Exception {
|
||||||
@SuppressWarnings("serial") DispatcherServlet servlet = new DispatcherServlet() {
|
initServlet(MyRelativePathDispatchingController.class);
|
||||||
@Override
|
|
||||||
protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) {
|
|
||||||
GenericWebApplicationContext wac = new GenericWebApplicationContext();
|
|
||||||
wac.registerBeanDefinition("controller",
|
|
||||||
new RootBeanDefinition(MyRelativePathDispatchingController.class));
|
|
||||||
wac.refresh();
|
|
||||||
return wac;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
servlet.init(new MockServletConfig());
|
servlet.init(new MockServletConfig());
|
||||||
|
|
||||||
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/myApp/myHandle");
|
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/myApp/myHandle");
|
||||||
|
|
@ -813,15 +804,7 @@ public class ServletAnnotationControllerTests {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void nullCommandController() throws Exception {
|
public void nullCommandController() throws Exception {
|
||||||
@SuppressWarnings("serial") DispatcherServlet servlet = new DispatcherServlet() {
|
initServlet(MyNullCommandController.class);
|
||||||
@Override
|
|
||||||
protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) {
|
|
||||||
GenericWebApplicationContext wac = new GenericWebApplicationContext();
|
|
||||||
wac.registerBeanDefinition("controller", new RootBeanDefinition(MyNullCommandController.class));
|
|
||||||
wac.refresh();
|
|
||||||
return wac;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
servlet.init(new MockServletConfig());
|
servlet.init(new MockServletConfig());
|
||||||
|
|
||||||
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/myPath");
|
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/myPath");
|
||||||
|
|
@ -833,15 +816,7 @@ public class ServletAnnotationControllerTests {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void equivalentMappingsWithSameMethodName() throws Exception {
|
public void equivalentMappingsWithSameMethodName() throws Exception {
|
||||||
@SuppressWarnings("serial") DispatcherServlet servlet = new DispatcherServlet() {
|
initServlet(ChildController.class);
|
||||||
@Override
|
|
||||||
protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent) {
|
|
||||||
GenericWebApplicationContext wac = new GenericWebApplicationContext();
|
|
||||||
wac.registerBeanDefinition("controller", new RootBeanDefinition(ChildController.class));
|
|
||||||
wac.refresh();
|
|
||||||
return wac;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
servlet.init(new MockServletConfig());
|
servlet.init(new MockServletConfig());
|
||||||
|
|
||||||
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/child/test");
|
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/child/test");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue