Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-1296] EdmDateTimeOffSet precision validation

This commit is contained in:
Archana Rai 2018-09-26 13:52:49 +05:30
parent 6bdaed4875
commit fb2d21d703
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffset.java
View File

@ -261,7 +261,7 @@ public final class EdmDateTimeOffset extends SingletonPrimitiveType {
nonSignificant++; nonSignificant++;
} }
if (precision == null || precision < (isNano ? 9 : 3) - nonSignificant) { if (precision != null && precision < (isNano ? 9 : 3) - nonSignificant) {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }

7
lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java
View File

@ -63,15 +63,19 @@ public class EdmDateTimeOffsetTest extends PrimitiveTypeBaseTest {
assertEquals("2012-02-29T01:02:03+11:00", instance.valueToString(dateTime, null, null, null, null, null)); assertEquals("2012-02-29T01:02:03+11:00", instance.valueToString(dateTime, null, null, null, null, null));
dateTime.set(Calendar.MILLISECOND, 503); 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)); assertEquals("2012-02-29T01:02:03.503+11:00", instance.valueToString(dateTime, null, null, 3, null, null));
dateTime.set(Calendar.MILLISECOND, 530); 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)); assertEquals("2012-02-29T01:02:03.53+11:00", instance.valueToString(dateTime, null, null, 3, null, null));
dateTime.set(Calendar.MILLISECOND, 53); 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)); assertEquals("2012-02-29T01:02:03.053+11:00", instance.valueToString(dateTime, null, null, 3, null, null));
final Long millis = 1330558323007L; 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("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.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("1969-12-31T23:59:59.98Z", instance.valueToString(-20L, null, null, 2, null, null));
@ -81,13 +85,14 @@ public class EdmDateTimeOffsetTest extends PrimitiveTypeBaseTest {
assertEquals("1969-12-31T23:59:59.98Z", instance.valueToString(new Time(-20L), null, null, 2, 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); 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)); assertEquals("2012-02-29T23:32:03.007Z", instance.valueToString(date, null, null, 3, null, null));
Timestamp timestamp = new Timestamp(0); Timestamp timestamp = new Timestamp(0);
timestamp.setNanos(120); 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)); assertEquals("1970-01-01T00:00:00.00000012Z", instance.valueToString(timestamp, null, null, 8, null, null));
expectFacetsErrorInValueToString(instance, millis, null, null, null, null, null);
expectFacetsErrorInValueToString(instance, 3L, null, null, 2, null, null); expectFacetsErrorInValueToString(instance, 3L, null, null, 2, null, null);
expectFacetsErrorInValueToString(instance, timestamp, null, null, 7, null, null); expectFacetsErrorInValueToString(instance, timestamp, null, null, 7, null, null);

2
lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java
View File

@ -54,6 +54,7 @@ public class EdmTimeOfDayTest extends PrimitiveTypeBaseTest {
assertEquals("04:05:06", instance.valueToString(dateTime, null, null, null, null, null)); assertEquals("04:05:06", instance.valueToString(dateTime, null, null, null, null, null));
dateTime.add(Calendar.MILLISECOND, 42); dateTime.add(Calendar.MILLISECOND, 42);
assertEquals("04:05:06.042", instance.valueToString(dateTime, null, null, null, null, null));
assertEquals("04:05:06.042", instance.valueToString(dateTime, null, null, 3, null, null)); assertEquals("04:05:06.042", instance.valueToString(dateTime, null, null, 3, null, null));
assertEquals("04:05:06.042", instance.valueToString(dateTime, null, null, 4, null, null)); assertEquals("04:05:06.042", instance.valueToString(dateTime, null, null, 4, null, null));
@ -68,7 +69,6 @@ public class EdmTimeOfDayTest extends PrimitiveTypeBaseTest {
assertEquals("05:59:23", instance.valueToString(dateTime2.getTimeInMillis(), null, null, null, null, null)); assertEquals("05:59:23", instance.valueToString(dateTime2.getTimeInMillis(), null, null, null, null, null));
expectFacetsErrorInValueToString(instance, dateTime, null, null, null, null, null);
expectFacetsErrorInValueToString(instance, dateTime, null, null, 2, null, null); expectFacetsErrorInValueToString(instance, dateTime, null, null, 2, null, null);
Timestamp timestamp = new Timestamp(0); Timestamp timestamp = new Timestamp(0);
timestamp.setNanos(42); timestamp.setNanos(42);