Merge pull request #588 from ucoProject/Feature-Issue-586-2.0.0

Issue 586: Enforce prior disjointedness declarations in `core:` and `types:`
ucoProject · Jun 17, 2024 · 2661f7a · 2661f7a
2 parents 51da525 + d58deef
commit 2661f7a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/ontology/uco/core/core.ttl b/ontology/uco/core/core.ttl
@@ -379,12 +379,11 @@ core:UcoInherentCharacterizationThing
 
 core:UcoInherentCharacterizationThing-disjointWith-UcoObject-shape
 	a sh:NodeShape ;
-	sh:message "observable:UcoInherentCharacterizationThing and observable:UcoObject are disjoint classes.  Assigning both types to a single node will be an error in UCO 2.0.0."@en ;
+	sh:message "core:UcoInherentCharacterizationThing and core:UcoObject are disjoint classes."@en ;
 	sh:not [
 		a sh:NodeShape ;
 		sh:class core:UcoObject ;
 	] ;
-	sh:severity sh:Warning ;
 	sh:targetClass core:UcoInherentCharacterizationThing ;
 	.
 

diff --git a/ontology/uco/types/types.ttl b/ontology/uco/types/types.ttl
@@ -197,12 +197,11 @@ types:Thread
 
 types:Thread-disjointWith-co-List-shape
 	a sh:NodeShape ;
-	sh:message "types:Thread and co:List are disjoint classes.  Assigning both types to a single node will be an error in UCO 2.0.0."@en ;
+	sh:message "types:Thread and co:List are disjoint classes."@en ;
 	sh:not [
 		a sh:NodeShape ;
 		sh:class co:List ;
 	] ;
-	sh:severity sh:Warning ;
 	sh:targetClass types:Thread ;
 	.
 
@@ -226,12 +225,11 @@ types:ThreadItem
 
 types:ThreadItem-disjointWith-co-ListItem-shape
 	a sh:NodeShape ;
-	sh:message "types:ThreadItem and co:ListItem are disjoint classes.  Assigning both types to a single node will be an error in UCO 2.0.0."@en ;
+	sh:message "types:ThreadItem and co:ListItem are disjoint classes."@en ;
 	sh:not [
 		a sh:NodeShape ;
 		sh:class co:ListItem ;
 	] ;
-	sh:severity sh:Warning ;
 	sh:targetClass types:ThreadItem ;
 	.
 

diff --git a/tests/examples/Makefile b/tests/examples/Makefile
@@ -28,7 +28,7 @@ all: \
   configuration_setting_XFAIL_validation.ttl \
   database_records_PASS_validation.ttl \
   database_records_XFAIL_validation.ttl \
-  disjointedness_PASS_validation.ttl \
+  disjointedness_XFAIL_validation.ttl \
   event_XFAIL_validation.ttl \
   file_url_XFAIL_validation.ttl \
   has_facet_inverse_functional_PASS_validation.ttl \
@@ -101,7 +101,7 @@ check: \
   configuration_setting_XFAIL_validation.ttl \
   database_records_PASS_validation.ttl \
   database_records_XFAIL_validation.ttl \
-  disjointedness_PASS_validation.ttl \
+  disjointedness_XFAIL_validation.ttl \
   event_XFAIL_validation.ttl \
   file_url_XFAIL_validation.ttl \
   has_facet_inverse_functional_PASS_validation.ttl \

diff --git a/tests/examples/disjointedness_PASS.json → tests/examples/disjointedness_XFAIL.json b/tests/examples/disjointedness_PASS.json → tests/examples/disjointedness_XFAIL.json
@@ -12,7 +12,7 @@
                 "observable:File",
                 "observable:FileFacet"
             ],
-            "rdfs:comment": "This node will trigger a violation in UCO 2.0.0 for designating itself a File and FileFacet, which are disjoint due to File being a (eventual) subclass of UcoObject, and FileFacet being a (eventual) subclass of UcoInherentCharacterizationThing."
+            "rdfs:comment": "This node will trigger a violation for designating itself a File and FileFacet, which are disjoint due to File being a (eventual) subclass of UcoObject, and FileFacet being a (eventual) subclass of UcoInherentCharacterizationThing."
         }
     ]
 }
diff --git a/...amples/disjointedness_PASS_validation.ttl → ...mples/disjointedness_XFAIL_validation.ttl b/...amples/disjointedness_PASS_validation.ttl → ...mples/disjointedness_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 <http://example.org/kb/File-33a25932-3a1a-4828-a90f-d31818b495ce> ;
-		sh:resultMessage "observable:UcoInherentCharacterizationThing and observable:UcoObject 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 "core:UcoInherentCharacterizationThing and core:UcoObject are disjoint classes."@en ;
+		sh:resultSeverity sh:Violation ;
 		sh:sourceConstraintComponent sh:NotConstraintComponent ;
 		sh:sourceShape core:UcoInherentCharacterizationThing-disjointWith-UcoObject-shape ;
 		sh:value <http://example.org/kb/File-33a25932-3a1a-4828-a90f-d31818b495ce> ;

diff --git a/tests/examples/test_validation.py b/tests/examples/test_validation.py
@@ -216,12 +216,12 @@ def test_database_records_XFAIL() -> None:
       }
     )
 
-def test_disjointedness_PASS() -> None:
+def test_disjointedness_XFAIL() -> None:
     confirm_validation_results(
-      "disjointedness_PASS_validation.ttl",
-      True,
+      "disjointedness_XFAIL_validation.ttl",
+      False,
       expected_focus_node_severities={
-        ("http://example.org/kb/File-33a25932-3a1a-4828-a90f-d31818b495ce", str(NS_SH.Warning)),
+        ("http://example.org/kb/File-33a25932-3a1a-4828-a90f-d31818b495ce", str(NS_SH.Violation)),
       }
     )