diff --git a/converter/__tests__/converter.js b/converter/__tests__/converter.js index 19618341..2c576bb4 100644 --- a/converter/__tests__/converter.js +++ b/converter/__tests__/converter.js @@ -4,7 +4,7 @@ const schema = require('../schema') const generateIssue = require('../issues') describe('HED string conversion', () => { - const hedSchemaFile = 'tests/data/HED8.0.0-beta.5.xml' + const hedSchemaFile = 'tests/data/HED8.0.0.xml' let schemaPromise beforeAll(() => { diff --git a/tests/data/HED8.0.0-beta.5.xml b/tests/data/HED8.0.0.xml similarity index 99% rename from tests/data/HED8.0.0-beta.5.xml rename to tests/data/HED8.0.0.xml index 2eb35076..d9a89785 100644 --- a/tests/data/HED8.0.0-beta.5.xml +++ b/tests/data/HED8.0.0.xml @@ -1,6 +1,6 @@ - - This schema is the first version that includes an xsd and requires unit class, unit modifier, value class, schema attribute and property sections. + + This schema is the first official release that includes an xsd and requires unit class, unit modifier, value class, schema attribute and property sections. @@ -21,7 +21,7 @@ Agent-action - Any action engaged in by an agent (see the Agent subtree for agent categories). A participant response to an experiment stimulus should include the tag Agent-property/Agent-task-role/Experimental-participant. + Any action engaged in by an agent (see the Agent subtree for agent categories). A participant response to an experiment stimulus should include the tag Agent-property/Agent-task-role/Experiment-participant. suggestedTag Task-event-role @@ -30,7 +30,7 @@ Data-feature - An event marking the occurrence of a data feature such as an interictal spike or alpha burst, often added post hoc to the data record. + An event marking the occurrence of a data feature such as an interictal spike or alpha burst that is often added post hoc to the data record. suggestedTag Data-property @@ -555,6 +555,10 @@ Move at a regular pace by lifting and setting down each foot in turn never having both feet off the ground at once. + + Move-torso + Move body trunk. + Move-upper-extremity Move arm, shoulder, and/or hand. @@ -2645,14 +2649,28 @@ Backward Directed behind or to the rear. + + relatedTag + Forward + Downward Moving or leading toward a lower place or level. + + relatedTag + Leftward + Rightward + Upward + Forward At or near or directed toward the front. + + relatedTag + Backward + Horizontally-oriented @@ -2661,22 +2679,44 @@ Leftward Going toward or facing the left. + + relatedTag + Downward + Rightward + Upward + Oblique Slanting or inclined in direction or course or position; neither parallel nor perpendicular nor right-angular. + + relatedTag + Rotated + Rightward Going toward or situated on the right. + + relatedTag + Downward + Leftward + Upward + Rotated - Move or cause to move in a circle around an axis or center. + Positioned offset around an axis or center. Upward Moving, pointing, or leading to a higher place, point, or level. + + relatedTag + Downward + Leftward + Rightward + Vertically-oriented @@ -5911,14 +5951,14 @@ Should be in 24-hour format. - - weightUnits + + volumeUnits defaultUnits - g + m^3 - g + m^3 SIUnit @@ -5926,20 +5966,27 @@ unitSymbol + + + weightUnits + + defaultUnits + g + - gram + g SIUnit + + unitSymbol + - g + gram SIUnit - - unitSymbol - pound @@ -5948,22 +5995,6 @@ lb - - volumeUnits - - defaultUnits - m^3 - - - m^3 - - SIUnit - - - unitSymbol - - - diff --git a/tests/dataset.spec.js b/tests/dataset.spec.js index 8cc5baf7..a55dbe5f 100644 --- a/tests/dataset.spec.js +++ b/tests/dataset.spec.js @@ -5,7 +5,7 @@ const generateValidationIssue = require('../utils/issues/issues').generateIssue const generateConverterIssue = require('../converter/issues') describe('HED dataset validation', () => { - const hedSchemaFile = 'tests/data/HED8.0.0-beta.5.xml' + const hedSchemaFile = 'tests/data/HED8.0.0.xml' let hedSchemaPromise beforeAll(() => { diff --git a/tests/event.spec.js b/tests/event.spec.js index c59cf5a3..b1b7589b 100644 --- a/tests/event.spec.js +++ b/tests/event.spec.js @@ -890,7 +890,7 @@ describe('HED string and event validation', () => { }) describe('HED-3G schemas', () => { - const hedSchemaFile = 'tests/data/HED8.0.0-beta.5.xml' + const hedSchemaFile = 'tests/data/HED8.0.0.xml' let hedSchemaPromise beforeAll(() => { diff --git a/tests/schema.spec.js b/tests/schema.spec.js index 0c851cac..1128f399 100644 --- a/tests/schema.spec.js +++ b/tests/schema.spec.js @@ -5,7 +5,7 @@ const schemaUtils = require('../utils/schema') describe('HED schemas', () => { describe('Remote HED schemas', () => { it('can be loaded from a central GitHub repository', () => { - const remoteHedSchemaVersion = '7.1.1' + const remoteHedSchemaVersion = '8.0.0' return schema .buildSchema({ version: remoteHedSchemaVersion }) .then((hedSchemas) => { @@ -314,7 +314,7 @@ describe('HED schemas', () => { }) describe('HED-3G schemas', () => { - const localHedSchemaFile = 'tests/data/HED8.0.0-beta.5.xml' + const localHedSchemaFile = 'tests/data/HED8.0.0.xml' let hedSchemaPromise beforeAll(() => { @@ -446,7 +446,7 @@ describe('HED schemas', () => { ) } - const expectedTagCount = 1108 + const expectedTagCount = 1109 const expectedUnitClassCount = 28 - 1 assert.lengthOf( Object.keys(hedSchemas.baseSchema.attributes.tags),