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 586: Enforce prior disjointedness declarations in core: and types: #588

Merged
merged 7 commits into from
Jun 17, 2024
Merged

Issue 586: Enforce prior disjointedness declarations in core: and types: #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
53f2309
Enforce prior disjointedness declarations in core: and types:
ajnelson-nist Feb 1, 2024
5d13f19
Regenerate Make-managed files
ajnelson-nist Feb 1, 2024
79de609
Fix typo
ajnelson-nist Jun 14, 2024
845b819
Regenerate Make-managed files
ajnelson-nist Jun 14, 2024
53f63de
Merge branch 'develop-2.0.0' into Feature-Issue-586-2.0.0
ajnelson-nist Jun 14, 2024
1e0f770
Merge branch 'Feature-Issue-586' into Feature-Issue-586-2.0.0
ajnelson-nist Jun 14, 2024
d58deef
Merge branch 'develop-2.0.0' into Feature-Issue-586-2.0.0
ajnelson-nist Jun 17, 2024
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
3 changes: 1 addition & 2 deletions ontology/uco/core/core.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,12 +379,11 @@ core:UcoInherentCharacterizationThing

core:UcoInherentCharacterizationThing-disjointWith-UcoObject-shape
a sh:NodeShape ;
sh:message "observable:UcoInherentCharacterizationThing and observable:UcoObject are disjoint classes. Assigning both types to a single node will be an error in UCO 2.0.0."@en ;
sh:message "core:UcoInherentCharacterizationThing and core:UcoObject are disjoint classes."@en ;
sh:not [
a sh:NodeShape ;
sh:class core:UcoObject ;
] ;
sh:severity sh:Warning ;
sh:targetClass core:UcoInherentCharacterizationThing ;
.

Expand Down
6 changes: 2 additions & 4 deletions ontology/uco/types/types.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,11 @@ types:Thread

types:Thread-disjointWith-co-List-shape
a sh:NodeShape ;
sh:message "types:Thread and co:List are disjoint classes. Assigning both types to a single node will be an error in UCO 2.0.0."@en ;
sh:message "types:Thread and co:List are disjoint classes."@en ;
sh:not [
a sh:NodeShape ;
sh:class co:List ;
] ;
sh:severity sh:Warning ;
sh:targetClass types:Thread ;
.

Expand All @@ -226,12 +225,11 @@ types:ThreadItem

types:ThreadItem-disjointWith-co-ListItem-shape
a sh:NodeShape ;
sh:message "types:ThreadItem and co:ListItem are disjoint classes. Assigning both types to a single node will be an error in UCO 2.0.0."@en ;
sh:message "types:ThreadItem and co:ListItem are disjoint classes."@en ;
sh:not [
a sh:NodeShape ;
sh:class co:ListItem ;
] ;
sh:severity sh:Warning ;
sh:targetClass types:ThreadItem ;
.

Expand Down
4 changes: 2 additions & 2 deletions tests/examples/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ all: \
configuration_setting_XFAIL_validation.ttl \
database_records_PASS_validation.ttl \
database_records_XFAIL_validation.ttl \
disjointedness_PASS_validation.ttl \
disjointedness_XFAIL_validation.ttl \
event_XFAIL_validation.ttl \
file_url_XFAIL_validation.ttl \
has_facet_inverse_functional_PASS_validation.ttl \
Expand Down Expand Up @@ -101,7 +101,7 @@ check: \
configuration_setting_XFAIL_validation.ttl \
database_records_PASS_validation.ttl \
database_records_XFAIL_validation.ttl \
disjointedness_PASS_validation.ttl \
disjointedness_XFAIL_validation.ttl \
event_XFAIL_validation.ttl \
file_url_XFAIL_validation.ttl \
has_facet_inverse_functional_PASS_validation.ttl \
Expand Down
2 changes: 1 addition & 1 deletion tests/examples/disjointedness_PASS.json → tests/examples/disjointedness_XFAIL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"observable:File",
"observable:FileFacet"
],
"rdfs:comment": "This node will trigger a violation in UCO 2.0.0 for designating itself a File and FileFacet, which are disjoint due to File being a (eventual) subclass of UcoObject, and FileFacet being a (eventual) subclass of UcoInherentCharacterizationThing."
"rdfs:comment": "This node will trigger a violation for designating itself a File and FileFacet, which are disjoint due to File being a (eventual) subclass of UcoObject, and FileFacet being a (eventual) subclass of UcoInherentCharacterizationThing."
}
]
}
6 changes: 3 additions & 3 deletions ...amples/disjointedness_PASS_validation.ttl → ...mples/disjointedness_XFAIL_validation.ttl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

[]
a sh:ValidationReport ;
sh:conforms "true"^^xsd:boolean ;
sh:conforms "false"^^xsd:boolean ;
sh:result [
a sh:ValidationResult ;
sh:focusNode <http://example.org/kb/File-33a25932-3a1a-4828-a90f-d31818b495ce> ;
sh:resultMessage "observable:UcoInherentCharacterizationThing and observable:UcoObject are disjoint classes. Assigning both types to a single node will be an error in UCO 2.0.0."@en ;
sh:resultSeverity sh:Warning ;
sh:resultMessage "core:UcoInherentCharacterizationThing and core:UcoObject are disjoint classes."@en ;
sh:resultSeverity sh:Violation ;
sh:sourceConstraintComponent sh:NotConstraintComponent ;
sh:sourceShape core:UcoInherentCharacterizationThing-disjointWith-UcoObject-shape ;
sh:value <http://example.org/kb/File-33a25932-3a1a-4828-a90f-d31818b495ce> ;
Expand Down
8 changes: 4 additions & 4 deletions tests/examples/test_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,12 @@ def test_database_records_XFAIL() -> None:
}
)

def test_disjointedness_PASS() -> None:
def test_disjointedness_XFAIL() -> None:
confirm_validation_results(
"disjointedness_PASS_validation.ttl",
True,
"disjointedness_XFAIL_validation.ttl",
False,
expected_focus_node_severities={
("http://example.org/kb/File-33a25932-3a1a-4828-a90f-d31818b495ce", str(NS_SH.Warning)),
("http://example.org/kb/File-33a25932-3a1a-4828-a90f-d31818b495ce", str(NS_SH.Violation)),
}
)

Expand Down
Loading