i050510 commented on a change in pull request #57: Support new date time API
URL: https://github.com/apache/olingo-odata4/pull/57#discussion_r342962517
##########
File path:
lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java
##########
@@ -22,139 +22,207 @@
import java.sql.Time;
import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
import java.util.Calendar;
import java.util.Date;
-import java.util.TimeZone;
import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.junit.Test;
public class EdmDateTimeOffsetTest extends PrimitiveTypeBaseTest {
- final EdmPrimitiveType instance =
EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.DateTimeOffset);
-
- @Test
- public void toUriLiteral() throws Exception {
- assertEquals("2009-12-26T21:23:38Z",
instance.toUriLiteral("2009-12-26T21:23:38Z"));
- assertEquals("2002-10-10T12:00:00-05:00",
instance.toUriLiteral("2002-10-10T12:00:00-05:00"));
- }
-
- @Test
- public void fromUriLiteral() throws Exception {
- assertEquals("2009-12-26T21:23:38Z",
instance.fromUriLiteral("2009-12-26T21:23:38Z"));
- assertEquals("2002-10-10T12:00:00-05:00",
instance.fromUriLiteral("2002-10-10T12:00:00-05:00"));
- }
-
- @Test
- public void valueToString() throws Exception {
- Calendar dateTime = Calendar.getInstance();
- dateTime.clear();
- dateTime.setTimeZone(TimeZone.getTimeZone("GMT"));
- dateTime.set(2012, 1, 29, 1, 2, 3);
- assertEquals("2012-02-29T01:02:03Z", instance.valueToString(dateTime,
null, null, null, null, null));
- assertEquals("2012-02-29T01:02:03Z", instance.valueToString(dateTime,
null, null, 0, null, null));
- assertEquals("2012-02-29T01:02:03Z", instance.valueToString(dateTime,
null, null, 5, null, null));
-
- dateTime.setTimeZone(TimeZone.getTimeZone("GMT-1:30"));
- assertEquals("2012-02-29T01:02:03-01:30", instance.valueToString(dateTime,
null, null, null, null, null));
-
- dateTime.setTimeZone(TimeZone.getTimeZone("GMT+11:00"));
- assertEquals("2012-02-29T01:02:03+11:00", instance.valueToString(dateTime,
null, null, null, null, null));
-
- dateTime.set(Calendar.MILLISECOND, 503);
- assertEquals("2012-02-29T01:02:03.503+11:00",
instance.valueToString(dateTime, null, null, null, null, null));
- assertEquals("2012-02-29T01:02:03.503+11:00",
instance.valueToString(dateTime, null, null, 3, null, null));
-
- dateTime.set(Calendar.MILLISECOND, 530);
- assertEquals("2012-02-29T01:02:03.53+11:00",
instance.valueToString(dateTime, null, null, null, null, null));
- assertEquals("2012-02-29T01:02:03.53+11:00",
instance.valueToString(dateTime, null, null, 3, null, null));
-
- dateTime.set(Calendar.MILLISECOND, 53);
- assertEquals("2012-02-29T01:02:03.053+11:00",
instance.valueToString(dateTime, null, null, null, null, null));
- assertEquals("2012-02-29T01:02:03.053+11:00",
instance.valueToString(dateTime, null, null, 3, null, null));
-
- final Long millis = 1330558323007L;
- assertEquals("2012-02-29T23:32:03.007Z", instance.valueToString(millis,
null, null, null, null, null));
- assertEquals("2012-02-29T23:32:03.007Z", instance.valueToString(millis,
null, null, 3, null, null));
- assertEquals("1969-12-31T23:59:59.9Z", instance.valueToString(-100L, null,
null, 1, null, null));
- assertEquals("1969-12-31T23:59:59.98Z", instance.valueToString(-20L, null,
null, 2, null, null));
-
- assertEquals("2012-02-29T23:32:03.007Z", instance.valueToString(new
Time(millis), null, null, 3, null, null));
- assertEquals("1969-12-31T23:59:59.9Z", instance.valueToString(new
Time(-100L), null, null, 1, null, null));
- assertEquals("1969-12-31T23:59:59.98Z", instance.valueToString(new
Time(-20L), null, null, 2, null, null));
-
- final Date date = new Date(millis);
- assertEquals("2012-02-29T23:32:03.007Z", instance.valueToString(date,
null, null, null, null, null));
- assertEquals("2012-02-29T23:32:03.007Z", instance.valueToString(date,
null, null, 3, null, null));
-
- Timestamp timestamp = new Timestamp(0);
- timestamp.setNanos(120);
- assertEquals("1970-01-01T00:00:00.00000012Z",
instance.valueToString(timestamp, null, null, null, null, null));
- assertEquals("1970-01-01T00:00:00.00000012Z",
instance.valueToString(timestamp, null, null, 8, null, null));
-
- expectFacetsErrorInValueToString(instance, 3L, null, null, 2, null, null);
- expectFacetsErrorInValueToString(instance, timestamp, null, null, 7, null,
null);
-
- expectTypeErrorInValueToString(instance, 0);
- }
-
- @Test
- public void valueOfString() throws Exception {
- Calendar dateTime = Calendar.getInstance();
- dateTime.clear();
- dateTime.setTimeZone(TimeZone.getTimeZone("GMT"));
- dateTime.set(2012, 1, 29, 1, 2, 3);
- assertEquals(dateTime, instance.valueOfString("2012-02-29T01:02:03Z",
null, null, null, null, null,
- Calendar.class));
- assertEquals(Long.valueOf(dateTime.getTimeInMillis()),
instance.valueOfString("2012-02-29T01:02:03+00:00", null,
- null, null, null, null, Long.class));
- assertEquals(dateTime, instance.valueOfString("2012-02-29T01:02:03", null,
null, null, null, null,
- Calendar.class));
-
- dateTime.clear();
- dateTime.setTimeZone(TimeZone.getTimeZone("GMT-01:30"));
- dateTime.set(2012, 1, 29, 1, 2, 3);
- assertEquals(dateTime.getTime(),
instance.valueOfString("2012-02-29T01:02:03-01:30", null, null, null, null,
null,
- Date.class));
-
- dateTime.clear();
- dateTime.setTimeZone(TimeZone.getTimeZone("GMT+11:00"));
- dateTime.set(2012, 1, 29, 1, 2, 3);
- assertEquals(dateTime, instance.valueOfString("2012-02-29T01:02:03+11:00",
null, null, null, null, null,
- Calendar.class));
-
- dateTime.add(Calendar.MILLISECOND, 7);
- assertEquals(dateTime,
instance.valueOfString("2012-02-29T01:02:03.007+11:00", null, null, 3, null,
null,
- Calendar.class));
- assertEquals(530000001,
instance.valueOfString("2012-02-29T01:02:03.530000001+11:00", null, null, 9,
null, null,
- Timestamp.class).getNanos());
-
- assertEquals(Long.valueOf(120000L),
instance.valueOfString("1970-01-01T00:02", null, null, null, null, null,
- Long.class));
- assertEquals(Long.valueOf(12L),
instance.valueOfString("1970-01-01T00:00:00.012", null, null, 3, null, null,
- Long.class));
- assertEquals(Long.valueOf(120L),
instance.valueOfString("1970-01-01T00:00:00.12", null, null, 2, null, null,
- Long.class));
-
- assertEquals(new Time(120000L), instance.valueOfString("1970-01-01T00:02",
null, null, null, null, null,
- Time.class));
- // java.sql.Time does not keep track of milliseconds.
- assertEquals(new Time(0),
instance.valueOfString("1970-01-01T00:00:00.012", null, null, 3, null, null,
- Time.class));
- assertEquals(new Time(0), instance.valueOfString("1970-01-01T00:00:00.12",
null, null, 2, null, null, Time.class));
-
- expectFacetsErrorInValueOfString(instance, "2012-02-29T23:32:02.9Z", null,
null, null, null, null);
- expectFacetsErrorInValueOfString(instance, "2012-02-29T23:32:02.9Z", null,
null, 0, null, null);
- expectContentErrorInValueOfString(instance, "2012-02-29T23:32:02X");
- expectContentErrorInValueOfString(instance, "2012-02-29T23:32:02+24:00");
- expectContentErrorInValueOfString(instance, "2012-02-30T01:02:03");
- expectContentErrorInValueOfString(instance, "2012-02-29T23:32:02.");
- expectContentErrorInValueOfString(instance,
"2012-02-29T23:32:02.0000000000000");
-
- expectUnconvertibleErrorInValueOfString(instance,
"2012-02-29T23:32:02.1234", Calendar.class);
- expectUnconvertibleErrorInValueOfString(instance,
"2012-02-29T23:32:02.0123456789", Timestamp.class);
-
- expectTypeErrorInValueOfString(instance, "2012-02-29T01:02:03Z");
- }
+ final EdmPrimitiveType instance =
EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.DateTimeOffset);
+
+ @Test
+ public void toUriLiteral() throws Exception {
+ assertEquals("2009-12-26T21:23:38Z",
instance.toUriLiteral("2009-12-26T21:23:38Z"));
+ assertEquals("2002-10-10T12:00:00-05:00",
instance.toUriLiteral("2002-10-10T12:00:00-05:00"));
+ }
+
+ @Test
+ public void fromUriLiteral() throws Exception {
+ assertEquals("2009-12-26T21:23:38Z",
instance.fromUriLiteral("2009-12-26T21:23:38Z"));
+ assertEquals("2002-10-10T12:00:00-05:00",
instance.fromUriLiteral("2002-10-10T12:00:00-05:00"));
+ }
+
+ @Test
+ public void valueToStringFromInstant() throws Exception {
+ Instant instant = Instant.parse("2012-02-29T01:02:03Z");
+ assertEquals("2012-02-29T01:02:03Z",
instance.valueToString(instant, null, null, null, null, null));
+ assertEquals("2012-02-29T01:02:03Z",
instance.valueToString(instant, null, null, 0, null, null));
+ assertEquals("2012-02-29T01:02:03Z",
instance.valueToString(instant, null, null, 5, null, null));
+ }
+
+ @Test
+ public void valueToStringFromZonedDateTime() throws Exception {
+ ZonedDateTime zdt =
ZonedDateTime.parse("2012-02-28T23:32:03-01:30");
+
+ assertEquals("2012-02-28T23:32:03-01:30",
instance.valueToString(zdt, null, null, null, null, null));
+
+ zdt = zdt.withZoneSameInstant(ZoneId.of("GMT+11:00"));
+ assertEquals("2012-02-29T12:02:03+11:00",
instance.valueToString(zdt, null, null, null, null, null));
+
+ zdt = zdt.plus(503, ChronoUnit.MILLIS);
+
+ assertEquals("2012-02-29T12:02:03.503+11:00",
instance.valueToString(zdt, null, null, null, null, null));
+ assertEquals("2012-02-29T12:02:03.503+11:00",
instance.valueToString(zdt, null, null, 3, null, null));
Review comment:
Add a test with value containing nanoseconds.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
