Skip to content

Fix text-field validation for data and annotation properties #91

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

Draft
forest-savage1234 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix text-field validation for data and annotation properties #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/dosdp/validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,13 @@ def test_text_fields(pattern):
Returns: True if schema text fields are valid, False otherwise.
"""
owl_entities = set()
if 'classes' in pattern.keys(): owl_entities.update(set(pattern['classes'].keys()))
if 'relations' in pattern.keys(): owl_entities.update(set(pattern['relations'].keys()))
for entity_type in (
'classes',
'relations',
'dataProperties',
'annotationProperties',
):
owl_entities.update(pattern.get(entity_type, {}).keys())
expr = parse('logical_axioms.[*].text')
ms_fields = [match for match in expr.find(pattern)]
expr = parse('logical_axioms.[*].multi_clause.clauses.[*].text')
Expand Down
19 changes: 18 additions & 1 deletion src/schema/test/generic_test/validator_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import os


from dosdp.validator import validate
from dosdp.validator import test_text_fields, validate

POSITIVE_PATTERNS_FOLDER = os.path.join(os.path.dirname(os.path.realpath(__file__)), "../positive_test_set/patterns")
POSITIVE_PATTERN_1 = os.path.join(os.path.dirname(os.path.realpath(__file__)),
Expand Down Expand Up @@ -68,5 +68,22 @@ def test_single_list_per_multi_clause(self):
def test_undeclared_annotation_prop(self):
self.assertFalse(validate(NEGATIVE_PATTERN_UNDECLARED_ANNOT_PROP))

def test_text_fields_accept_all_declared_owl_entity_types(self):
pattern = {
"dataProperties": {
"mortality_rate": "RO:0002029",
},
"annotationProperties": {
"source": "dc:source",
},
"logical_axioms": [
{
"text": "'mortality_rate' and 'source'",
},
],
}

self.assertTrue(test_text_fields(pattern))

def test_schema_validation(self):
self.assertFalse(validate(NEGATIVE_PATTERN_SCHEMA))