From 789e12a0c72c37a3f3796fd14bc2f61c8f6b909a Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 22 Aug 2012 14:24:53 -0400 Subject: [PATCH] Use OS-specific newline in Jackon pretty print tests --- .../json/AbstractMappingJacksonHttpMessageConverterTests.java | 3 +++ .../json/MappingJackson2HttpMessageConverterTests.java | 3 ++- .../json/MappingJacksonHttpMessageConverterTests.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java index bda5afc9df..6335cbab98 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.java @@ -43,6 +43,9 @@ import org.springframework.http.converter.HttpMessageNotReadableException; */ public abstract class AbstractMappingJacksonHttpMessageConverterTests> { + protected static final String NEWLINE_SYSTEM_PROPERTY = System.getProperty("line.separator"); + + private T converter; @Before diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java index 2b8409c650..b449545f15 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java @@ -40,6 +40,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; */ public class MappingJackson2HttpMessageConverterTests extends AbstractMappingJacksonHttpMessageConverterTests { + @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); } diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java index 180fe10461..e5fb9f3290 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java @@ -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); }