Revert "Fix failing test"

This reverts commit c01f45fa59.
This commit is contained in:
Rossen Stoyanchev
2013-10-07 21:10:05 -04:00
parent 4bf5a0234c
commit 5c62c86fc9
2 changed files with 13 additions and 7 deletions

View File

@@ -17,6 +17,7 @@
package org.springframework.web.servlet.resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.servlet.ServletException;
@@ -25,6 +26,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.junit.Test;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.mock.web.test.MockFilterChain;
import org.springframework.mock.web.test.MockHttpServletRequest;
@@ -34,6 +36,7 @@ import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
import static org.junit.Assert.*;
@@ -117,7 +120,6 @@ public class ResourceUrlFilterTests {
@Configuration
static class WebConfig extends WebMvcConfigurationSupport {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
@@ -129,6 +131,14 @@ public class ResourceUrlFilterTests {
.addResourceLocations("classpath:org/springframework/web/servlet/resource/test/")
.setResourceResolvers(resourceResolvers);
}
@Bean
public ResourceUrlGenerator resourceUrlGenerator() {
ResourceUrlGenerator generator = new ResourceUrlGenerator();
SimpleUrlHandlerMapping handlerMapping = (SimpleUrlHandlerMapping) resourceHandlerMapping();
generator.setResourceHandlerMappings(Collections.singletonList(handlerMapping));
return generator;
}
}
private static class TestServlet extends HttpServlet {