Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish ContentNegotiationStrategy support

Browse Source 
Issue: SPR-8410, SPR-8417, SPR-8418,SPR-8416, SPR-8419,SPR-7722
This commit is contained in:
Rossen Stoyanchev
2012-06-25 15:24:05 -04:00
parent 4623568bce
commit f94aed8386
11 changed files with 80 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-web/src/test/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategyTests.java
View File

@@ -35,7 +35,7 @@ public class AbstractMappingContentNegotiationStrategyTests {
@Test
public void resolveMediaTypes() {
Map<String, String> mapping = Collections.singletonMap("json", "application/json");
Map<String, MediaType> mapping = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
TestMappingContentNegotiationStrategy strategy = new TestMappingContentNegotiationStrategy("json", mapping);
List<MediaType> mediaTypes = strategy.resolveMediaTypes(null);
@@ -46,7 +46,7 @@ public class AbstractMappingContentNegotiationStrategyTests {
@Test
public void resolveMediaTypesNoMatch() {
Map<String, String> mapping = null;
Map<String, MediaType> mapping = null;
TestMappingContentNegotiationStrategy strategy = new TestMappingContentNegotiationStrategy("blah", mapping);
List<MediaType> mediaTypes = strategy.resolveMediaTypes(null);
@@ -56,7 +56,7 @@ public class AbstractMappingContentNegotiationStrategyTests {
@Test
public void resolveMediaTypesNoKey() {
Map<String, String> mapping = Collections.singletonMap("json", "application/json");
Map<String, MediaType> mapping = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
TestMappingContentNegotiationStrategy strategy = new TestMappingContentNegotiationStrategy(null, mapping);
List<MediaType> mediaTypes = strategy.resolveMediaTypes(null);
@@ -66,7 +66,7 @@ public class AbstractMappingContentNegotiationStrategyTests {
@Test
public void resolveMediaTypesHandleNoMatch() {
Map<String, String> mapping = null;
Map<String, MediaType> mapping = null;
TestMappingContentNegotiationStrategy strategy = new TestMappingContentNegotiationStrategy("xml", mapping);
List<MediaType> mediaTypes = strategy.resolveMediaTypes(null);
@@ -80,7 +80,7 @@ public class AbstractMappingContentNegotiationStrategyTests {
private final String extension;
public TestMappingContentNegotiationStrategy(String extension, Map<String, String> mapping) {
public TestMappingContentNegotiationStrategy(String extension, Map<String, MediaType> mapping) {
super(mapping);
this.extension = extension;
}

20
spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeExtensionsResolverTests.java → spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java
View File

@@ -16,6 +16,7 @@
package org.springframework.web.accept;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.util.Collections;
import java.util.List;
@@ -25,20 +26,29 @@ import org.junit.Test;
import org.springframework.http.MediaType;
/**
* Test fixture for MappingMediaTypeExtensionsResolver.
* Test fixture for {@link MappingMediaTypeFileExtensionResolver}.
*
* @author Rossen Stoyanchev
*/
public class MappingMediaTypeExtensionsResolverTests {
public class MappingMediaTypeFileExtensionResolverTests {
@Test
public void resolveExtensions() {
Map<String, String> mapping = Collections.singletonMap("json", "application/json");
MappingMediaTypeExtensionsResolver resolver = new MappingMediaTypeExtensionsResolver(mapping);
List<String> extensions = resolver.resolveExtensions(MediaType.APPLICATION_JSON);
Map<String, MediaType> mapping = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
MappingMediaTypeFileExtensionResolver resolver = new MappingMediaTypeFileExtensionResolver(mapping);
List<String> extensions = resolver.resolveFileExtensions(MediaType.APPLICATION_JSON);
assertEquals(1, extensions.size());
assertEquals("json", extensions.get(0));
}
@Test
public void resolveExtensionsNoMatch() {
Map<String, MediaType> mapping = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
MappingMediaTypeFileExtensionResolver resolver = new MappingMediaTypeFileExtensionResolver(mapping);
List<String> extensions = resolver.resolveFileExtensions(MediaType.TEXT_HTML);
assertTrue(extensions.isEmpty());
}
}

2
spring-web/src/test/java/org/springframework/web/accept/PathExtensionContentNegotiationStrategyTests.java
View File

@@ -56,7 +56,7 @@ public class PathExtensionContentNegotiationStrategyTests {
assertEquals(Arrays.asList(new MediaType("text", "html")), mediaTypes);
strategy = new PathExtensionContentNegotiationStrategy(Collections.singletonMap("HTML", "application/xhtml+xml"));
strategy = new PathExtensionContentNegotiationStrategy(Collections.singletonMap("HTML", MediaType.APPLICATION_XHTML_XML));
mediaTypes = strategy.resolveMediaTypes(this.webRequest);
assertEquals(Arrays.asList(new MediaType("application", "xhtml+xml")), mediaTypes);