Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 563: Catch develop-2.0.0 up to develop #569

Closed
wants to merge 3 commits into from
Closed

Issue 563: Catch develop-2.0.0 up to develop #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6669aab
Designate action:Action and core:Event disjoint
ajnelson-nist Nov 17, 2023
f599294
Regenerate Make-managed files
ajnelson-nist Nov 22, 2023
429cfa7
Merge pull request #564 from ucoProject/Feature-Issue-563
plbt5 Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ontology/uco/action/action.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ 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 ;
Expand Down Expand Up @@ -150,6 +151,16 @@ 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:not [
a sh:NodeShape ;
sh:class core:Event ;
] ;
sh:targetClass action:Action ;
.

action:ActionArgumentFacet
a
owl:Class ,
Expand Down
7 changes: 7 additions & 0 deletions ontology/uco/core/core.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +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#> .
Expand All @@ -15,6 +16,11 @@
owl:versionIRI core:1.2.0 ;
.

action:Action
a owl:Class ;
rdfs:isDefinedBy <https://ontology.unifiedcyberontology.org/uco/types> ;
.

core:Annotation
a
owl:Class ,
Expand Down Expand Up @@ -179,6 +185,7 @@ 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 ;
Expand Down
2 changes: 2 additions & 0 deletions tests/examples/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ 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 \
Expand Down Expand Up @@ -97,6 +98,7 @@ 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 \
Expand Down
28 changes: 28 additions & 0 deletions tests/examples/event_XFAIL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"@context": {
"kb": "http://example.org/kb/",
"action": "https://ontology.unifiedcyberontology.org/uco/action/",
"core": "https://ontology.unifiedcyberontology.org/uco/core/",
"xsd": "http://www.w3.org/2001/XMLSchema#"
},
"@graph": [
{
"@id": "kb:Action-0-03ee1fe6-12cf-4a35-b7dd-06d4e69369b5",
"@type": [
"action:Action",
"core:Event"
],
"rdfs:comment": "This node will trigger an XFAIL for designating itself an Action and Event, which are disjoint classes."
},
{
"@id": "kb:Action-1-763c1ff2-d18d-427b-aa82-30d90701a644",
"@type": "action:Action",
"rdfs:comment": "This node should pass validation."
},
{
"@id": "kb:Event-1-ee9450b6-3535-473d-984d-17a91408a54f",
"@type": "event:Event",
"rdfs:comment": "This node should pass validation."
}
]
}
21 changes: 21 additions & 0 deletions tests/examples/event_XFAIL_validation.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
@prefix action: <https://ontology.unifiedcyberontology.org/uco/action/> .
@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#> .
@prefix sh: <http://www.w3.org/ns/shacl#> .
@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-0-03ee1fe6-12cf-4a35-b7dd-06d4e69369b5> ;
sh:resultMessage "action:Action and core:Event are disjoint classes."@en ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:NotConstraintComponent ;
sh:sourceShape action:Action-disjointWith-Event-shape ;
sh:value <http://example.org/kb/Action-0-03ee1fe6-12cf-4a35-b7dd-06d4e69369b5> ;
] ;
.

9 changes: 9 additions & 0 deletions tests/examples/test_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,15 @@ 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",
Expand Down
Loading