Merge 56ca4a2 into d4d376e

IIIF · Aug 6, 2021 · 1debde5 · 1debde5
2 parents d4d376e + 56ca4a2
commit 1debde5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/schema/iiif_3_0.json b/schema/iiif_3_0.json
@@ -421,8 +421,8 @@
                                 }
                             ]
                         },
-                        "id": {},
-                        "label": {},
+                        "id": { "$ref": "#/types/id" },
+                        "label": {"$ref": "#/types/lngString" },
                         "type": {
                             "type": "string",
                             "pattern": "^Manifest"
@@ -467,7 +467,8 @@
                                 "$ref": "#/classes/annotationPage"
                             }
                         }
-                    }
+                    },
+                    "required": ["id", "type", "label"]
                 }
             ]
         },

diff --git a/setup.py b/setup.py
@@ -59,7 +59,8 @@ def run(self):
             "zipp==1.2.0",
             "configparser==4.0.2",
             "pyld==1.0.5",
-            "pyrsistent==0.16.0"
+            "pyrsistent==0.16.0",
+            "decorator==4.4.2"
         ],
     },
     test_suite="tests",

diff --git a/tests/test_validator.py b/tests/test_validator.py
@@ -291,9 +291,20 @@ def test_lang_rights(self):
         response = self.helperRunValidation(v, filename)
         self.helperTestValidationErrors(filename, response, errorPaths)
 
+    def formatErrors(self, errorList):
+        response = ''
+        for error in errorList:
+            response += "Title: {}\n".format(error['title'])
+            response += "Path: {}\n".format(error['path'])
+            response += "Context: {}\n".format(error['path'])
+            response += "****************************\n"
+
+        return response
+
     def helperTestValidationErrors(self, filename, response, errorPaths):       
         self.assertEqual(response['okay'], 0, 'Expected {} to fail validation but it past.'.format(filename))
-        self.assertEqual(len(response['errorList']), len(errorPaths), 'Expected {} validation errors but found {} for file {}\n{}'.format(len(errorPaths), len(response['errorList']), filename, response['errorList']))
+        self.assertEqual(len(response['errorList']), len(errorPaths), 'Expected {} validation errors but found {} for file {}\n{}'.format(len(errorPaths), len(response['errorList']), filename, self.formatErrors(response['errorList'])))
+
 
         for error in response['errorList']:
             foundPath = False