Revert "Merge branch 'Feature-Issue-563' into unstable"

This reverts commit 195c9e9, reversing changes made to e77a3b6.
ucoProject · Nov 22, 2023 · 2f486d4 · 2f486d4
1 parent 195c9e9
commit 2f486d4
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 99 deletions.
diff --git a/ontology/uco/action/action.ttl b/ontology/uco/action/action.ttl
@@ -40,7 +40,6 @@ action:Action
 	rdfs:subClassOf core:UcoObject ;
 	rdfs:label "Action"@en ;
 	rdfs:comment "An action is something that may be done or performed."@en ;
-	owl:disjointWith core:Event ;
 	sh:property
 		[
 			sh:class action:Action ;
@@ -151,20 +150,6 @@ action:Action
 	sh:targetClass action:Action ;
 	.
 
-action:Action-disjointWith-Event-shape
-	a sh:NodeShape ;
-	sh:message "action:Action and core:event are disjoint classes."@en ;
-	sh:node [
-		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:targetClass action:Action ;
-	.
-
 action:ActionArgumentFacet
 	a
 		owl:Class ,

diff --git a/ontology/uco/core/core.ttl b/ontology/uco/core/core.ttl
@@ -1,4 +1,3 @@
-@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#> .
@@ -16,11 +15,6 @@
 	owl:versionIRI core:1.2.0 ;
 	.
 
-action:Action
-	a owl:Class ;
-	rdfs:isDefinedBy <https://ontology.unifiedcyberontology.org/uco/types> ;
-	.
-
 core:Annotation
 	a
 		owl:Class ,
@@ -185,7 +179,6 @@ core:Event
 	rdfs:subClassOf core:UcoObject ;
 	rdfs:label "Event"@en ;
 	rdfs:comment "An Event is a noteworthy occurrence (something that happens or might happen)."@en ;
-	owl:disjointWith action:Action ;
 	sh:property
 		[
 			sh:class core:UcoObject ;

diff --git a/tests/examples/Makefile b/tests/examples/Makefile
@@ -27,7 +27,6 @@ all: \
   configuration_setting_XFAIL_validation.ttl \
   database_records_PASS_validation.ttl \
   database_records_XFAIL_validation.ttl \
-  event_XFAIL_validation.ttl \
   file_url_PASS_validation.ttl \
   has_facet_inverse_functional_PASS_validation.ttl \
   has_facet_inverse_functional_XFAIL_validation.ttl \
@@ -98,7 +97,6 @@ check: \
   configuration_setting_XFAIL_validation.ttl \
   database_records_PASS_validation.ttl \
   database_records_XFAIL_validation.ttl \
-  event_XFAIL_validation.ttl \
   file_url_PASS_validation.ttl \
   has_facet_inverse_functional_PASS_validation.ttl \
   has_facet_inverse_functional_XFAIL_validation.ttl \

diff --git a/tests/examples/event_XFAIL.json b/tests/examples/event_XFAIL.json
diff --git a/tests/examples/event_XFAIL_validation.ttl b/tests/examples/event_XFAIL_validation.ttl
diff --git a/tests/examples/test_validation.py b/tests/examples/test_validation.py
@@ -207,15 +207,6 @@ def test_database_records_XFAIL() -> None:
       }
     )
 
-def test_event_XFAIL() -> None:
-    confirm_validation_results(
-        "event_XFAIL_validation.ttl",
-        False,
-        expected_focus_node_severities = {
-          ("http://example.org/kb/Action-0-03ee1fe6-12cf-4a35-b7dd-06d4e69369b5", str(NS_SH.Violation)),
-        }
-    )
-
 def test_file_url_PASS_validation() -> None:
     confirm_validation_results(
       "file_url_PASS_validation.ttl",