Skip to content

Commit

Permalink
Merge pull request #617 from VisLab/develop
Browse files Browse the repository at this point in the history 
Additional changes to the tests.
  • Loading branch information
@VisLab
VisLab authored Aug 30, 2024
2 parents 462f3fc + b218d9b commit 0cd8467
Show file tree
Hide file tree
Showing 4 changed files with 162 additions and 110 deletions.
104 changes: 60 additions & 44 deletions tests/javascript_tests.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -868,16 +868,17 @@
"def2": "(Definition/Blech/#, ())"
}
}
},
}
],
"passes": [
{
"defs": {
"HED": {
"def1": "(Definition/Apple)"
}
}
}
],
"passes": []
]
},
"event_tests": {
"fails": [],
Expand All @@ -889,7 +890,6 @@
"sidecar": {
"defs": {
"HED": {
"def1": "(Definition/Apple), ((Definition/Blech, (Red)))",
"def2": "(Definition/Blech/#, ())"
}
}
Expand Down Expand Up @@ -937,7 +937,9 @@
},
{
"error_code": "DEFINITION_INVALID",
"alt_codes": [],
"alt_codes": [
"TAG_GROUP_ERROR"
],
"name": "definition-invalid-multiple-definition-tags",
"description": "A definition's enclosing tag group contains more than a `Definition` tag and an inner group.",
"warning": false,
Expand Down Expand Up @@ -1033,7 +1035,9 @@
},
{
"error_code": "DEFINITION_INVALID",
"alt_codes": [],
"alt_codes": [
"TAG_GROUP_ERROR"
],
"name": "definition-invalid-inner-group-defs",
"description": "A definition's inner tag group contains `Definition`, `Def` or `Def-expand` tags.",
"warning": false,
Expand Down Expand Up @@ -9716,13 +9720,21 @@
"ball": "Delay/5.0 s, Def/Acc/5.4 m-per-s^2"
}
}
},
{
"event_code": {
"HED": {
"face": "Blue, Red",
"ball": "Delay/5.0 s, (Def/Acc/5.4 m-per-s^2)"
}
}
}
],
"passes": [
{
"event_code": {
"HED": {
"face": "(Delay/5.0 s, Onset, Def/Acc/5.4 m-per-s^2)"
"face": "(Delay/5.0 s, (Def/Acc/5.4 m-per-s^2))"
}
}
}
Expand All @@ -9737,19 +9749,21 @@
"HED"
],
[
4.5,
5.0,
0,
"Delay/1.0 s, Onset, Red"
],
"Delay/1.0 s, Red"
]
],
[
[
4.8,
0,
"(Onset, MyColor)"
"onset",
"duration",
"HED"
],
[
5.0,
4.5,
0,
"Delay/1.0 s, Offset, MyColor"
"Delay/1.0 s, (Red))"
]
]
],
Expand All @@ -9763,17 +9777,7 @@
[
4.5,
0,
"(Delay/5.0 s, Onset, (Def-expand/MyColor, (Label/Pie)), (Red))"
],
[
5.5,
0,
"(Delay/5.0 s, Onset, Def/Acc/5.4 m-per-s^2)"
],
[
6.3,
0,
"(Delay/5.0 s, Offset, Def/Acc/5.4 m-per-s^2)"
"(Delay/5.0 s, (Red))"
]
]
]
Expand All @@ -9784,8 +9788,8 @@
"sidecar": {
"event_code": {
"HED": {
"face": "Onset, Red",
"ball": "Delay/5.0 s, Offset, Def/Acc/5.4 m-per-s^2"
"face": "Red",
"ball": "Delay/5.0 s, Def/Acc/5.4 m-per-s^2"
}
}
},
Expand All @@ -9800,29 +9804,28 @@
4.5,
0,
"ball",
"Onset, Red"
"Red"
],
[
4.8,
0,
"n/a",
"(Onset/MyColor)"
"Blue"
],
[
5.0,
0,
"face",
"Offset, MyColor"
"Green"
]
]
}
],
"passes": [
},
{
"sidecar": {
"event_code": {
"HED": {
"face": "(Onset, Delay/5.0 s, Def/Acc/5.4 m-per-s^2)"
"face": "Red",
"ball": "Delay/5.0 s, (Def/Acc/5.4 m-per-s^2)"
}
}
},
Expand All @@ -9834,16 +9837,29 @@
"HED"
],
[
5.5,
4.5,
0,
"n/a",
"(Onset, Delay/5.0 s, Def/Acc/5.4 m-per-s^2)"
],
"ball",
"Red"
]
]
}
],
"passes": [
{
"sidecar": {
"event_code": {
"HED": {
"face": "(Delay/5.0 s, (Def/Acc/5.4 m-per-s^2))"
}
}
},
"events": [
[
6.3,
0,
"n/a",
"(Offset, Delay/5.0 s, Def/Acc/5.4 m-per-s^2)"
"onset",
"duration",
"event_code",
"HED"
],
[
8.5,
Expand All @@ -9855,7 +9871,7 @@
9.0,
0,
"n/a",
"Green, (Delay/5.0 s, (Def-expand/MyColor, (Label/Pie)), Onset)"
"Green, (Delay/5.0 s, (Def/MyColor))"
]
]
}
Expand Down
11 changes: 5 additions & 6 deletions tests/json_tests/DEFINITION_INVALID.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,16 @@
"def2": "(Definition/Blech/#, ())"
}
}
},
}
],
"passes": [
{
"defs": {
"HED": {
"def1": "(Definition/Apple)"
}
}
}
],
"passes": [
]
},
"event_tests": {
Expand All @@ -128,7 +128,6 @@
"sidecar": {
"defs": {
"HED": {
"def1": "(Definition/Apple), ((Definition/Blech, (Red)))",
"def2": "(Definition/Blech/#, ())"
}
}
Expand Down Expand Up @@ -162,7 +161,7 @@
},
{
"error_code": "DEFINITION_INVALID",
"alt_codes": [],
"alt_codes": ["TAG_GROUP_ERROR"],
"name": "definition-invalid-multiple-definition-tags",
"description": "A definition's enclosing tag group contains more than a `Definition` tag and an inner group.",
"warning": false,
Expand Down Expand Up @@ -245,7 +244,7 @@
},
{
"error_code": "DEFINITION_INVALID",
"alt_codes": [],
"alt_codes": ["TAG_GROUP_ERROR"],
"name": "definition-invalid-inner-group-defs",
"description": "A definition's inner tag group contains `Definition`, `Def` or `Def-expand` tags.",
"warning": false,
Expand Down
53 changes: 37 additions & 16 deletions tests/json_tests/TEMPORAL_TAG_ERROR_DELAY.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,21 @@
"ball": "Delay/5.0 s, Def/Acc/5.4 m-per-s^2"
}
}
},
{
"event_code": {
"HED": {
"face": "Blue, Red",
"ball": "Delay/5.0 s, (Def/Acc/5.4 m-per-s^2)"
}
}
}
],
"passes": [
{
"event_code": {
"HED": {
"face": "(Delay/5.0 s, Onset, Def/Acc/5.4 m-per-s^2)"
"face": "(Delay/5.0 s, (Def/Acc/5.4 m-per-s^2))"
}
}
}
Expand All @@ -42,17 +50,17 @@
"fails": [
[
["onset", "duration", "HED"],
[ 4.5, 0, "Delay/1.0 s, Onset, Red"],
[ 4.8, 0, "(Onset, MyColor)"],
[ 5.0, 0, "Delay/1.0 s, Offset, MyColor"]
[ 5.0, 0, "Delay/1.0 s, Red"]
],
[
["onset", "duration", "HED"],
[ 4.5, 0, "Delay/1.0 s, (Red))"]
]
],
"passes": [
[
["onset", "duration", "HED"],
[ 4.5, 0, "(Delay/5.0 s, Onset, (Def-expand/MyColor, (Label/Pie)), (Red))"],
[ 5.5, 0, "(Delay/5.0 s, Onset, Def/Acc/5.4 m-per-s^2)"],
[ 6.3, 0, "(Delay/5.0 s, Offset, Def/Acc/5.4 m-per-s^2)"]
[ 4.5, 0, "(Delay/5.0 s, (Red))"]
]
]
},
Expand All @@ -62,17 +70,32 @@
"sidecar": {
"event_code": {
"HED": {
"face": "Onset, Red",
"ball": "Delay/5.0 s, Offset, Def/Acc/5.4 m-per-s^2"
"face": "Red",
"ball": "Delay/5.0 s, Def/Acc/5.4 m-per-s^2"
}
}
},
"events":
[
["onset", "duration", "event_code", "HED"],
[ 4.5, 0, "ball", "Red"],
[ 4.8, 0, "n/a", "Blue"],
[ 5.0, 0, "face", "Green"]
]
},
{
"sidecar": {
"event_code": {
"HED": {
"face": "Red",
"ball": "Delay/5.0 s, (Def/Acc/5.4 m-per-s^2)"
}
}
},
"events":
[
["onset", "duration", "event_code", "HED"],
[ 4.5, 0, "ball", "Onset, Red"],
[ 4.8, 0, "n/a", "(Onset/MyColor)"],
[ 5.0, 0, "face", "Offset, MyColor"]
[ 4.5, 0, "ball", "Red"]
]
}
],
Expand All @@ -81,17 +104,15 @@
"sidecar": {
"event_code": {
"HED": {
"face": "(Onset, Delay/5.0 s, Def/Acc/5.4 m-per-s^2)"
"face": "(Delay/5.0 s, (Def/Acc/5.4 m-per-s^2))"
}
}
},
"events":
[
["onset", "duration", "event_code", "HED"],
[ 5.5, 0, "n/a","(Onset, Delay/5.0 s, Def/Acc/5.4 m-per-s^2)"],
[ 6.3, 0, "n/a","(Offset, Delay/5.0 s, Def/Acc/5.4 m-per-s^2)"],
[ 8.5, 0, "face", "Blue"],
[ 9.0, 0, "n/a", "Green, (Delay/5.0 s, (Def-expand/MyColor, (Label/Pie)), Onset)"]
[ 9.0, 0, "n/a", "Green, (Delay/5.0 s, (Def/MyColor))"]
]
}
]
Expand Down
Loading

0 comments on commit 0cd8467

Please sign in to comment.