Regenerate Make-managed files

References: * #629 Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
ucoProject · Feb 18, 2025 · e6decb6 · e6decb6
1 parent ed274b1
commit e6decb6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 66 deletions.
diff --git a/tests/examples/action_inheritance_PASS_validation.ttl b/tests/examples/action_inheritance_PASS_validation.ttl
@@ -3,7 +3,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
-@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 []
@@ -12,13 +11,21 @@
 	sh:result [
 		a sh:ValidationResult ;
 		sh:focusNode <http://example.org/kb/action-7acb25ab-0a51-4495-9133-baa69c3be54e> ;
-		sh:resultMessage "Value is outside the default vocabulary ActionStatusTypeVocab." ;
+		sh:resultMessage "Value is not member of the vocabulary ActionStatusTypeVocab." ;
 		sh:resultPath action:actionStatus ;
 		sh:resultSeverity sh:Info ;
-		sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
+		sh:sourceConstraintComponent sh:InConstraintComponent ;
 		sh:sourceShape [
-			sh:datatype vocabulary:ActionStatusTypeVocab ;
-			sh:message "Value is outside the default vocabulary ActionStatusTypeVocab." ;
+			sh:in (
+				"Complete/Finish"
+				"Error"
+				"Fail"
+				"Ongoing"
+				"Pending"
+				"Success"
+				"Unknown"
+			) ;
+			sh:message "Value is not member of the vocabulary ActionStatusTypeVocab." ;
 			sh:path action:actionStatus ;
 			sh:severity sh:Info ;
 		] ;

diff --git a/tests/examples/action_inheritance_XFAIL_validation.ttl b/tests/examples/action_inheritance_XFAIL_validation.ttl
@@ -3,58 +3,12 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
-@prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 []
 	a sh:ValidationReport ;
 	sh:conforms "false"^^xsd:boolean ;
 	sh:result
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/action-35fada9e-c807-4fa0-87b8-582473115eeb> ;
-			sh:resultMessage "Value is outside the default vocabulary ActionStatusTypeVocab." ;
-			sh:resultPath action:actionStatus ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
-			sh:sourceShape [
-				sh:datatype vocabulary:ActionStatusTypeVocab ;
-				sh:message "Value is outside the default vocabulary ActionStatusTypeVocab." ;
-				sh:path action:actionStatus ;
-				sh:severity sh:Info ;
-			] ;
-			sh:value "Pending" ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/action-dcb9c6a2-f7b9-454a-b185-44d63244ac1c> ;
-			sh:resultMessage "Value is outside the default vocabulary ActionStatusTypeVocab." ;
-			sh:resultPath action:actionStatus ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
-			sh:sourceShape [
-				sh:datatype vocabulary:ActionStatusTypeVocab ;
-				sh:message "Value is outside the default vocabulary ActionStatusTypeVocab." ;
-				sh:path action:actionStatus ;
-				sh:severity sh:Info ;
-			] ;
-			sh:value "Pending" ;
-		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/action-e1bb7bac-5655-48e3-8c62-843ffb7cc17f> ;
-			sh:resultMessage "Value is outside the default vocabulary ActionStatusTypeVocab." ;
-			sh:resultPath action:actionStatus ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
-			sh:sourceShape [
-				sh:datatype vocabulary:ActionStatusTypeVocab ;
-				sh:message "Value is outside the default vocabulary ActionStatusTypeVocab." ;
-				sh:path action:actionStatus ;
-				sh:severity sh:Info ;
-			] ;
-			sh:value "Pending" ;
-		] ,
 		[
 			a sh:ValidationResult ;
 			sh:focusNode <http://example.org/kb/action-lifecycle-098ebb7a-949e-4f05-9d7f-1c07260a8e14> ;
@@ -67,21 +21,6 @@
 				sh:path action:actionStatus ;
 			] ;
 		] ,
-		[
-			a sh:ValidationResult ;
-			sh:focusNode <http://example.org/kb/action-lifecycle-098ebb7a-949e-4f05-9d7f-1c07260a8e14> ;
-			sh:resultMessage "Value is outside the default vocabulary ActionStatusTypeVocab." ;
-			sh:resultPath action:actionStatus ;
-			sh:resultSeverity sh:Info ;
-			sh:sourceConstraintComponent sh:DatatypeConstraintComponent ;
-			sh:sourceShape [
-				sh:datatype vocabulary:ActionStatusTypeVocab ;
-				sh:message "Value is outside the default vocabulary ActionStatusTypeVocab." ;
-				sh:path action:actionStatus ;
-				sh:severity sh:Info ;
-			] ;
-			sh:value "Pending" ;
-		] ,
 		[
 			a sh:ValidationResult ;
 			sh:focusNode <http://example.org/kb/array-of-action-6f91380f-703f-471e-9be6-cf7499bf44f2> ;