GTFS types validation. time

Fabrice V · Fabrice V · commit a306d2dde75f · 2019-12-02T17:01:43.000-05:00
-add validation code
  -specified format HH:MM:SS or H:MM:SS
-add unit testing of method
diff --git a/src/main/java/org/mobilitydata/gtfsvalidator/rules/ValidationRules.java b/src/main/java/org/mobilitydata/gtfsvalidator/rules/ValidationRules.java
@@ -75,4 +75,8 @@ public class ValidationRules {
     public static final ValidationRule E011 = new ValidationRule("E011", "ERROR", "Invalid field value",
             "A field of type URL must use http or https scheme and conform to RFC2396",
             "is not a valid URL");
+
+    public static final ValidationRule E012 = new ValidationRule("E012", "ERROR", "Invalid field value",
+            "A field of type time can't be parsed",
+            "is not in valid HH:MM:SS or H:MM:SS format");
 }
diff --git a/src/main/java/org/mobilitydata/gtfsvalidator/util/GTFSTypeValidationUtils.java b/src/main/java/org/mobilitydata/gtfsvalidator/util/GTFSTypeValidationUtils.java
@@ -232,6 +232,23 @@ String parseAndValidateTimeZone(@NotNull String fieldName,
         return rawValue;
     }
 
+    public static @Nullable
+    String validateTime(@NotNull String fieldName,
+                        @Nullable String rawValue,
+                        @NotNull List<OccurrenceModel>outList) {
+
+        if(Strings.isNullOrEmpty(rawValue)) {
+            return null;
+        }
+
+        if (!TIME_PATTERN.matcher(rawValue).matches()) {
+            RuleUtils.addOccurrence(E012, fieldName, outList);
+            return null;
+        }
+
+        return rawValue;
+    }
+
 
     private static @Nullable
     String validateString(@NotNull String fieldName,
@@ -263,5 +280,6 @@ private static boolean isPrintableAscii(char ch) {
         return ch >= 32 && ch < 127;
     }
     private static final Pattern COLOR_6_DIGITS_HEXADECIMAL_PATTERN = Pattern.compile("^#[0-9A-Fa-f]{6}$");
+    private static final Pattern TIME_PATTERN = Pattern.compile("([0-9][0-9]|[0-9]):[0-5][0-9]:[0-5][0-9]");
     private static final String[] VALID_URL_SCHEMES = { "http", "https" };
 }
diff --git a/src/test/java/org/mobilitydata/gtfsvalidator/util/GTFSTypeValidationUtilsTest.java b/src/test/java/org/mobilitydata/gtfsvalidator/util/GTFSTypeValidationUtilsTest.java
@@ -773,6 +773,54 @@ void parseAndValidateColor() {
         assertEquals("E007", error.getRule().getErrorId());
     }
 
+    @Test
+    public void validateTime() {
+
+        List<OccurrenceModel> testList = new ArrayList<>();
+
+        // typical case
+        String returned = GTFSTypeValidationUtils.validateTime(fieldName,
+                "99:59:59",
+                testList);
+
+        assertEquals("99:59:59", returned);
+        assertEquals(0, testList.size());
+
+        // typical case
+        returned = GTFSTypeValidationUtils.validateTime(fieldName,
+                "9:59:59",
+                testList);
+
+        assertEquals("9:59:59", returned);
+        assertEquals(0, testList.size());
+
+        // null
+        returned = GTFSTypeValidationUtils.validateTime(fieldName,
+                null,
+                testList);
+        assertNull(returned);
+        assertEquals(0, testList.size());
+
+        // empty
+        returned = GTFSTypeValidationUtils.validateTime(fieldName,
+                "",
+                testList);
+
+        assertNull(returned);
+        assertEquals(0, testList.size());
+
+        // any non parsable
+        returned = GTFSTypeValidationUtils.validateTime(fieldName,
+                "abc",
+                testList);
+        assertNull(returned);
+        assertEquals(1, testList.size());
+        OccurrenceModel error = testList.get(0);
+        assertEquals(fieldName, error.getPrefix());
+        assertEquals("E012", error.getRule().getErrorId());
+
+    }
+
     @Test
     public void parseAndValidateTimeZone() {
 

Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,8 @@ public class ValidationRules {`
`75`	`75`	`public static final ValidationRule E011 = new ValidationRule("E011", "ERROR", "Invalid field value",`
`76`	`76`	`"A field of type URL must use http or https scheme and conform to RFC2396",`
`77`	`77`	`"is not a valid URL");`
	`78`	`+`
	`79`	`+ public static final ValidationRule E012 = new ValidationRule("E012", "ERROR", "Invalid field value",`
	`80`	`+ "A field of type time can't be parsed",`
	`81`	`+ "is not in valid HH:MM:SS or H:MM:SS format");`
`78`	`82`	`}`