Merge branch 'unstable' into unstable-2.0.0

ucoProject · Nov 22, 2023 · bf94471 · bf94471
2 parents 5304a75 + 06e5d9d
commit bf94471
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 26 deletions.
diff --git a/ontology/uco/action/action.ttl b/ontology/uco/action/action.ttl
@@ -153,14 +153,10 @@ action:Action
 
 action:Action-disjointWith-Event-shape
 	a sh:NodeShape ;
-	sh:message "action:Action and core:event are disjoint classes."@en ;
-	sh:node [
+	sh:message "action:Action and core:Event are disjoint classes."@en ;
+	sh:not [
 		a sh:NodeShape ;
-		rdfs:comment "This blank node is provided to avoid a SHACL multiple-inheritance issue."@en ;
-		sh:not [
-			a sh:NodeShape ;
-			sh:class core:Event ;
-		] ;
+		sh:class core:Event ;
 	] ;
 	sh:targetClass action:Action ;
 	.

diff --git a/tests/examples/event_XFAIL_validation.ttl b/tests/examples/event_XFAIL_validation.ttl
@@ -1,5 +1,4 @@
 @prefix action: <https://ontology.unifiedcyberontology.org/uco/action/> .
-@prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -11,26 +10,10 @@
 	sh:conforms "false"^^xsd:boolean ;
 	sh:result [
 		a sh:ValidationResult ;
-		sh:detail [
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/Action-0-03ee1fe6-12cf-4a35-b7dd-06d4e69369b5> ;
-			sh:resultMessage "Node kb:Action-0-03ee1fe6-12cf-4a35-b7dd-06d4e69369b5 conforms to shape [ rdf:type sh:NodeShape ; sh:class core:Event ]" ;
-			sh:resultSeverity sh:Violation ;
-			sh:sourceConstraintComponent sh:NotConstraintComponent ;
-			sh:sourceShape [
-				a sh:NodeShape ;
-				rdfs:comment "This blank node is provided to avoid a SHACL multiple-inheritance issue."@en ;
-				sh:not [
-					a sh:NodeShape ;
-					sh:class core:Event ;
-				] ;
-			] ;
-			sh:value <http://example.org/kb/Action-0-03ee1fe6-12cf-4a35-b7dd-06d4e69369b5> ;
-		] ;
 		sh:focusNode <http://example.org/kb/Action-0-03ee1fe6-12cf-4a35-b7dd-06d4e69369b5> ;
-		sh:resultMessage "action:Action and core:event are disjoint classes."@en ;
+		sh:resultMessage "action:Action and core:Event are disjoint classes."@en ;
 		sh:resultSeverity sh:Violation ;
-		sh:sourceConstraintComponent sh:NodeConstraintComponent ;
+		sh:sourceConstraintComponent sh:NotConstraintComponent ;
 		sh:sourceShape action:Action-disjointWith-Event-shape ;
 		sh:value <http://example.org/kb/Action-0-03ee1fe6-12cf-4a35-b7dd-06d4e69369b5> ;
 	] ;