Merge pull request #156 from networknt/fix/#155-date-time-validation

Fix 24-hour validation error
networknt · May 30, 2019 · d75550c · d75550c
2 parents 93a698b + 4829f9d
commit d75550c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/main/java/com/networknt/schema/DateTimeValidator.java b/src/main/java/com/networknt/schema/DateTimeValidator.java
@@ -103,7 +103,7 @@ private boolean isLegalDateTime(String string) {
             minute = matcher.group(6);
             second = matcher.group(7);
             dateTime.append('T').append(hour).append(':').append(minute).append(':').append(second);
-            pattern.append("'T'hh:mm:ss");
+            pattern.append("'T'HH:mm:ss");
             if (matcher.group(8) != null) {
                 // Normalize milliseconds to 3-length digit
                 milliseconds = matcher.group(8);

diff --git a/src/test/resources/tests/optional/format.json b/src/test/resources/tests/optional/format.json
@@ -8,6 +8,21 @@
                 "data": "1963-06-19T08:30:06.283185Z",
                 "valid": true
             },
+            {
+                "description": "a valid date-time string",
+                "data": "2019-07-24T00:00:01-04:00",
+                "valid": true
+            },
+            {
+                "description": "an invalid date-time string",
+                "data": "2019-07-24T24:00:01-04:00",
+                "valid": false
+            },
+            {
+                "description": "an invalid date-time string",
+                "data": "2019-07-24T25/:00:01-04:00",
+                "valid": false
+            },
             {
                 "description": "an invalid date-time string",
                 "data": "06/19/1963 08:30:06 PST",
@@ -59,9 +74,9 @@
                 "valid": false
             },
             {
-                "description": "an invalid date-time string",
+                "description": "a valid date-time string",
                 "data": "2019-02-28T13:30:06Z",
-                "valid": false
+                "valid": true
             },
             {
                 "description": "an invalid date-time string",