spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-26 08:59:09 +00:00
Code Issues Projects Releases Wiki Activity

SPR-7081 - Add ignoreJafMediaTypes to ContentNegotiatingViewResolver

Browse Source 
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3239 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Arjen Poutsma
2010-04-13 08:37:59 +00:00
parent 1a4e2644b6
commit 8879140e4a
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java
+13 -3
View File
@@ -49,14 +49,24 @@ public class ContentNegotiatingViewResolverTests {
}
@Test
public void getMediaTypeFromFilename() {
assertEquals("Invalid content type", new MediaType("text", "html"),
viewResolver.getMediaTypeFromFilename("test.html"));
public void getMediaTypeFromFilenameMediaTypes() {
viewResolver.setMediaTypes(Collections.singletonMap("HTML", "application/xhtml+xml"));
assertEquals("Invalid content type", new MediaType("application", "xhtml+xml"),
viewResolver.getMediaTypeFromFilename("test.html"));
}
@Test
public void getMediaTypeFromFilenameJaf() {
assertEquals("Invalid content type", new MediaType("text", "html"),
viewResolver.getMediaTypeFromFilename("test.html"));
}
@Test
public void getMediaTypeFromFilenameNoJaf() {
viewResolver.setUseJaf(false);
assertNull("Invalid content type", viewResolver.getMediaTypeFromFilename("test.html"));
}
@Test
public void getMediaTypeFilename() {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/test.html?foo=bar");