diff --git a/ontology/uco/observable/observable.ttl b/ontology/uco/observable/observable.ttl index 4ca0e54c..050119f7 100644 --- a/ontology/uco/observable/observable.ttl +++ b/ontology/uco/observable/observable.ttl @@ -3203,12 +3203,11 @@ observable:File observable:File-disjointWith-URL-shape a sh:NodeShape ; - sh:message "observable:File and observable:URL are disjoint classes. Assigning both types to a single node will be an error in UCO 2.0.0."@en ; + sh:message "observable:File and observable:URL are disjoint classes."@en ; sh:not [ a sh:NodeShape ; sh:class observable:URL ; ] ; - sh:severity sh:Warning ; sh:targetClass observable:File ; . diff --git a/tests/examples/Makefile b/tests/examples/Makefile index afd60a6d..0bca4ba6 100644 --- a/tests/examples/Makefile +++ b/tests/examples/Makefile @@ -27,7 +27,7 @@ all: \ configuration_setting_XFAIL_validation.ttl \ database_records_PASS_validation.ttl \ database_records_XFAIL_validation.ttl \ - file_url_PASS_validation.ttl \ + file_url_XFAIL_validation.ttl \ has_facet_inverse_functional_PASS_validation.ttl \ has_facet_inverse_functional_XFAIL_validation.ttl \ hash_PASS_validation.ttl \ @@ -97,7 +97,7 @@ check: \ configuration_setting_XFAIL_validation.ttl \ database_records_PASS_validation.ttl \ database_records_XFAIL_validation.ttl \ - file_url_PASS_validation.ttl \ + file_url_XFAIL_validation.ttl \ has_facet_inverse_functional_PASS_validation.ttl \ has_facet_inverse_functional_XFAIL_validation.ttl \ hash_PASS_validation.ttl \ diff --git a/tests/examples/file_url_PASS.json b/tests/examples/file_url_XFAIL.json similarity index 100% rename from tests/examples/file_url_PASS.json rename to tests/examples/file_url_XFAIL.json diff --git a/tests/examples/file_url_PASS_validation.ttl b/tests/examples/file_url_XFAIL_validation.ttl similarity index 82% rename from tests/examples/file_url_PASS_validation.ttl rename to tests/examples/file_url_XFAIL_validation.ttl index 2a4b22ec..26f322a8 100644 --- a/tests/examples/file_url_PASS_validation.ttl +++ b/tests/examples/file_url_XFAIL_validation.ttl @@ -7,12 +7,12 @@ [] a sh:ValidationReport ; - sh:conforms "true"^^xsd:boolean ; + sh:conforms "false"^^xsd:boolean ; sh:result [ a sh:ValidationResult ; sh:focusNode ; - sh:resultMessage "observable:File and observable:URL are disjoint classes. Assigning both types to a single node will be an error in UCO 2.0.0."@en ; - sh:resultSeverity sh:Warning ; + sh:resultMessage "observable:File and observable:URL are disjoint classes."@en ; + sh:resultSeverity sh:Violation ; sh:sourceConstraintComponent sh:NotConstraintComponent ; sh:sourceShape observable:File-disjointWith-URL-shape ; sh:value ; diff --git a/tests/examples/test_validation.py b/tests/examples/test_validation.py index 3803a4d1..aa050259 100644 --- a/tests/examples/test_validation.py +++ b/tests/examples/test_validation.py @@ -207,13 +207,10 @@ def test_database_records_XFAIL() -> None: } ) -def test_file_url_PASS_validation() -> None: +def test_file_url_XFAIL_validation() -> None: confirm_validation_results( - "file_url_PASS_validation.ttl", - True, - expected_focus_node_severities={ - ("http://example.org/kb/Thing-23a38d67-3432-458b-9651-955b418c2a77", str(NS_SH.Warning)), - } + "file_url_XFAIL_validation.ttl", + False, ) def test_has_facet_inverse_functional_PASS() -> None: