root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Use OS-specific newline in Jackon pretty print tests

This commit is contained in:
Rossen Stoyanchev 2012-08-22 14:24:53 -04:00
parent 2965df6bee
commit 789e12a0c7
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java
View File

@ -43,6 +43,9 @@ import org.springframework.http.converter.HttpMessageNotReadableException;
*/
public abstract class AbstractMappingJacksonHttpMessageConverterTests<T extends HttpMessageConverter<Object>> {
protected static final String NEWLINE_SYSTEM_PROPERTY = System.getProperty("line.separator");
private T converter;
@Before

3
spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
View File

@ -40,6 +40,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*/
public class MappingJackson2HttpMessageConverterTests extends AbstractMappingJacksonHttpMessageConverterTests<MappingJackson2HttpMessageConverter> {
@Override
protected MappingJackson2HttpMessageConverter createConverter() {
return new MappingJackson2HttpMessageConverter();
@ -86,7 +87,7 @@ public class MappingJackson2HttpMessageConverterTests extends AbstractMappingJac
getConverter().writeInternal(bean, outputMessage);
String result = outputMessage.getBodyAsString(Charset.forName("UTF-8"));
assertEquals("{\n \"name\" : \"Jason\"\n}", result);
assertEquals("{" + NEWLINE_SYSTEM_PROPERTY + " \"name\" : \"Jason\"" + NEWLINE_SYSTEM_PROPERTY + "}", result);
}

2
spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java
View File

@ -84,7 +84,7 @@ public class MappingJacksonHttpMessageConverterTests extends AbstractMappingJack
getConverter().writeInternal(bean, outputMessage);
String result = outputMessage.getBodyAsString(Charset.forName("UTF-8"));
assertEquals("{\n \"name\" : \"Jason\"\n}", result);
assertEquals("{" + NEWLINE_SYSTEM_PROPERTY + " \"name\" : \"Jason\"" + NEWLINE_SYSTEM_PROPERTY + "}", result);
}