Skip to content

Commit ded268d

Browse files
committed
Fix inconsistent string/number types for error codes.
1 parent 0614cfa commit ded268d

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

bids-validator/tests/bids.spec.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ describe('BIDS example datasets ', function() {
5656
var warnings = issues.warnings
5757
var session_flag = false
5858
for (var warning in warnings) {
59-
if (warnings[warning]['code'] === '38') {
59+
if (warnings[warning]['code'] === 38) {
6060
session_flag = true
6161
break
6262
}
@@ -90,7 +90,7 @@ describe('BIDS example datasets ', function() {
9090
assert(summary.modalities.includes('bold'))
9191
assert(summary.totalFiles === 133)
9292
assert.deepEqual(errors, [])
93-
assert(warnings.length === 2 && warnings[0].code === '13')
93+
assert(warnings.length === 2 && warnings[0].code === 13)
9494
isdone()
9595
},
9696
)
@@ -111,8 +111,8 @@ describe('BIDS example datasets ', function() {
111111
assert(summary.modalities.includes('T1w'))
112112
assert(summary.modalities.includes('bold'))
113113
assert(summary.totalFiles === 8)
114-
assert(errors[0].code === '60')
115-
assert(warnings.length === 3 && warnings[0].code === '13')
114+
assert(errors[0].code === 60)
115+
assert(warnings.length === 3 && warnings[0].code === 13)
116116
isdone()
117117
})
118118
})
@@ -121,7 +121,7 @@ describe('BIDS example datasets ', function() {
121121
it('validates dataset for duplicate files present with both .nii and .nii.gz extension', function(isdone) {
122122
var options = { ignoreNiftiHeaders: false }
123123
validate.BIDS(dataDirectory + 'valid_filenames', options, function(issues) {
124-
assertErrorCode(issues.errors, '74')
124+
assertErrorCode(issues.errors, 74)
125125
isdone()
126126
})
127127
})
@@ -130,7 +130,7 @@ describe('BIDS example datasets ', function() {
130130
it('validates dataset with illegal characters in task name', function(isdone) {
131131
var options = { ignoreNiftiHeaders: false }
132132
validate.BIDS(dataDirectory + 'valid_filenames', options, function(issues) {
133-
assertErrorCode(issues.errors, '58')
133+
assertErrorCode(issues.errors, 58)
134134
isdone()
135135
})
136136
})
@@ -139,15 +139,15 @@ describe('BIDS example datasets ', function() {
139139
it('validates dataset with illegal characters in sub name', function(isdone) {
140140
var options = { ignoreNiftiHeaders: false }
141141
validate.BIDS(dataDirectory + 'valid_filenames', options, function(issues) {
142-
assertErrorCode(issues.errors, '64')
142+
assertErrorCode(issues.errors, 64)
143143
isdone()
144144
})
145145
})
146146

147147
it('checks for subjects with no valid data', function(isdone) {
148148
var options = { ignoreNiftiHeaders: true }
149149
validate.BIDS(dataDirectory + 'no_valid_data', options, function(issues) {
150-
assertErrorCode(issues.errors, '67')
150+
assertErrorCode(issues.errors, 67)
151151
isdone()
152152
})
153153
})
@@ -168,7 +168,7 @@ describe('BIDS example datasets ', function() {
168168
assert(summary.modalities.includes('bold'))
169169
assert(summary.totalFiles === 133)
170170
assert.deepEqual(errors, [])
171-
assert(warnings.length === 2 && warnings[0].code === '13')
171+
assert(warnings.length === 2 && warnings[0].code === 13)
172172
isdone()
173173
},
174174
)
@@ -179,7 +179,7 @@ describe('BIDS example datasets ', function() {
179179
validate.BIDS(dataDirectory + 'unused_data_dict', options, function(
180180
issues,
181181
) {
182-
assert.notEqual(issues.errors.findIndex(issue => issue.code === '90'), -1)
182+
assert.notEqual(issues.errors.findIndex(issue => issue.code === 90), -1)
183183
isdone()
184184
})
185185
})
@@ -191,7 +191,7 @@ describe('BIDS example datasets ', function() {
191191
options,
192192
function(issues) {
193193
assert.notEqual(
194-
issues.errors.findIndex(issue => issue.code === '91'),
194+
issues.errors.findIndex(issue => issue.code === 91),
195195
-1,
196196
)
197197
isdone()

bids-validator/utils/issues/index.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ var issues = {
5555
})
5656

5757
// organize by issue code
58-
var categorized = {}
59-
var codes = []
58+
const categorized = {}
59+
const codes = []
6060
for (var i = 0; i < issueList.length; i++) {
6161
var issue = issueList[i]
6262

@@ -81,11 +81,13 @@ var issues = {
8181
}
8282
}
8383

84-
var severityMap = config.interpret(codes, options.config)
84+
const severityMap = config.interpret(codes, options.config)
8585

8686
// organize by severity
87-
for (var code in categorized) {
88-
if (code !== undefined) {
87+
for (const codePropertyName in categorized) {
88+
if (codePropertyName !== undefined) {
89+
// Properties are always strings but error codes are always integers
90+
const code = parseInt(codePropertyName)
8991
issue = categorized[code]
9092
issue.code = code
9193

0 commit comments

Comments
 (0)