Merge pull request #80 from entur/fix/missing-required-file-counts-as…

…-error fix: missing required files should count as an error
entur · Apr 25, 2024 · dc21dd3 · dc21dd3
2 parents 1bbd89f + 19b2f0a
commit dc21dd3
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 1 deletion.
diff --git a/src/main/java/org/entur/gbfs/validation/validator/FileValidator.java b/src/main/java/org/entur/gbfs/validation/validator/FileValidator.java
@@ -110,6 +110,9 @@ public void validateMissingFile(FileValidationResult fvr) {
             fvr.setVersion(version.getVersionString());
             fvr.setSchema(version.getSchema(fvr.getFile()).toString());
             fvr.setRequired(version.isFileRequired(fvr.getFile()));
+            if (version.isFileRequired(fvr.getFile())) {
+                fvr.setErrorsCount(1);
+            }
         }
     }
 }
diff --git a/src/test/java/org/entur/gbfs/validation/validator/GbfsJsonValidatorTest.java b/src/test/java/org/entur/gbfs/validation/validator/GbfsJsonValidatorTest.java
@@ -33,7 +33,10 @@ void testEmptyDeliveryMapValidation() {
         GbfsJsonValidator validator = new GbfsJsonValidator();
         Map<String, InputStream> deliveryMap = new HashMap<>();
         ValidationResult result = validator.validate(deliveryMap);
-        Assertions.assertEquals(0, result.getSummary().getErrorsCount());
+
+        // The expected error count is 2, because there are two required files
+        // missing in an empty delivery, gbfs.json, and system_information.json
+        Assertions.assertEquals(2, result.getSummary().getErrorsCount());
     }
 
     @Test
@@ -42,6 +45,7 @@ void testSuccessfulV1_0Validation() {
 
         Map<String, InputStream> deliveryMap = new HashMap<>();
         deliveryMap.put("gbfs", getFixture("fixtures/v1.0/gbfs.json"));
+        deliveryMap.put("system_information", getFixture("fixtures/v1.0/system_information.json"));
         deliveryMap.put("system_hours", getFixture("fixtures/v1.0/system_hours.json"));
 
         ValidationResult result = validator.validate(deliveryMap);
@@ -59,6 +63,7 @@ void testSuccessfulV1_1Validation() {
         Map<String, InputStream> deliveryMap = new HashMap<>();
         deliveryMap.put("gbfs", getFixture("fixtures/v1.1/gbfs.json"));
         deliveryMap.put("gbfs_versions", getFixture("fixtures/v1.1/gbfs_versions.json"));
+        deliveryMap.put("system_information", getFixture("fixtures/v1.1/system_information.json"));
         deliveryMap.put("system_hours", getFixture("fixtures/v1.1/system_hours.json"));
 
         ValidationResult result = validator.validate(deliveryMap);
@@ -76,6 +81,7 @@ void testSuccessfulV2_0Validation() {
         Map<String, InputStream> deliveryMap = new HashMap<>();
         deliveryMap.put("gbfs", getFixture("fixtures/v2.0/gbfs.json"));
         deliveryMap.put("gbfs_versions", getFixture("fixtures/v2.0/gbfs_versions.json"));
+        deliveryMap.put("system_information", getFixture("fixtures/v2.0/system_information.json"));
         deliveryMap.put("system_hours", getFixture("fixtures/v2.0/system_hours.json"));
 
         ValidationResult result = validator.validate(deliveryMap);
@@ -214,6 +220,8 @@ void testMissingRequiredFile() {
 
         Assertions.assertTrue(result.getFiles().get("system_information").isRequired());
         Assertions.assertFalse(result.getFiles().get("system_information").isExists());
+
+        Assertions.assertEquals(1, result.getSummary().getErrorsCount());
     }
 
     @Test
@@ -235,11 +243,14 @@ void testMissingNotRequiredFile() {
 
         Map<String, InputStream> deliveryMap = new HashMap<>();
         deliveryMap.put("gbfs", getFixture("fixtures/v2.2/gbfs.json"));
+        deliveryMap.put("system_information", getFixture("fixtures/v2.2/system_information.json"));
 
         ValidationResult result = validator.validate(deliveryMap);
 
         Assertions.assertFalse(result.getFiles().get("vehicle_types").isRequired());
         Assertions.assertFalse(result.getFiles().get("vehicle_types").isExists());
+
+        Assertions.assertEquals(0, result.getSummary().getErrorsCount());
     }
 
     @Test

diff --git a/src/test/resources/fixtures/v1.0/system_information.json b/src/test/resources/fixtures/v1.0/system_information.json
@@ -0,0 +1,11 @@
+{
+  "last_updated":1611598155,
+  "ttl":1800,
+  "version": "1.0",
+  "data":{
+    "system_id":"exampleride",
+    "language":"en",
+    "name":"Example Ride",
+    "timezone":"America/Chicago"
+  }
+}
diff --git a/src/test/resources/fixtures/v1.1/system_information.json b/src/test/resources/fixtures/v1.1/system_information.json
@@ -0,0 +1,11 @@
+{
+  "last_updated":1611598155,
+  "ttl":1800,
+  "version": "1.1",
+  "data":{
+    "system_id":"exampleride",
+    "language":"en",
+    "name":"Example Ride",
+    "timezone":"America/Chicago"
+  }
+}
diff --git a/src/test/resources/fixtures/v2.0/system_information.json b/src/test/resources/fixtures/v2.0/system_information.json
@@ -0,0 +1,11 @@
+{
+  "last_updated":1611598155,
+  "ttl":1800,
+  "version": "2.0",
+  "data":{
+    "system_id":"exampleride",
+    "language":"en",
+    "name":"Example Ride",
+    "timezone":"America/Chicago"
+  }
+}