Skip to content

Update CHARACTER_INVALID and STYLE_WARNING tests. #652

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

Merged
VisLab merged 2 commits into from
Apr 13, 2023
Merged

Update CHARACTER_INVALID and STYLE_WARNING tests. #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edbaef2
Update CHARACTER_INVALID and STYLE_WARNING tests.
IanCa Apr 13, 2023
c6f40ee
point to new spec version
IanCa Apr 13, 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
14 changes: 8 additions & 6 deletions hed/validator/tag_validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def check_invalid_character_issues(self, hed_string):
"""
validation_issues = []
for index, character in enumerate(hed_string):
if character in TagValidator.INVALID_STRING_CHARS:
if character in TagValidator.INVALID_STRING_CHARS or ord(character) > 127:
validation_issues += self._report_invalid_character_error(hed_string, index)

return validation_issues
Expand Down Expand Up @@ -298,19 +298,20 @@ def check_tag_unit_class_units_are_valid(self, original_tag, report_tag_as=None,
stripped_value, unit = original_tag.get_stripped_unit_value()
if not unit:
bad_units = " " in original_tag.extension

had_error = False
# Todo: in theory this should separately validate the number and the units, for units
# that are prefixes like $. Right now those are marked as unit invalid AND value_invalid.
if bad_units:
stripped_value = stripped_value.split(" ")[0]
if original_tag.is_takes_value_tag() and\
not self._validate_value_class_portion(original_tag, stripped_value):
validation_issues += ErrorHandler.format_error(ValidationErrors.VALUE_INVALID,
report_tag_as if report_tag_as else original_tag,
actual_error=error_code)
report_tag_as if report_tag_as else original_tag)
if error_code:
had_error = True
validation_issues += ErrorHandler.format_error(ValidationErrors.VALUE_INVALID,
report_tag_as if report_tag_as else original_tag)
report_tag_as if report_tag_as else original_tag,
actual_error=error_code)


if bad_units:
Expand All @@ -325,7 +326,8 @@ def check_tag_unit_class_units_are_valid(self, original_tag, report_tag_as=None,
tag=report_tag_as if report_tag_as else original_tag,
default_unit=default_unit)

if error_code:
# We don't want to give this overall error twice
if error_code and not had_error:
new_issue = validation_issues[0].copy()
new_issue['code'] = error_code
validation_issues += [new_issue]
Expand Down
2 changes: 1 addition & 1 deletion spec_tests/hed-specification
Open in desktop
Submodule hed-specification updated 6 files
+2 −1 docs/source/Appendix_B.md
+0 −89 docs/source/_static/data/error_tests/CHARACTER_INVALID.json
+11 −11 docs/source/_static/data/error_tests/STYLE_WARNING.json
+93 −2 docs/source/_static/data/error_tests/VALUE_INVALID.json
+0 −14 docs/source/_template/layout.html
+8 −4 docs/source/index.rst
5 changes: 2 additions & 3 deletions spec_tests/test_errors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@

skip_tests = {
"VERSION_DEPRECATED": "Not applicable",
"CHARACTER_INVALID": "Not finalized",
"STYLE_WARNING": "Bad tests",
"onset-offset-error-duplicated-onset-or-offset": "TBD how we implement this",
"tag-extension-invalid-bad-node-name": "Part of character invalid checking",
"tag-extension-invalid-bad-node-name": "Part of character invalid checking/didn't get to it yet",
}

class MyTestCase(unittest.TestCase):
Expand Down Expand Up @@ -77,6 +75,7 @@ def run_single_test(self, test_file):
if name in skip_tests:
print(f"Skipping {name} test because: {skip_tests[name]}")
continue

description = info['description']
schema = info['schema']
check_for_warnings = info.get("warning", False)
Expand Down