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.

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 NODE_NAME_EMPTY into TAG_INVALID #605

Merged
merged 2 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions docs/source/03_HED_formats.md
Original file line number Diff line number Diff line change
Expand Up @@ -587,9 +587,8 @@ HED tools are available to map between shortened and long forms as needed.
The tag must be associated with a schema and must correspond to a path in the schema
(excluding any extension or value).

See [**NODE_NAME_EMPTY**](./Appendix_B.md#node_name_empty) for errors involving
forward slashes (`/`) and [**TAG_INVALID**](./Appendix_B.md#tag_invalid) for
other types of tag syntax errors.
See [**TAG_INVALID**](./Appendix_B.md#tag_invalid) for errors involving
forward slashes (`/`), extra white-space, and other types of tag syntax errors.

### 3.2.3. Tag case-sensitivity

Expand Down
7 changes: 0 additions & 7 deletions docs/source/Appendix_B.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,6 @@ its description is updated to include the reason for deprecation and a suggested
See [**A.1.4. Schema attributes**](./Appendix_A.md#a14-schema-attributes) for additional information
about the `deprecatedFrom` schema attribute.

### NODE_NAME_EMPTY

**a.** A tag has one or more forward slashes (`/`) at beginning or end (ignoring whitespace).
**b.** A tag contains consecutive forward slashes (ignoring whitespace).

See [**3.2.3 Tag forms**](./03_HED_formats.md#322-tag-forms) for more information.

### PARENTHESES_MISMATCH

**a.** A HED string does not have the same number of open and closed parentheses.
Expand Down
198 changes: 0 additions & 198 deletions tests/json_tests/NODE_NAME_EMPTY.json

This file was deleted.

89 changes: 29 additions & 60 deletions tests/json_tests/TAG_INVALID.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@
"tests": {
"string_tests": {
"fails": [
"Sensory- presentation,Green",
"Sensory -presentation,Blue",
"Sensory- event,Green",
"Sensory -event,Blue",
"Event /Sensory-event, Black",
"Event/ Sensory-event,White"
],
Expand All @@ -121,8 +121,8 @@
{
"event_code": {
"HED": {
"square": "Sensory- presentation,Green",
"test": "Sensory -presentation,Blue",
"square": "Sensory- event,Green",
"test": "Sensory -event,Blue",
"pine": "Event /Sensory-event, Black",
"apple": "Event/ Sensory-event,White"
}
Expand Down Expand Up @@ -151,12 +151,12 @@
[
5.5,
0,
"Sensory- presentation,Green"
"Sensory- event,Green"
],
[
7.5,
0,
"Sensory -presentation,Blue"
"Sensory -event,Blue"
],
[
8.2,
Expand Down Expand Up @@ -191,8 +191,8 @@
"sidecar": {
"event_code": {
"HED": {
"square": "Sensory- presentation,Green",
"test": "Sensory -presentation,Blue",
"square": "Sensory- event,Green",
"test": "Sensory -event,Blue",
"pine": "Event /Sensory-event, Black",
"apple": "Event/ Sensory-event,White"
}
Expand Down Expand Up @@ -271,10 +271,14 @@
"Red/",
"Event//Sensory-event",
"//Event",
"Body-part/Head-part//Brain"
"Body-part/Head-part//Brain",
"Def/Acc/4.5//",
"Def/Acc/4.5/",
"/ /Def/Acc/4.5 ms/"
],
"passes": [
"Body-part/Head-part/Brain"
"Body-part/Head-part/Brain",
"Label/Red, Informational-property/Label/Blue"
]
},
"sidecar_tests": {
Expand All @@ -284,7 +288,8 @@
"HED": {
"face": "Event//Sensory-event",
"ball": "/Event",
"square": "Red/"
"square": "Red/",
"test": "/ /Def/Acc/4.5 ms/"
}
}
}
Expand All @@ -303,40 +308,17 @@
"event_tests": {
"fails": [
[
[
"onset",
"duration",
"HED"
],
[
4.5,
0,
"/Event,"
],
[
5.5,
0,
"Body-part/Head-part//Brain"
],
[
6.5,
0,
"Event/Sensory-event/"
]
[ "onset", "duration", "HED"],
[ 4.5, 0, "/Event,"],
[5.5, 0, "Body-part/Head-part//Brain"],
[6.5, 0, "Event/Sensory-event/"],
[ 7.2, 0, "/ /Def/Acc/4.5 ms/"]
]
],
"passes": [
[
[
"onset",
"duration",
"HED"
],
[
4.5,
0,
"Event/Sensory-event"
]
["onset", "duration", "HED"],
[4.5, 0, "Event/Sensory-event"]
]
]
},
Expand All @@ -348,29 +330,16 @@
"HED": {
"face": "Event//Sensory-event",
"ball": "//Event",
"square": "Body-part/Head-part//Brain"
"square": "Body-part/Head-part//Brain",
"test": "/ /Def/Acc/4.5 ms/"
}
}
},
"events": [
[
"onset",
"duration",
"event_code",
"HED"
],
[
4.5,
0,
"face",
"Red/, Def/MyColor"
],
[
5.0,
0,
"ball",
"Green"
]
["onset", "duration", "event_code", "HED"],
[4.5, 0, "face", "Red/, Def/MyColor"],
[5.0, 0, "ball", "Green"],
[ 7.2, 0, "n/a", "/ /Def/Acc/4.5 ms/"]
]
}
],
Expand Down