Date and Time formats are now strict.

Dates of the right format that make no sense (such as 2012-07-44) now do not validate.
Times of the right format that make no sense (such as 13:44:75) now do not validate.

Author: seanjreilly

src/main/java/uk/co/o2/json/schema/SimpleTypeSchema.java

@@ -256,6 +256,7 @@ public boolean isCompatibleType(SimpleType type) {
             public boolean isValid(JsonNode node) {
                 String value = SimpleType.STRING.getValue(node).toString();
                 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                format.setLenient(false);
                 ParsePosition position = new ParsePosition(0);
 
                 Date result = format.parse(value, position);
@@ -273,6 +274,7 @@ public boolean isCompatibleType(SimpleType type) {
             public boolean isValid(JsonNode node) {
                 String value = SimpleType.STRING.getValue(node).toString();
                 SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss");
+                format.setLenient(false);
                 ParsePosition position = new ParsePosition(0);
 
                 Date result = format.parse(value, position);

src/test/java/uk/co/o2/json/schema/SimpleTypeSchemaTest.java

@@ -124,7 +124,7 @@ public void validate_shouldNotReturnAnErrorMessage_givenAFormatOfDateTimeAndAStr
 
     @Test
 	public void validate_shouldReturnAnErrorMessage_givenAFormatOfDateTimeAndAStringValueThatIsNotAValidIso8601DateTime() throws Exception {
-        String invalidDateTime = "2011-May-10T165:11:17z";
+        String invalidDateTime = "2011-05-44T11:11:17Z";
         SimpleTypeSchema schema = new SimpleTypeSchema();
 		schema.setType(SimpleType.STRING);
 		schema.setFormat("date-time");
@@ -138,6 +138,22 @@ public void validate_shouldReturnAnErrorMessage_givenAFormatOfDateTimeAndAString
         assertTrue(result.get(0).getMessage().contains("date-time"));
     }
 
+    @Test
+    public void validate_shouldReturnAnErrorMessage_givenAFormatOfDateTimeAndAStringValueThatIsAnAlmostValidIso8601DateTime() throws Exception {
+        String invalidDateTime = "2011-May-10T165:11:17z";
+        SimpleTypeSchema schema = new SimpleTypeSchema();
+        schema.setType(SimpleType.STRING);
+        schema.setFormat("date-time");
+        JsonNode nodeToValidate = new TextNode(invalidDateTime);
+
+        List<ErrorMessage> result = schema.validate(nodeToValidate);
+
+        assertEquals(1, result.size());
+        assertEquals("", result.get(0).getLocation());
+        assertTrue(result.get(0).getMessage().contains(invalidDateTime));
+        assertTrue(result.get(0).getMessage().contains("date-time"));
+    }
+
     @Test
 	public void setFormat_shouldThrowAnException_whenTypeIsNotStringAndFormatIsDateTime() throws Exception {
         SimpleTypeSchema schema = new SimpleTypeSchema();
@@ -178,6 +194,22 @@ public void validate_shouldReturnAnErrorMessage_givenAFormatOfDateAndAStringValu
         assertTrue(result.get(0).getMessage().contains("date"));
     }
 
+    @Test
+    public void validate_shouldReturnAnErrorMessage_givenAFormatOfDateAndAStringValueThatIsAlmostAValidDate() throws Exception {
+        String invalidDate = "2011-05-44";
+        SimpleTypeSchema schema = new SimpleTypeSchema();
+        schema.setType(SimpleType.STRING);
+        schema.setFormat("date");
+        JsonNode nodeToValidate = new TextNode(invalidDate);
+
+        List<ErrorMessage> result = schema.validate(nodeToValidate);
+
+        assertEquals(1, result.size());
+        assertEquals("", result.get(0).getLocation());
+        assertTrue( result.get(0).getMessage().contains(invalidDate));
+        assertTrue(result.get(0).getMessage().contains("date"));
+    }
+
     @Test
 	public void validate_shouldReturnAnErrorMessage_givenAFormatOfDateAndAStringValueThatIsAFullDateTime() throws Exception {
         String invalidDate = "2011-05-10T11:47:16Z";
@@ -234,6 +266,22 @@ public void validate_shouldReturnAnErrorMessage_givenAFormatOfTimeAndAStringValu
         assertTrue(result.get(0).getMessage().contains("time"));
     }
 
+    @Test
+    public void validate_shouldReturnAnErrorMessage_givenAFormatOfTimeAndAStringValueThatIsAlmostAValidTime() throws Exception {
+        String invalidTime = "13:75:47";
+        SimpleTypeSchema schema = new SimpleTypeSchema();
+        schema.setType(SimpleType.STRING);
+        schema.setFormat("time");
+        JsonNode nodeToValidate = new TextNode(invalidTime);
+
+        List<ErrorMessage> result = schema.validate(nodeToValidate);
+
+        assertEquals(1, result.size());
+        assertEquals("", result.get(0).getLocation());
+        assertTrue(result.get(0).getMessage().contains(invalidTime));
+        assertTrue(result.get(0).getMessage().contains("time"));
+    }
+
     @Test
 	public void validate_shouldReturnAnErrorMessage_givenAFormatOfTimeAndAStringValueThatHasExtraInformationAfterTheValidTime() throws Exception {
         String invalidTime = "11:47:16-blah";