aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/com/fasterxml/jackson/databind/util
diff options
context:
space:
mode:
authorSteve Sanbeg <sanbeg@yahoo-inc.com>2014-06-09 17:15:33 -0400
committerSteve Sanbeg <sanbeg@yahoo-inc.com>2014-06-09 17:15:33 -0400
commitb45f9e7dd7b1823fb3b0d66493ac3d53ceaccbe8 (patch)
treef42e7dcacf48e7dbaf62f72e3ee42f6f66ec5d51 /src/test/java/com/fasterxml/jackson/databind/util
parenteefb6902b954ba246ce3c31142a99587af55a867 (diff)
downloadjackson-databind-b45f9e7dd7b1823fb3b0d66493ac3d53ceaccbe8.tar.gz
Make date parsing error behavior consistent with Java & its own inherited documentation
Diffstat (limited to 'src/test/java/com/fasterxml/jackson/databind/util')
-rw-r--r--src/test/java/com/fasterxml/jackson/databind/util/ISO8601DateFormatTest.java9
-rw-r--r--src/test/java/com/fasterxml/jackson/databind/util/ISO8601UtilsTest.java10
2 files changed, 14 insertions, 5 deletions
diff --git a/src/test/java/com/fasterxml/jackson/databind/util/ISO8601DateFormatTest.java b/src/test/java/com/fasterxml/jackson/databind/util/ISO8601DateFormatTest.java
index 5b98e2a3e..670ae80ab 100644
--- a/src/test/java/com/fasterxml/jackson/databind/util/ISO8601DateFormatTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/util/ISO8601DateFormatTest.java
@@ -35,6 +35,15 @@ public class ISO8601DateFormatTest extends BaseMapTest
assertEquals(date, result);
}
+ public void testPartialParse() throws Exception {
+ java.text.ParsePosition pos = new java.text.ParsePosition(0);
+ String timestamp = "2007-08-13T19:51:23Z";
+ Date result = df.parse(timestamp + "hello", pos);
+
+ assertEquals(date, result);
+ assertEquals(timestamp.length(), pos.getIndex());
+ }
+
public void testCloneObject() throws Exception {
DateFormat clone = (DateFormat)df.clone();
assertSame(df, clone);
diff --git a/src/test/java/com/fasterxml/jackson/databind/util/ISO8601UtilsTest.java b/src/test/java/com/fasterxml/jackson/databind/util/ISO8601UtilsTest.java
index 9a4275f59..21b9046d3 100644
--- a/src/test/java/com/fasterxml/jackson/databind/util/ISO8601UtilsTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/util/ISO8601UtilsTest.java
@@ -1,7 +1,7 @@
package com.fasterxml.jackson.databind.util;
import java.util.*;
-
+import java.text.ParsePosition;
import com.fasterxml.jackson.databind.BaseMapTest;
import com.fasterxml.jackson.databind.util.ISO8601Utils;
@@ -47,14 +47,14 @@ public class ISO8601UtilsTest extends BaseMapTest
assertEquals("2007-08-13T19:51:23.789Z", result);
}
- public void testParse() {
- Date d = ISO8601Utils.parse("2007-08-13T19:51:23.789Z");
+ public void testParse() throws java.text.ParseException {
+ Date d = ISO8601Utils.parse("2007-08-13T19:51:23.789Z", new ParsePosition(0));
assertEquals(date, d);
- d = ISO8601Utils.parse("2007-08-13T19:51:23Z");
+ d = ISO8601Utils.parse("2007-08-13T19:51:23Z", new ParsePosition(0));
assertEquals(dateZeroMillis, d);
- d = ISO8601Utils.parse("2007-08-13T21:51:23.789+02:00");
+ d = ISO8601Utils.parse("2007-08-13T21:51:23.789+02:00", new ParsePosition(0));
assertEquals(date, d);
}