From ccb1c13951da01603345504115fd3c177c65dd59 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Mon, 26 Jan 2015 15:59:15 +0100 Subject: [PATCH] Use UTC timezone in Jackson builder and factory tests Issue: SPR-12634 --- .../json/Jackson2ObjectMapperBuilderTests.java | 10 ++++++---- .../json/Jackson2ObjectMapperFactoryBeanTests.java | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java index 79d28e73d8..e4d1c782c6 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java @@ -58,6 +58,7 @@ import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.fasterxml.jackson.datatype.joda.cfg.JacksonJodaDateFormat; import com.fasterxml.jackson.datatype.joda.ser.DateTimeSerializer; import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; import org.junit.Test; @@ -223,8 +224,9 @@ public class Jackson2ObjectMapperBuilderTests { @Test public void defaultModules() throws JsonProcessingException, UnsupportedEncodingException { ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().build(); - DateTime dateTime = DateTime.parse("2011-12-03T10:15:30"); - assertEquals("1322903730000", new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")); + Long timestamp = 1322903730000L; + DateTime dateTime = new DateTime(timestamp, DateTimeZone.UTC); + assertEquals(timestamp.toString(), new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")); } @Test // SPR-12634 @@ -232,7 +234,7 @@ public class Jackson2ObjectMapperBuilderTests { ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json() .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) .modulesToInstall(CustomModule.class).build(); - DateTime dateTime = DateTime.parse("2011-12-03T10:15:30"); + DateTime dateTime = new DateTime(1322903730000L, DateTimeZone.UTC); assertEquals("\"2011-12-03\"", new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")); } @@ -241,7 +243,7 @@ public class Jackson2ObjectMapperBuilderTests { ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json() .serializerByType(DateTime.class, new DateTimeSerializer(new JacksonJodaDateFormat(DateTimeFormat.forPattern("YYYY-MM-dd").withZoneUTC()))) .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS).build(); - DateTime dateTime = DateTime.parse("2011-12-03T10:15:30"); + DateTime dateTime = new DateTime(1322903730000L, DateTimeZone.UTC); assertEquals("\"2011-12-03\"", new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")); } diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java index 0e926d1255..38b646bd56 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java @@ -56,6 +56,7 @@ import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.fasterxml.jackson.datatype.joda.cfg.JacksonJodaDateFormat; import com.fasterxml.jackson.datatype.joda.ser.DateTimeSerializer; import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; import org.junit.Before; import org.junit.Test; @@ -235,8 +236,9 @@ public class Jackson2ObjectMapperFactoryBeanTests { this.factory.afterPropertiesSet(); ObjectMapper objectMapper = this.factory.getObject(); - DateTime dateTime = DateTime.parse("2011-12-03T10:15:30"); - assertEquals("1322903730000", new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")); + Long timestamp = 1322903730000L; + DateTime dateTime = new DateTime(timestamp, DateTimeZone.UTC); + assertEquals(timestamp.toString(), new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")); } @Test // SPR-12634 @@ -246,7 +248,7 @@ public class Jackson2ObjectMapperFactoryBeanTests { this.factory.afterPropertiesSet(); ObjectMapper objectMapper = this.factory.getObject(); - DateTime dateTime = DateTime.parse("2011-12-03T10:15:30"); + DateTime dateTime = new DateTime(1322903730000L, DateTimeZone.UTC); assertEquals("\"2011-12-03\"", new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")); } @@ -260,7 +262,7 @@ public class Jackson2ObjectMapperFactoryBeanTests { this.factory.afterPropertiesSet(); ObjectMapper objectMapper = this.factory.getObject(); - DateTime dateTime = DateTime.parse("2011-12-03T10:15:30"); + DateTime dateTime = new DateTime(1322903730000L, DateTimeZone.UTC); assertEquals("\"2011-12-03\"", new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")); }