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

Update contentType property via MockHttpServletResponse::setCharacterEncoding()

Browse Source 
Prior to this commit, MockHttpServletResponse's setCharacterEncoding()
method did not update the contentType property, which violates the
Servlet 2.4 Javadoc for getContentType() and setCharacterEncoding().

This commit addresses this issue; however, some existing tests may have
to be updated as a result of this change.

For example, note how some of the tests in this commit have been
refactored to use MediaType##isCompatibleWith() instead of asserting
exact matches for the value returned by MockHttpServletResponse's
getContentType() method.

Closes gh-25536
This commit is contained in:
Sam Brannen
2020-08-10 16:05:18 +02:00
parent c5bb5d6c03
commit 5de549d7d4
6 changed files with 44 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
spring-webmvc/src/test/java/org/springframework/web/servlet/view/json/MappingJackson2JsonViewTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@ import com.fasterxml.jackson.databind.ser.FilterProvider;
import com.fasterxml.jackson.databind.ser.SerializerFactory;
import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ContextFactory;
@@ -60,30 +59,19 @@ import static org.mockito.Mockito.mock;
* @author Arjen Poutsma
* @author Rossen Stoyanchev
* @author Sebastien Deleuze
* @author Sam Brannen
*/
public class MappingJackson2JsonViewTests {
private MappingJackson2JsonView view;
private MappingJackson2JsonView view = new MappingJackson2JsonView();
private MockHttpServletRequest request;
private MockHttpServletRequest request = new MockHttpServletRequest();
private MockHttpServletResponse response;
private MockHttpServletResponse response = new MockHttpServletResponse();
private Context jsContext;
private Context jsContext = ContextFactory.getGlobal().enterContext();
private ScriptableObject jsScope;
@BeforeEach
public void setUp() {
request = new MockHttpServletRequest();
response = new MockHttpServletResponse();
jsContext = ContextFactory.getGlobal().enterContext();
jsScope = jsContext.initStandardObjects();
view = new MappingJackson2JsonView();
}
private ScriptableObject jsScope = jsContext.initStandardObjects();
@Test
@@ -102,7 +90,8 @@ public class MappingJackson2JsonViewTests {
assertThat(response.getHeader("Cache-Control")).isEqualTo("no-store");
assertThat(response.getContentType()).isEqualTo(MappingJackson2JsonView.DEFAULT_CONTENT_TYPE);
MediaType mediaType = MediaType.parseMediaType(response.getContentType());
assertThat(mediaType.isCompatibleWith(MediaType.parseMediaType(MappingJackson2JsonView.DEFAULT_CONTENT_TYPE))).isTrue();
String jsonResult = response.getContentAsString();
assertThat(jsonResult.length() > 0).isTrue();
@@ -117,12 +106,14 @@ public class MappingJackson2JsonViewTests {
model.put("foo", "bar");
view.render(model, request, response);
assertThat(response.getContentType()).isEqualTo("application/json");
MediaType mediaType = MediaType.parseMediaType(response.getContentType());
assertThat(mediaType.isCompatibleWith(MediaType.APPLICATION_JSON)).isTrue();
request.setAttribute(View.SELECTED_CONTENT_TYPE, new MediaType("application", "vnd.example-v2+xml"));
view.render(model, request, response);
assertThat(response.getContentType()).isEqualTo("application/vnd.example-v2+xml");
mediaType = MediaType.parseMediaType(response.getContentType());
assertThat(mediaType.isCompatibleWith(MediaType.parseMediaType("application/vnd.example-v2+xml"))).isTrue();
}
@Test
@@ -326,10 +317,10 @@ public class MappingJackson2JsonViewTests {
if (jsonPrefix != null) {
json = json.substring(5);
}
Object jsResult =
jsContext.evaluateString(jsScope, "(" + json + ")", "JSON Stream", 1, null);
Object jsResult = jsContext.evaluateString(jsScope, "(" + json + ")", "JSON Stream", 1, null);
assertThat(jsResult).as("Json Result did not eval as valid JavaScript").isNotNull();
assertThat(response.getContentType()).isEqualTo("application/json");
MediaType mediaType = MediaType.parseMediaType(response.getContentType());
assertThat(mediaType.isCompatibleWith(MediaType.APPLICATION_JSON)).isTrue();
}

38
spring-webmvc/src/test/java/org/springframework/web/servlet/view/xml/MappingJackson2XmlViewTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ import com.fasterxml.jackson.databind.cfg.SerializerFactoryConfig;
import com.fasterxml.jackson.databind.ser.BeanSerializerFactory;
import com.fasterxml.jackson.databind.ser.SerializerFactory;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.ContextFactory;
@@ -51,30 +50,19 @@ import static org.mockito.Mockito.mock;
/**
* @author Sebastien Deleuze
* @author Sam Brannen
*/
public class MappingJackson2XmlViewTests {
private MappingJackson2XmlView view;
private MappingJackson2XmlView view = new MappingJackson2XmlView();
private MockHttpServletRequest request;
private MockHttpServletRequest request = new MockHttpServletRequest();
private MockHttpServletResponse response;
private MockHttpServletResponse response = new MockHttpServletResponse();
private Context jsContext;
private Context jsContext = ContextFactory.getGlobal().enterContext();
private ScriptableObject jsScope;
@BeforeEach
public void setUp() {
request = new MockHttpServletRequest();
response = new MockHttpServletResponse();
jsContext = ContextFactory.getGlobal().enterContext();
jsScope = jsContext.initStandardObjects();
view = new MappingJackson2XmlView();
}
private ScriptableObject jsScope = jsContext.initStandardObjects();
@Test
@@ -93,7 +81,8 @@ public class MappingJackson2XmlViewTests {
assertThat(response.getHeader("Cache-Control")).isEqualTo("no-store");
assertThat(response.getContentType()).isEqualTo(MappingJackson2XmlView.DEFAULT_CONTENT_TYPE);
MediaType mediaType = MediaType.parseMediaType(response.getContentType());
assertThat(mediaType.isCompatibleWith(MediaType.parseMediaType(MappingJackson2XmlView.DEFAULT_CONTENT_TYPE))).isTrue();
String jsonResult = response.getContentAsString();
assertThat(jsonResult.length() > 0).isTrue();
@@ -108,12 +97,14 @@ public class MappingJackson2XmlViewTests {
model.put("foo", "bar");
view.render(model, request, response);
assertThat(response.getContentType()).isEqualTo("application/xml");
MediaType mediaType = MediaType.parseMediaType(response.getContentType());
assertThat(mediaType.isCompatibleWith(MediaType.APPLICATION_XML)).isTrue();
request.setAttribute(View.SELECTED_CONTENT_TYPE, new MediaType("application", "vnd.example-v2+xml"));
view.render(model, request, response);
assertThat(response.getContentType()).isEqualTo("application/vnd.example-v2+xml");
mediaType = MediaType.parseMediaType(response.getContentType());
assertThat(mediaType.isCompatibleWith(MediaType.parseMediaType("application/vnd.example-v2+xml"))).isTrue();
}
@Test
@@ -232,7 +223,8 @@ public class MappingJackson2XmlViewTests {
Object xmlResult =
jsContext.evaluateString(jsScope, "(" + response.getContentAsString() + ")", "XML Stream", 1, null);
assertThat(xmlResult).as("XML Result did not eval as valid JavaScript").isNotNull();
assertThat(response.getContentType()).isEqualTo("application/xml");
MediaType mediaType = MediaType.parseMediaType(response.getContentType());
assertThat(mediaType.isCompatibleWith(MediaType.APPLICATION_XML)).isTrue();
}