Merge pull request #514 from ucoProject/Bug-Fix-513

Bug fix 513
ucoProject · Jan 18, 2023 · 2d0d4e2 · 2d0d4e2
2 parents 72427e2 + 494c4ad
commit 2d0d4e2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/ontology/owl/owl.ttl b/ontology/owl/owl.ttl
@@ -226,6 +226,7 @@ uco-owl:ObjectProperty-shacl-constraints-shape
 			a sh:SPARQLConstraint ;
 			sh:message "An OWL Object Property must not permit a Literal value via SHACL consraints."@en ;
 			sh:select """
+				PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 				PREFIX sh: <http://www.w3.org/ns/shacl#>
 				SELECT $this ?value
 				WHERE {

diff --git a/ontology/uco/core/core.ttl b/ontology/uco/core/core.ttl
@@ -414,10 +414,11 @@ core:UcoThing
 		a sh:SPARQLConstraint ;
 		sh:message "UcoThings are required to not be blank nodes."@en ;
 		sh:select """
-			PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
+			PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+			PREFIX core: <https://ontology.unifiedcyberontology.org/uco/core/>
 			SELECT $this
 			WHERE {
-			        $this a/rdfs:subClassOf* uco-core:UcoThing .
+			        $this a/rdfs:subClassOf* core:UcoThing .
 			        FILTER isBlank ($this)
 			}
 		""" ;
@@ -435,10 +436,11 @@ core:UcoThing-identifier-regex-shape
 		rdfs:seeAlso <https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.3> ;
 		sh:message "UcoThings are suggested to end with a UUID."@en ;
 		sh:select '''
-			PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
+			PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+			PREFIX core: <https://ontology.unifiedcyberontology.org/uco/core/>
 			SELECT $this
 			WHERE {
-			        $this a/rdfs:subClassOf* uco-core:UcoThing .
+			        $this a/rdfs:subClassOf* core:UcoThing .
 			        FILTER (
 			                ! REGEX (
 			                        STR($this),

diff --git a/tests/examples/uco_thing_XFAIL_validation.ttl b/tests/examples/uco_thing_XFAIL_validation.ttl
@@ -19,10 +19,11 @@
 				rdfs:seeAlso <https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.3> ;
 				sh:message "UcoThings are suggested to end with a UUID."@en ;
 				sh:select '''
-			PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
+			PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+			PREFIX core: <https://ontology.unifiedcyberontology.org/uco/core/>
 			SELECT $this
 			WHERE {
-			        $this a/rdfs:subClassOf* uco-core:UcoThing .
+			        $this a/rdfs:subClassOf* core:UcoThing .
 			        FILTER (
 			                ! REGEX (
 			                        STR($this),
@@ -47,10 +48,11 @@
 				rdfs:seeAlso <https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.3> ;
 				sh:message "UcoThings are suggested to end with a UUID."@en ;
 				sh:select '''
-			PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
+			PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+			PREFIX core: <https://ontology.unifiedcyberontology.org/uco/core/>
 			SELECT $this
 			WHERE {
-			        $this a/rdfs:subClassOf* uco-core:UcoThing .
+			        $this a/rdfs:subClassOf* core:UcoThing .
 			        FILTER (
 			                ! REGEX (
 			                        STR($this),
@@ -77,10 +79,11 @@
 				a sh:SPARQLConstraint ;
 				sh:message "UcoThings are required to not be blank nodes."@en ;
 				sh:select """
-			PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
+			PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+			PREFIX core: <https://ontology.unifiedcyberontology.org/uco/core/>
 			SELECT $this
 			WHERE {
-			        $this a/rdfs:subClassOf* uco-core:UcoThing .
+			        $this a/rdfs:subClassOf* core:UcoThing .
 			        FILTER isBlank ($this)
 			}
 		""" ;
@@ -105,10 +108,11 @@
 				rdfs:seeAlso <https://datatracker.ietf.org/doc/html/rfc4122#section-4.1.3> ;
 				sh:message "UcoThings are suggested to end with a UUID."@en ;
 				sh:select '''
-			PREFIX uco-core: <https://ontology.unifiedcyberontology.org/uco/core/>
+			PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+			PREFIX core: <https://ontology.unifiedcyberontology.org/uco/core/>
 			SELECT $this
 			WHERE {
-			        $this a/rdfs:subClassOf* uco-core:UcoThing .
+			        $this a/rdfs:subClassOf* core:UcoThing .
 			        FILTER (
 			                ! REGEX (
 			                        STR($this),