Proposal: consolidate JSON schema tests using keys

0.4/examples/valid/custom_type_axes.json → 0.4/examples/image/custom_type_axes.json

@@ -30,5 +30,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "recommended": false
 }

0.4/examples/invalid/duplicate_axes.json → 0.4/examples/image/duplicate_axes.json

@@ -29,5 +29,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid_but_dont_fail/duplicate_axes_name.json → 0.4/examples/image/duplicate_axes_name.json

@@ -29,5 +29,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "recommended": false
 }

0.4/examples/invalid/duplicate_scale.json → 0.4/examples/image/duplicate_scale.json

@@ -36,5 +36,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/empty_transformations.json → 0.4/examples/image/empty_transformations.json

@@ -21,5 +21,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/invalid_axes_count.json → 0.4/examples/image/invalid_axes_count.json

@@ -24,5 +24,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/invalid_axis_type.json → 0.4/examples/image/invalid_axis_type.json

@@ -29,5 +29,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/valid/invalid_axis_units.json → 0.4/examples/image/invalid_axis_units.json

@@ -29,5 +29,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "recommended": false
 }

0.4/examples/invalid/invalid_channels_color.json → 0.4/examples/image/invalid_channels_color.json

@@ -43,6 +43,7 @@
                 }
             }
         ]
-    }
+    },
+    "valid": false
 }
 

0.4/examples/invalid/invalid_channels_window.json → 0.4/examples/image/invalid_channels_window.json

@@ -46,5 +46,6 @@
                 }
             }
         ]
-    }
+    },
+    "valid": false
 }

0.4/examples/invalid/invalid_multiscales_transformations.json → 0.4/examples/image/invalid_multiscales_transformations.json

@@ -35,5 +35,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/invalid_path.json → 0.4/examples/image/invalid_path.json

@@ -29,5 +29,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/invalid_transformation_type.json → 0.4/examples/image/invalid_transformation_type.json

@@ -29,5 +29,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/invalid_version.json → 0.4/examples/image/invalid_version.json

@@ -29,5 +29,6 @@
             ],
             "version": "0.3"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/valid/mismatch_axes_units.json → 0.4/examples/image/mismatch_axes_units.json

@@ -34,5 +34,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "recommended": false
 }

0.4/examples/invalid/missing_axes.json → 0.4/examples/image/missing_axes.json

@@ -17,5 +17,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/missing_axes_name.json → 0.4/examples/image/missing_axes_name.json

@@ -27,5 +27,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/missing_datasets.json → 0.4/examples/image/missing_datasets.json

@@ -15,6 +15,7 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }
 

0.4/examples/valid/missing_name.json → 0.4/examples/image/missing_name.json

@@ -39,5 +39,6 @@
                 }
             ]
         }
-    ]
+    ],
+    "recommended": false
 }

0.4/examples/invalid/missing_path.json → 0.4/examples/image/missing_path.json

@@ -28,5 +28,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/missing_scale.json → 0.4/examples/image/missing_scale.json

@@ -26,5 +26,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/missing_space_axes.json → 0.4/examples/image/missing_space_axes.json

@@ -27,5 +27,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/missing_transformations.json → 0.4/examples/image/missing_transformations.json

@@ -20,5 +20,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/valid/missing_version.json → 0.4/examples/image/missing_version.json

@@ -27,5 +27,6 @@
                 }
             ]
         }
-    ]
+    ],
+    "recommended": false
 }

0.4/examples/invalid/no_axes.json → 0.4/examples/image/no_axes.json

@@ -18,6 +18,7 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }
 

0.4/examples/invalid/no_datasets.json → 0.4/examples/image/no_datasets.json

@@ -16,5 +16,6 @@
             "datasets": [],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/image/no_multiscales.json

@@ -0,0 +1,5 @@
+{
+    "@type": "ngff:Image",
+    "multiscales": [],
+    "valid": false
+}

0.4/examples/invalid/one_space_axes.json → 0.4/examples/image/one_space_axes.json

@@ -32,5 +32,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/too_many_axes.json → 0.4/examples/image/too_many_axes.json

@@ -47,5 +47,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/invalid/too_many_space_axes.json → 0.4/examples/image/too_many_space_axes.json

@@ -37,5 +37,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "valid": false
 }

0.4/examples/valid/untyped_axes.json → 0.4/examples/image/untyped_axes.json

@@ -29,5 +29,6 @@
             ],
             "version": "0.4"
         }
-    ]
+    ],
+    "recommended": false
 }

0.4/index.bs

@@ -296,7 +296,7 @@ Each "multiscales" dictionary SHOULD contain the field "type", which gives the t
 It SHOULD contain the field "metadata", which contains a dictionary with additional information about the downscaling method.
 
 <pre class=include-code>
-path: examples/valid_strict/multiscales_example.json
+path: examples/image/multiscales_example.json
 highlight: json
 </pre>
 

0.4/tests/test_validation.py

@@ -17,57 +17,44 @@
 }
 
 resolver = RefResolver.from_schema(image_schema, store=schema_store)
-validator = Draft202012Validator(image_schema, resolver=resolver)
-strict_validator = Draft202012Validator(strict_image_schema, resolver=resolver)
 
-valid_strict_files = list(glob.glob("examples/valid_strict/*.json"))
-valid_files = list(glob.glob("examples/valid/*.json"))
-invalid_files = list(glob.glob("examples/invalid/*.json"))
-invalid_but_dont_fail_files = list(
-    glob.glob("examples/invalid_but_dont_fail/*.json"))
+# Dictionary of validators
+validators = {}
+strict_validators = {}
+validators["multiscales"] = Draft202012Validator(
+    image_schema, resolver=resolver)
+strict_validators["multiscales"] = Draft202012Validator(
+    strict_image_schema, resolver=resolver)
+
+
+json_files = list(glob.glob("examples/**/*.json"))
 
 
 def ids(files):
     return [str(x).split("/")[-1][0:-5] for x in files]
 
+def get_spec(jsondata):
+    for s in ["multiscales"]:
+        if s in jsondata.keys():
+            return s
+    raise Exception("No specification found %s" % jsondata.keys())
+
 
-@pytest.mark.parametrize(
-    "testfile", valid_strict_files, ids=ids(valid_strict_files))
-def test_valid_strict(testfile):
-    with open(testfile) as f:
+@pytest.mark.parametrize("json_file", json_files, ids=ids(json_files))
+def test_compliance(json_file):
+    with open(json_file) as f:
         data = ''.join(line for line in f if not line.lstrip().startswith('//'))
         jsondata = json.loads(data)
-        validator.validate(jsondata)
-        strict_validator.validate(jsondata)
-
-
-@pytest.mark.parametrize("testfile", valid_files, ids=ids(valid_files))
-def test_valid_files(testfile):
-    with open(testfile) as f:
-        json_file = json.load(f)
-        validator.validate(json_file)
-        with pytest.raises(ValidationError):
-            strict_validator.validate(json_file)
-
 
-@pytest.mark.parametrize("testfile", invalid_files, ids=ids(invalid_files))
-def test_invalid(testfile):
-    with open(testfile) as f:
-        json_file = json.load(f)
-        with pytest.raises(ValidationError):
-            validator.validate(json_file)
+    spec = get_spec(jsondata)
+    if jsondata.get("valid", True):
+        validators[spec].validate(jsondata)
+    else:
         with pytest.raises(ValidationError):
-            strict_validator.validate(json_file)
+            validators[spec].validate(jsondata)
 
-
-@pytest.mark.xfail
-@pytest.mark.parametrize(
-    "testfile", invalid_but_dont_fail_files,
-    ids=ids(invalid_but_dont_fail_files))
-def test_invalid_but_dontfail(testfile):
-    with open(testfile) as f:
-        json_file = json.load(f)
-        with pytest.raises(ValidationError):
-            validator.validate(json_file)
+    if jsondata.get("recommended", True) and jsondata.get("valid", True):
+        strict_validators[spec].validate(jsondata)
+    else:
         with pytest.raises(ValidationError):
-            strict_validator.validate(json_file)
+            strict_validators[spec].validate(jsondata)