This is an automated email from the ASF dual-hosted git repository. ramyav pushed a commit to branch OLINGO-1408 in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git
The following commit(s) were added to refs/heads/OLINGO-1408 by this push: new 636fdde [OLINGO-1408] Fix tests 636fdde is described below commit 636fdde13dda35d9decae1768d9846f04bb355d9 Author: ramya vasanth <ramya.vasa...@sap.com> AuthorDate: Tue Nov 26 11:42:50 2019 +0530 [OLINGO-1408] Fix tests --- .../olingo/server/tecsvc/data/DataCreator.java | 30 +++++++++++----------- .../json/ODataJsonDeserializerEntityTest.java | 4 +-- .../serializer/json/ODataJsonSerializerTest.java | 3 ++- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java index 38964fe..7007b89 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java @@ -22,9 +22,15 @@ import java.math.BigDecimal; import java.net.URI; import java.nio.charset.Charset; import java.sql.Timestamp; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; +import java.util.GregorianCalendar; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -2111,11 +2117,8 @@ public class DataCreator { private static Calendar getDateTime(final int year, final int month, final int day, final int hour, final int minute, final int second) { // Date/Time values are serialized with a timezone offset, so we choose a predictable timezone. - Calendar dateTime = Calendar.getInstance(TimeZone.getTimeZone("GMT")); - dateTime.clear(); - dateTime.set(year, month - 1, day, hour, minute, second); - dateTime.set(Calendar.MILLISECOND, 0); - return dateTime; + ZonedDateTime zdt = ZonedDateTime.of(year, month, day, hour, minute, second, 0, ZoneId.of("Z")); + return GregorianCalendar.from(zdt); } private static int getDuration(final int days, final int hours, final int minutes, final int seconds) { @@ -2127,20 +2130,17 @@ public class DataCreator { private static Calendar getDate(final int year, final int month, final int day) { // Date values are always in the local timezone. - Calendar date = Calendar.getInstance(); - date.clear(); - date.set(year, month - 1, day, 0, 0, 0); - date.set(Calendar.MILLISECOND, 0); - return date; + LocalDate date = LocalDate.of(year, month, day); + ZonedDateTime zdt = LocalDateTime.of(date, LocalTime.MIDNIGHT).atZone(ZoneId.systemDefault()); + return GregorianCalendar.from(zdt); } private static Calendar getTime(final int hour, final int minute, final int second) { // Time values are always in the local timezone. - Calendar time = Calendar.getInstance(); - time.clear(); - time.set(1970, Calendar.JANUARY, 1, hour, minute, second); - time.set(Calendar.MILLISECOND, 0); - return time; + LocalTime time = LocalTime.of(hour, minute, second); + LocalDate EPOCH = LocalDate.ofEpochDay(0l); + ZonedDateTime zdt = LocalDateTime.of(EPOCH, time).atZone(ZoneId.systemDefault()); + return GregorianCalendar.from(zdt); } private static Timestamp getTimestamp(final int year, final int month, final int day, diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java index 39d6d1d..8961a1b 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java @@ -1154,9 +1154,9 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe assertEquals(2, properties.size()); assertNotNull(entity.getProperty("PropertyDate").getValue()); - assertEquals(Date.class, entity.getProperty("PropertyDate").getValue().getClass()); + assertEquals(java.sql.Date.class, entity.getProperty("PropertyDate").getValue().getClass()); assertNotNull(entity.getProperty("PropertyDateTimeOffset").getValue()); - assertEquals(Date.class, entity.getProperty("PropertyDateTimeOffset").getValue().getClass()); + assertEquals(java.sql.Timestamp.class, entity.getProperty("PropertyDateTimeOffset").getValue().getClass()); } // ---------------------------------- Negative Tests ----------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java index d196330..5230e60 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java @@ -152,7 +152,8 @@ public class ODataJsonSerializerTest { final EdmEntitySet edmEntitySet = entityContainer.getEntitySet("ESAllPrim"); final Entity entity = data.readAll(edmEntitySet).getEntities().get(0); entity.getProperty("PropertyDate").setValue(ValueType.PRIMITIVE, LocalDate.parse("2012-12-03")); - entity.getProperty("PropertyDateTimeOffset").setValue(ValueType.PRIMITIVE, Instant.parse("2012-12-03T07:16:23Z")); + entity.getProperty("PropertyDateTimeOffset") + .setValue(ValueType.PRIMITIVE, Instant.parse("2012-12-03T07:16:23Z")); entity.getProperty("PropertyTimeOfDay").setValue(ValueType.PRIMITIVE, LocalTime.parse("03:26:05")); InputStream result = serializer.entity(metadata, edmEntitySet.getEntityType(), entity, EntitySerializerOptions.with()