Use UTC timezone in Jackson builder and factory tests

Issue: SPR-12634

Author: sdeleuze

spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java

@@ -58,6 +58,7 @@
 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,16 +224,17 @@ public void setModules() {
 	@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
 	public void customizeDefaultModules() throws JsonProcessingException, UnsupportedEncodingException {
 		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 void customizeDefaultModulesWithSerializer() throws JsonProcessingExcepti
 		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"));
 	}
 

spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java

@@ -56,6 +56,7 @@
 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 void defaultModules() throws JsonProcessingException, UnsupportedEncoding
 		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 void customizeDefaultModules() throws JsonProcessingException, Unsupporte
 		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 void customizeDefaultModulesWithSerializer() throws JsonProcessingExcepti
 		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"));
 	}