Skip to content

Commit 2bf440d

Browse files
rwblairrwblair
authored
Merge pull request #1013 from happy5214/actually-validate-hed
Actually validate HED input
2 parents 46f315e + 37b909b commit 2bf440d

File tree

3 files changed

+83
-148
lines changed

3 files changed

+83
-148
lines changed

‎bids-validator/tests/events.spec.js‎

Lines changed: 35 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ describe('Events', function() {
2222
directory: [{ relativePath: '/stimuli/images/blue-square.jpg' }],
2323
}
2424
return validate.Events.validateEvents([], stimuli, [], {}).then(issues => {
25-
assert(issues.length === 1 && issues[0].code === 77)
25+
assert.strictEqual(issues.length, 1)
26+
assert.strictEqual(issues[0].code, 77)
2627
})
2728
})
2829

@@ -32,7 +33,7 @@ describe('Events', function() {
3233
directory: [{ relativePath: '/stimuli/images/red-square.jpg' }],
3334
}
3435
return validate.Events.validateEvents([], stimuli, [], {}).then(issues => {
35-
assert(issues.length === 0)
36+
assert.deepStrictEqual(issues, [])
3637
})
3738
})
3839

@@ -56,7 +57,8 @@ describe('Events', function() {
5657
headers,
5758
jsonDictionary,
5859
).then(issues => {
59-
assert(issues.length === 1 && issues[0].code === 85)
60+
assert.strictEqual(issues.length, 1)
61+
assert.strictEqual(issues[0].code, 85)
6062
})
6163
})
6264

@@ -80,7 +82,8 @@ describe('Events', function() {
8082
headers,
8183
jsonDictionary,
8284
).then(issues => {
83-
assert(issues.length === 1 && issues[0].code === 86)
85+
assert.strictEqual(issues.length, 1)
86+
assert.strictEqual(issues[0].code, 86)
8487
})
8588
})
8689

@@ -104,7 +107,7 @@ describe('Events', function() {
104107
headers,
105108
jsonDictionary,
106109
).then(issues => {
107-
assert.deepEqual(issues, [])
110+
assert.deepStrictEqual(issues, [])
108111
})
109112
})
110113

@@ -120,9 +123,7 @@ describe('Events', function() {
120123
},
121124
]
122125
const jsonDictionary = {
123-
'/sub01/sub01_task-test_bold.json': {
124-
RepetitionTime: 1,
125-
},
126+
'/sub01/sub01_task-test_events.json': {},
126127
}
127128

128129
return validate.Events.validateEvents(
@@ -147,9 +148,7 @@ describe('Events', function() {
147148
},
148149
]
149150
const jsonDictionary = {
150-
'/sub01/sub01_task-test_bold.json': {
151-
RepetitionTime: 1,
152-
},
151+
'/sub01/sub01_task-test_events.json': {},
153152
}
154153

155154
return validate.Events.validateEvents(
@@ -173,9 +172,7 @@ describe('Events', function() {
173172
},
174173
]
175174
const jsonDictionary = {
176-
'/sub01/sub01_task-test_bold.json': {
177-
RepetitionTime: 1,
178-
},
175+
'/sub01/sub01_task-test_events.json': {},
179176
}
180177

181178
return validate.Events.validateEvents(
@@ -200,9 +197,7 @@ describe('Events', function() {
200197
},
201198
]
202199
const jsonDictionary = {
203-
'/sub01/sub01_task-test_bold.json': {
204-
RepetitionTime: 1,
205-
},
200+
'/sub01/sub01_task-test_events.json': {},
206201
}
207202

208203
return validate.Events.validateEvents(
@@ -226,8 +221,7 @@ describe('Events', function() {
226221
},
227222
]
228223
const jsonDictionary = {
229-
'/sub01/sub01_task-test_bold.json': {
230-
RepetitionTime: 1,
224+
'/sub01/sub01_task-test_events.json': {
231225
mycodes: {
232226
HED: {
233227
first: 'Event/Category/Miscellaneous/Test',
@@ -259,8 +253,7 @@ describe('Events', function() {
259253
},
260254
]
261255
const jsonDictionary = {
262-
'/sub01/sub01_task-test_bold.json': {
263-
RepetitionTime: 1,
256+
'/sub01/sub01_task-test_events.json': {
264257
mycodes: {
265258
HED: {
266259
first: 'Event/Category/Miscellaneous/Test',
@@ -292,8 +285,7 @@ describe('Events', function() {
292285
},
293286
]
294287
const jsonDictionary = {
295-
'/sub01/sub01_task-test_bold.json': {
296-
RepetitionTime: 1,
288+
'/sub01/sub01_task-test_events.json': {
297289
mycodes: {
298290
HED: {
299291
first:
@@ -323,8 +315,7 @@ describe('Events', function() {
323315
},
324316
]
325317
const jsonDictionary = {
326-
'/sub01/sub01_task-test_bold.json': {
327-
RepetitionTime: 1,
318+
'/sub01/sub01_task-test_events.json': {
328319
mycodes: {
329320
HED: {
330321
first:
@@ -356,8 +347,7 @@ describe('Events', function() {
356347
},
357348
]
358349
const jsonDictionary = {
359-
'/sub01/sub01_task-test_bold.json': {
360-
RepetitionTime: 1,
350+
'/sub01/sub01_task-test_events.json': {
361351
mycodes: {
362352
HED: {
363353
first:
@@ -391,8 +381,7 @@ describe('Events', function() {
391381
},
392382
]
393383
const jsonDictionary = {
394-
'/sub01/sub01_task-test_bold.json': {
395-
RepetitionTime: 1,
384+
'/sub01/sub01_task-test_events.json': {
396385
mycodes: {
397386
HED: {
398387
first:
@@ -425,8 +414,7 @@ describe('Events', function() {
425414
},
426415
]
427416
const jsonDictionary = {
428-
'/sub01/sub01_task-test_bold.json': {
429-
RepetitionTime: 1,
417+
'/sub01/sub01_task-test_events.json': {
430418
testingCodes: {
431419
HED: {
432420
first:
@@ -466,8 +454,7 @@ describe('Events', function() {
466454
},
467455
]
468456
const jsonDictionary = {
469-
'/sub01/sub01_task-test_bold.json': {
470-
RepetitionTime: 1,
457+
'/sub01/sub01_task-test_events.json': {
471458
testingCodes: {
472459
HED: {
473460
first:
@@ -507,8 +494,7 @@ describe('Events', function() {
507494
},
508495
]
509496
const jsonDictionary = {
510-
'/sub01/sub01_task-test_bold.json': {
511-
RepetitionTime: 1,
497+
'/sub01/sub01_task-test_events.json': {
512498
testingCodes: {
513499
HED: {
514500
first:
@@ -545,8 +531,7 @@ describe('Events', function() {
545531
},
546532
]
547533
const jsonDictionary = {
548-
'/sub01/sub01_task-test_bold.json': {
549-
RepetitionTime: 1,
534+
'/sub01/sub01_task-test_events.json': {
550535
mycodes: {
551536
HED: {
552537
first: 'Event/Category/Experimental stimulus',
@@ -578,9 +563,7 @@ describe('Events', function() {
578563
},
579564
]
580565
const jsonDictionary = {
581-
'/sub01/sub01_task-test_bold.json': {
582-
RepetitionTime: 1,
583-
},
566+
'/sub01/sub01_task-test_events.json': {},
584567
}
585568

586569
return validate.Events.validateEvents(
@@ -605,9 +588,7 @@ describe('Events', function() {
605588
},
606589
]
607590
const jsonDictionary = {
608-
'/sub01/sub01_task-test_bold.json': {
609-
RepetitionTime: 1,
610-
},
591+
'/sub01/sub01_task-test_events.json': {},
611592
}
612593

613594
return validate.Events.validateEvents(
@@ -632,9 +613,7 @@ describe('Events', function() {
632613
},
633614
]
634615
const jsonDictionary = {
635-
'/sub01/sub01_task-test_bold.json': {
636-
RepetitionTime: 1,
637-
},
616+
'/sub01/sub01_task-test_events.json': {},
638617
}
639618

640619
return validate.Events.validateEvents(
@@ -659,9 +638,7 @@ describe('Events', function() {
659638
},
660639
]
661640
const jsonDictionary = {
662-
'/sub01/sub01_task-test_bold.json': {
663-
RepetitionTime: 1,
664-
},
641+
'/sub01/sub01_task-test_events.json': {},
665642
}
666643

667644
return validate.Events.validateEvents(
@@ -686,9 +663,7 @@ describe('Events', function() {
686663
},
687664
]
688665
const jsonDictionary = {
689-
'/sub01/sub01_task-test_bold.json': {
690-
RepetitionTime: 1,
691-
},
666+
'/sub01/sub01_task-test_events.json': {},
692667
}
693668

694669
return validate.Events.validateEvents(
@@ -713,9 +688,7 @@ describe('Events', function() {
713688
},
714689
]
715690
const jsonDictionary = {
716-
'/sub01/sub01_task-test_bold.json': {
717-
RepetitionTime: 1,
718-
},
691+
'/sub01/sub01_task-test_events.json': {},
719692
}
720693

721694
return validate.Events.validateEvents(
@@ -740,9 +713,7 @@ describe('Events', function() {
740713
},
741714
]
742715
const jsonDictionary = {
743-
'/sub01/sub01_task-test_bold.json': {
744-
RepetitionTime: 1,
745-
},
716+
'/sub01/sub01_task-test_events.json': {},
746717
}
747718

748719
return validate.Events.validateEvents(
@@ -767,9 +738,7 @@ describe('Events', function() {
767738
},
768739
]
769740
const jsonDictionary = {
770-
'/sub01/sub01_task-test_bold.json': {
771-
RepetitionTime: 1,
772-
},
741+
'/sub01/sub01_task-test_events.json': {},
773742
}
774743

775744
return validate.Events.validateEvents(
@@ -794,9 +763,7 @@ describe('Events', function() {
794763
},
795764
]
796765
const jsonDictionary = {
797-
'/sub01/sub01_task-test_bold.json': {
798-
RepetitionTime: 1,
799-
},
766+
'/sub01/sub01_task-test_events.json': {},
800767
}
801768

802769
return validate.Events.validateEvents(
@@ -821,9 +788,7 @@ describe('Events', function() {
821788
},
822789
]
823790
const jsonDictionary = {
824-
'/sub01/sub01_task-test_bold.json': {
825-
RepetitionTime: 1,
826-
},
791+
'/sub01/sub01_task-test_events.json': {},
827792
}
828793

829794
return validate.Events.validateEvents(
@@ -848,9 +813,7 @@ describe('Events', function() {
848813
},
849814
]
850815
const jsonDictionary = {
851-
'/sub01/sub01_task-test_bold.json': {
852-
RepetitionTime: 1,
853-
},
816+
'/sub01/sub01_task-test_events.json': {},
854817
}
855818

856819
return validate.Events.validateEvents(
@@ -875,9 +838,7 @@ describe('Events', function() {
875838
},
876839
]
877840
const jsonDictionary = {
878-
'/sub01/sub01_task-test_bold.json': {
879-
RepetitionTime: 1,
880-
},
841+
'/sub01/sub01_task-test_events.json': {},
881842
}
882843

883844
return validate.Events.validateEvents(
@@ -902,9 +863,7 @@ describe('Events', function() {
902863
},
903864
]
904865
const jsonDictionary = {
905-
'/sub01/sub01_task-test_bold.json': {
906-
RepetitionTime: 1,
907-
},
866+
'/sub01/sub01_task-test_events.json': {},
908867
}
909868

910869
return validate.Events.validateEvents(

‎bids-validator/validators/bids/fullTest.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,7 @@ const fullTest = (fileList, options, annexed, dir, callback) => {
176176

177177
// Events validation
178178
stimuli.directory = files.stimuli
179-
return Events.validateEvents(
180-
events,
181-
stimuli,
182-
headers,
183-
jsonContentsDict,
184-
self.issues,
185-
)
179+
return Events.validateEvents(events, stimuli, headers, jsonContentsDict)
186180
})
187181
.then(eventsIssues => {
188182
self.issues = self.issues.concat(eventsIssues)

0 commit comments

Comments
 (0)