Merge pull request #604 from VisLab/develop

Updated test versions to 8.3.0 and clarified tests for TAG_INVALID
hed-standard · Jul 22, 2024 · ab2d1a9 · ab2d1a9
2 parents 5bc506c + 1b070cd
commit ab2d1a9
Show file tree

Hide file tree

Showing 29 changed files with 3,005 additions and 2,689 deletions.
diff --git a/docs/source/Appendix_B.md b/docs/source/Appendix_B.md
@@ -257,6 +257,8 @@ for additional information on the rules for group errors due to schema attribute
 ### TAG_INVALID
 
 **a.**  The tag is not valid in the schema it is associated with.  
+**b.**  The tag has extra internal whitespace, including directly before or after slashes.
+**c.**  The tag has a leading, trailing, or consecutive slashes.  
 
 See [**3.2.2. Tag forms**](./03_HED_formats.md#322-tag-forms) for a discussion
 of tag forms and their relationship to the HED schema.

diff --git a/hedwiki/HED7.2.0.mediawiki → hedwiki/deprecated/HED7.2.0.mediawiki b/hedwiki/HED7.2.0.mediawiki → hedwiki/deprecated/HED7.2.0.mediawiki
diff --git a/hedwiki/HED7.3.0.mediawiki → hedwiki/deprecated/HED7.3.0.mediawiki b/hedwiki/HED7.3.0.mediawiki → hedwiki/deprecated/HED7.3.0.mediawiki
diff --git a/hedxml/HED7.2.0.xml → hedxml/deprecated/HED7.2.0.xml b/hedxml/HED7.2.0.xml → hedxml/deprecated/HED7.2.0.xml
diff --git a/tests/json_tests/CHARACTER_INVALID.json b/tests/json_tests/CHARACTER_INVALID.json
@@ -3,7 +3,7 @@
         "error_code": "CHARACTER_INVALID",
         "name": "character-invalid-utf-8",
         "description": "The HED string contains a UTF-8 character.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -91,7 +91,7 @@
         "error_code": "CHARACTER_INVALID",
         "name": "curly-braces-not-in-sidecar",
         "description": "The curly brace notation is used outside of a sidecar.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {

diff --git a/tests/json_tests/COMMA_MISSING.json b/tests/json_tests/COMMA_MISSING.json
@@ -3,7 +3,7 @@
         "error_code": "COMMA_MISSING",
         "name": "comma-missing-tag-groups",
         "description": "Two tag groups are not separated by commas: (A, B)(C, D).",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -99,7 +99,7 @@
         "error_code": "COMMA_MISSING",
         "name": "comma-missing-tag-and-group",
         "description": "A tag and a tag group are not separated by commas: A(B,D).",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {

diff --git a/tests/json_tests/DEFINITION_INVALID.json b/tests/json_tests/DEFINITION_INVALID.json
@@ -3,7 +3,7 @@
         "error_code": "DEFINITION_INVALID",
         "name": "definition-invalid-tag-group",
         "description": "A Definition tag does not appear in a tag group at the top level in an annotation.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -83,7 +83,7 @@
         "error_code": "DEFINITION_INVALID",
         "name": "definition-invalid-missing-inner-group",
         "description": "A definition's enclosing tag group is missing the inner tag group (i.e., the definition's contents).",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -160,7 +160,7 @@
         "error_code": "DEFINITION_INVALID",
         "name": "definition-invalid-multiple-definition-tags",
         "description": "A definition's enclosing tag group contains more than a `Definition` tag and an inner group.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -241,7 +241,7 @@
         "error_code": "DEFINITION_INVALID",
         "name": "definition-invalid-inner-group-defs",
         "description": "A definition's inner tag group contains `Definition`, `Def` or `Def-expand` tags.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -316,7 +316,7 @@
         "error_code": "DEFINITION_INVALID",
         "name": "definition-invalid-bad-number-of-placeholders",
         "description": "A definition that includes a placeholder (`#`) does not have exactly two `#` characters.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -395,7 +395,7 @@
         "error_code": "DEFINITION_INVALID",
         "name": "definition-invalid-placeholder-incorrect-of-positions",
         "description": "A definition has placeholders (`#`) in incorrect positions.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -474,7 +474,7 @@
         "error_code": "DEFINITION_INVALID",
         "name": "definition-invalid-placeholder-conflict",
         "description": "Definitions of the same name appear with and without a `#`.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -553,7 +553,7 @@
         "error_code": "DEFINITION_INVALID",
         "name": "definition-invalid-multiple-definitions",
         "description": "Multiple `Definition` tags with same name are encountered.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -636,7 +636,7 @@
         "error_code": "DEFINITION_INVALID",
         "name": "definition-has-unique-or-required-tag",
         "description": "A tag with a required or unique attribute appears in a definition.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Event-context, Item, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -715,7 +715,7 @@
         "error_code": "DEFINITION_INVALID",
         "name": "definition-not-allowed-here",
         "description": "A definition appears in an unexpected place such as an events file or sidecar.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Item, (Label/Pie)))"],
         "tests": {
             "string_tests": {

diff --git a/tests/json_tests/DEF_EXPAND_INVALID.json b/tests/json_tests/DEF_EXPAND_INVALID.json
@@ -3,7 +3,7 @@
         "error_code": "DEF_EXPAND_INVALID",
         "name": "def-expand-invalid-name-not-definition",
         "description": "A `Def-expand` tag's name does not correspond to a definition.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -98,7 +98,7 @@
         "error_code": "DEF_EXPAND_INVALID",
         "name": "def-expand-invalid-missing-placeholder",
         "description": "A `Def-expand` is missing an expected placeholder value or has an unexpected placeholder value.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -200,7 +200,7 @@
         "error_code": "DEF_EXPAND_INVALID",
         "name": "def-expand-invalid-bad-placeholder-units",
         "description": "A `Def-expand` has a placeholder value of incorrect format or units for definition.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -300,7 +300,7 @@
         "error_code": "DEF_EXPAND_INVALID",
         "name": "def-expand-invalid-tags-not-in-definition",
         "description": "The tags within a Def-expand do not match the corresponding definition.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -399,7 +399,7 @@
         "error_code": "DEF_EXPAND_INVALID",
         "name": "def-expand-missing-inner-group",
         "description": "A Def-expand is missing its inner group containing the definition.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": [
             "(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Item, (Label/Pie)))"
         ],
@@ -492,7 +492,7 @@
         "error_code": "DEF_EXPAND_INVALID",
         "name": "def-expand-has-extras",
         "description": "A Def-expand has extra tags or groups.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": [
             "(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Item, (Label/Pie)))"
         ],

diff --git a/tests/json_tests/DEF_INVALID.json b/tests/json_tests/DEF_INVALID.json
@@ -3,7 +3,7 @@
         "error_code": "DEF_INVALID",
         "name": "def-invalid-name",
         "description": "A `Def` tag's name does not correspond to a definition.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -95,7 +95,7 @@
         "error_code": "DEF_INVALID",
         "name": "def-invalid-missing-placeholder",
         "description": "A `Def` tag is missing an expected placeholder value or has an unexpected placeholder value.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions":["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -189,7 +189,7 @@
         "error_code": "DEF_INVALID",
         "name": "def-invalid-bad-placeholder-units",
         "description": "A `Def` has a placeholder value of incorrect format or units for definition.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {

diff --git a/tests/json_tests/NODE_NAME_EMPTY.json b/tests/json_tests/NODE_NAME_EMPTY.json
@@ -3,7 +3,7 @@
         "error_code": "NODE_NAME_EMPTY",
         "name": "node-name-empty-forward-slashes",
         "description": "A tag has one or more forward slashes (`/`) at beginning or end (ignoring whitespace).",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -106,7 +106,7 @@
         "error_code": "NODE_NAME_EMPTY",
         "name": "node-name-empty-forward-consecutive",
         "description": "A tag contains consecutive forward slashes (ignoring whitespace).",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {

diff --git a/tests/json_tests/PARENTHESES_MISMATCH.json b/tests/json_tests/PARENTHESES_MISMATCH.json
@@ -3,7 +3,7 @@
         "error_code": "PARENTHESES_MISMATCH",
         "name": "parentheses-mismatch-unmatched-parentheses",
         "description": "A HED string does not have the same number of open and closed parentheses.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -98,7 +98,7 @@
         "error_code": "PARENTHESES_MISMATCH",
         "name": "parentheses-mismatch-incorrect-nesting",
         "description": "The open and closed parentheses are not correctly nested in the HED string.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {

diff --git a/tests/json_tests/PLACEHOLDER_INVALID.json b/tests/json_tests/PLACEHOLDER_INVALID.json
@@ -3,7 +3,7 @@
         "error_code": "PLACEHOLDER_INVALID",
         "name": "placeholder-invalid-misplaced",
         "description": "A `#` appears in a place that it should not (such as in the `HED` column of an event file outside a definition).",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -89,7 +89,7 @@
         "error_code": "PLACEHOLDER_INVALID",
         "name": "placeholder-invalid-#-in-categorical-column",
         "description": "A JSON sidecar has a placeholder (`#`) in the HED dictionary for a categorical column.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -170,7 +170,7 @@
         "error_code": "PLACEHOLDER_INVALID",
         "name": "placeholder-invalid-json-value-column",
         "description": "A JSON sidecar does not have exactly one placeholder (`#`) in each HED string representing a value column.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -248,7 +248,7 @@
         "error_code": "PLACEHOLDER_INVALID",
         "name": "placeholder-invalid-json-#-misplaced",
         "description": "A placeholder (`#`) is used in JSON sidecar or definition, but its parent in the schema does not have a placeholder child.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {

diff --git a/tests/json_tests/REQUIRED_TAG_MISSING.json b/tests/json_tests/REQUIRED_TAG_MISSING.json
@@ -3,7 +3,7 @@
         "error_code": "REQUIRED_TAG_MISSING",
         "name": "required-tag-missing",
         "description": "An event-level annotation does not have a tag corresponding to a node with the `required` schema attribute. (Note this is deprecated so no tests.)",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -30,7 +30,7 @@
         "error_code": "REQUIRED_TAG_MISSING",
         "name": "required-tag-in-definition",
         "description": "A required tag appears in a definition",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {

diff --git a/tests/json_tests/SIDECAR_BRACES_INVALID.json b/tests/json_tests/SIDECAR_BRACES_INVALID.json
@@ -3,7 +3,7 @@
         "error_code": "SIDECAR_BRACES_INVALID",
         "name": "sidecar-braces-contents-invalid",
         "description": "The item in curly braces is not the word HED or a column name with HED annotations in the sidecar.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -103,7 +103,7 @@
         "error_code": "VALUE_INVALID",
         "name": "sidecar-braces-invalid-spot",
         "description": "A curly brace reference must only appear where a tag could.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -721,7 +721,7 @@
         "error_code": "CHARACTER_INVALID",
         "name": "sidecar-braces-in-events-file",
         "description": "The curly braces appear in HED column of events file.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {

diff --git a/tests/json_tests/SIDECAR_INVALID.json b/tests/json_tests/SIDECAR_INVALID.json
@@ -3,7 +3,7 @@
         "error_code": "SIDECAR_INVALID",
         "name": "sidecar-invalid-key-at-wrong-level",
         "description": "The HED key is not a second-level dictionary key.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -106,7 +106,7 @@
         "error_code": "SIDECAR_INVALID",
         "name": "sidecar-invalid-na-annotated",
         "description": "An annotation entry is provided for `n/a`.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {

diff --git a/tests/json_tests/SIDECAR_KEY_MISSING.json b/tests/json_tests/SIDECAR_KEY_MISSING.json
@@ -4,7 +4,7 @@
         "name": "sidecar-key-missing",
         "description": "A value in a categorical column does not have an expected entry in a sidecar.",
         "warning": true,
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {

diff --git a/tests/json_tests/STYLE_WARNING.json b/tests/json_tests/STYLE_WARNING.json
@@ -4,7 +4,7 @@
         "name": "style-warning-bad-naming-style",
         "description": "An extension or label does not follow HED naming conventions.",
         "warning": true,
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {

diff --git a/tests/json_tests/TAG_EMPTY.json b/tests/json_tests/TAG_EMPTY.json
@@ -3,7 +3,7 @@
         "error_code": "TAG_EMPTY",
         "name": "tag-empty-extra-commas-or-parentheses",
         "description": "A HED string has extra commas or parentheses separated by only white space.",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -105,7 +105,7 @@
         "error_code": "TAG_EMPTY",
         "name": "tag-empty-begin-end-comma",
         "description": "A HED string begins or ends with a comma (ignoring white space).",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {
@@ -202,7 +202,7 @@
         "error_code": "TAG_EMPTY",
         "name": "tag-empty-empty-parentheses",
         "description": "A tag group is empty (i.e., empty parentheses are not allowed).",
-        "schema": "8.1.0",
+        "schema": "8.3.0",
         "definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
         "tests": {
             "string_tests": {