Improve test verbosity

tests/validate_animations.test.js

@@ -12,16 +12,32 @@ const ajv = new Ajv({
 });
 const validate = ajv.compile(schema);
 
+expect.extend({
+    toBeValid(data) {
+
+        if ( validate(data) )
+        {
+            return {
+                message: () => "data NOT be valid",
+                pass: true
+            };
+        }
+
+        return {
+            message: () => "Invalid data: " + JSON.stringify(validate.errors, null, 4),
+            pass: false
+        };
+    }
+});
+
 describe('run schema validation', () => {
     describe('example animations', () => {
         const exampleFiles = fs.readdirSync(EXAMPLES_DIR).map(file => EXAMPLES_DIR + file);
 
         exampleFiles.forEach((file) => {
             test(file, () => {
                 const animation = fs.readFileSync(file, 'utf8');
-                const valid = validate(JSON.parse(animation));
-
-                expect(valid).toBe(true);
+                expect(JSON.parse(animation)).toBeValid();
             });
         });
     });
@@ -33,7 +49,7 @@ describe('run schema validation', () => {
             test(file, () => {
                 const animation = fs.readFileSync(file, 'utf8');
                 const valid = validate(JSON.parse(animation));
-    
+
                 expect(valid).toBe(true);
             });
         });
@@ -46,7 +62,7 @@ describe('run schema validation', () => {
             test(file, () => {
                 const animation = fs.readFileSync(file, 'utf8');
                 const valid = validate(JSON.parse(animation));
-    
+
                 expect(valid).toBe(false);
             });
         });

tools/schema-merge.py

@@ -42,7 +42,7 @@ def add_vals_to_unknown_object(
 
     for ele in objects.concrete:
         type = ele.properties.get('ty', None)
-        if type is not None and type.const:
+        if type is not None and type.const is not None:
             types.append(type.const)
 
     unknown_type_dict["properties"]["ty"]["not"]["enum"] = types