From 67a010c761bd5b5c08c9b319dd7d6c029d970d7d Mon Sep 17 00:00:00 2001 From: Kay Robbins <1189050+VisLab@users.noreply.github.com> Date: Wed, 11 Sep 2024 08:14:35 -0500 Subject: [PATCH 1/2] Correction to curly brace test --- docs/source/Appendix_A.md | 5 +++-- tests/javascript_tests.json | 8 ++++---- tests/json_tests/DEFINITION_INVALID.json | 2 +- tests/json_tests/SIDECAR_INVALID.json | 4 ++-- tests/python_tests.json | 8 ++++---- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/docs/source/Appendix_A.md b/docs/source/Appendix_A.md index c8ca1fe..7e3561b 100644 --- a/docs/source/Appendix_A.md +++ b/docs/source/Appendix_A.md @@ -190,11 +190,11 @@ behavior of certain value classes (for example the `numericClass` value class). * - nameClass - `alphanumeric`, `hyphen`, `underscore`, `nonascii` * - numericClass - - `digits`, `period`, `hyphen`, `plus`, 'caret`, `E`, `e` ` + - `digits`, `period`, `hyphen`, `plus`, `caret`, `E`, `e` ` * - posixPath - As yet unspecified. * - textClass - - `printable` or `nonascii` excluding curly braces. + - `printable` or `nonascii` excluding curly braces, commas, and single quotes. * - IRIClass - Valid International Resource Identifier as standardized by [rfc3987](https://datatracker.ietf.org/doc/html/rfc3987). `````` @@ -215,6 +215,7 @@ A BIDS regular expression for this is: 5. Values of `numericClass` must be equivalent to a valid floating point value. 6. Scientific notation is supported with the `numericClass`. 7. The `textClass` is for descriptions, mainly for use with the `Description` tag or schema element descriptions. +It is also allowed as the value for other tags such as 8. The `posixPath` class is as yet unspecified and currently allows any characters except commas. 9. The IRIClass validity is determined by a library implementing the IETF rfc3987 standard. diff --git a/tests/javascript_tests.json b/tests/javascript_tests.json index 998b129..e490d89 100644 --- a/tests/javascript_tests.json +++ b/tests/javascript_tests.json @@ -847,7 +847,7 @@ "alt_codes": [ "TAG_EMPTY" ], - "name": "definition-invalid-missing-inner-group", + "name": "definition-invalid-empty-inner-group", "description": "A definition's enclosing tag group has an empty inner group (i.e., the definition's contents).", "warning": false, "schema": "8.3.0", @@ -5124,7 +5124,7 @@ } }, "response": { - "HED": "Label/#" + "Description": "This is a response" } } ], @@ -5154,7 +5154,7 @@ "face": "Statistical-accuracy/0.677, {response}" } }, - "response": "Label/#" + "response": "This is a response" }, "events": [ [ @@ -9763,7 +9763,7 @@ [ 4.5, 0, - "Delay/1.0 s, (Red))" + "Delay/1.0 s, (Red)" ] ] ], diff --git a/tests/json_tests/DEFINITION_INVALID.json b/tests/json_tests/DEFINITION_INVALID.json index 5716e0f..28432cd 100644 --- a/tests/json_tests/DEFINITION_INVALID.json +++ b/tests/json_tests/DEFINITION_INVALID.json @@ -84,7 +84,7 @@ { "error_code": "DEFINITION_INVALID", "alt_codes": ["TAG_EMPTY"], - "name": "definition-invalid-missing-inner-group", + "name": "definition-invalid-empty-inner-group", "description": "A definition's enclosing tag group has an empty inner group (i.e., the definition's contents).", "warning": false, "schema": "8.3.0", diff --git a/tests/json_tests/SIDECAR_INVALID.json b/tests/json_tests/SIDECAR_INVALID.json index 9508321..fce5a6f 100644 --- a/tests/json_tests/SIDECAR_INVALID.json +++ b/tests/json_tests/SIDECAR_INVALID.json @@ -214,7 +214,7 @@ } }, "response": { - "HED": "Label/#" + "Description": "This is a response" } } ], @@ -246,7 +246,7 @@ "face": "Statistical-accuracy/0.677, {response}" } }, - "response": "Label/#" + "response": "This is a response" }, "events": [ [ diff --git a/tests/python_tests.json b/tests/python_tests.json index c5daa4f..5e9329d 100644 --- a/tests/python_tests.json +++ b/tests/python_tests.json @@ -847,7 +847,7 @@ "alt_codes": [ "TAG_EMPTY" ], - "name": "definition-invalid-missing-inner-group", + "name": "definition-invalid-empty-inner-group", "description": "A definition's enclosing tag group has an empty inner group (i.e., the definition's contents).", "warning": false, "schema": "8.3.0", @@ -7966,7 +7966,7 @@ } }, "response": { - "HED": "Label/#" + "Description": "This is a response" } } ], @@ -7996,7 +7996,7 @@ "face": "Statistical-accuracy/0.677, {response}" } }, - "response": "Label/#" + "response": "This is a response" }, "events": [ [ @@ -12898,7 +12898,7 @@ [ 4.5, 0, - "Delay/1.0 s, (Red))" + "Delay/1.0 s, (Red)" ] ] ], From f9637a9d7c938c2a3fa8af37e82d36914033837b Mon Sep 17 00:00:00 2001 From: Kay Robbins <1189050+VisLab@users.noreply.github.com> Date: Fri, 13 Sep 2024 08:25:14 -0500 Subject: [PATCH 2/2] Modified the test for definition with no group --- tests/json_tests/DEFINITION_INVALID.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/json_tests/DEFINITION_INVALID.json b/tests/json_tests/DEFINITION_INVALID.json index 28432cd..a5ae4dc 100644 --- a/tests/json_tests/DEFINITION_INVALID.json +++ b/tests/json_tests/DEFINITION_INVALID.json @@ -84,8 +84,7 @@ { "error_code": "DEFINITION_INVALID", "alt_codes": ["TAG_EMPTY"], - "name": "definition-invalid-empty-inner-group", - "description": "A definition's enclosing tag group has an empty inner group (i.e., the definition's contents).", +g "description": "A definition's enclosing tag group has an empty inner group (i.e., the definition's contents).", "warning": false, "schema": "8.3.0", "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],