Skip to content

Commit c9dc192

Browse files
Remi-GauRemi-Gau
committed
refactor tests and mh autofix
1 parent 30191a9 commit c9dc192

File tree

2 files changed

+53
-108
lines changed

2 files changed

+53
-108
lines changed

‎src/createFilename.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,18 +176,18 @@
176176
runSuffix, echoSuffix];
177177

178178
case 'beh'
179-
179+
180180
basename = ...
181181
[fileNameBase, ...
182182
acqSuffix, ...
183183
runSuffix];
184-
184+
185185
otherwise
186186

187187
basename = [fileNameBase, runSuffix];
188188

189189
end
190-
190+
191191
cfg.fileName.events = [basename, '_events_date-' thisDate '.tsv'];
192192

193193
cfg.fileName.stim = [basename, recordingSuffix, '_stim_date-' thisDate '.tsv'];

‎tests/test_createFilename.m‎

Lines changed: 50 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,14 @@
88

99
function test_createFilenameBasic()
1010

11-
outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
12-
1311
%% set up
1412

15-
cfg.verbose = true;
16-
cfg.subject.subjectNb = 1;
17-
cfg.subject.runNb = 1;
18-
cfg.task.name = 'test task';
19-
cfg.dir.output = outputDir;
13+
cfg = setUp();
2014

2115
cfg = createFilename(cfg);
2216

2317
%% data to test against
24-
behDir = fullfile(outputDir, 'source', 'sub-001', 'ses-001', 'beh');
18+
behDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'beh');
2519

2620
eventFilename = ['sub-001_ses-001_task-testTask_run-001_events_date-'...
2721
cfg.fileName.date '.tsv'];
@@ -44,17 +38,9 @@ function test_createFilenameBasic()
4438

4539
function test_createFilenameMriEyetracker()
4640

47-
outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
48-
4941
%% set up
5042

51-
cfg.verbose = true;
52-
cfg.subject.subjectGrp = 'ctrl';
53-
cfg.subject.subjectNb = 2;
54-
cfg.subject.sessionNb = 2;
55-
cfg.subject.runNb = 2;
56-
cfg.task.name = 'test task';
57-
cfg.dir.output = outputDir;
43+
cfg = setUp();
5844

5945
cfg.eyeTracker.do = true;
6046
cfg.testingDevice = 'mri';
@@ -63,17 +49,17 @@ function test_createFilenameMriEyetracker()
6349

6450
%% data to test against
6551

66-
funcDir = fullfile(outputDir, 'source', 'sub-ctrl002', 'ses-002', 'func');
52+
funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'func');
6753

68-
eyetrackerDir = fullfile(outputDir, 'source', 'sub-ctrl002', 'ses-002', 'func');
54+
eyetrackerDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'func');
6955

70-
baseFilename = 'sub-ctrl002_ses-002_task-testTask';
56+
baseFilename = 'sub-001_ses-001_task-testTask';
7157

72-
eventFilename = ['sub-ctrl002_ses-002_task-testTask_run-002_events_date-' ...
58+
eventFilename = ['sub-001_ses-001_task-testTask_run-001_events_date-' ...
7359
cfg.fileName.date '.tsv'];
7460

7561
eyetrackerFilename = [ ...
76-
'sub-ctrl002_ses-002_task-testTask_run-002_recording-eyetracking_physio_date-' ...
62+
'sub-001_ses-001_task-testTask_run-001_recording-eyetracking_physio_date-' ...
7763
cfg.fileName.date '.edf'];
7864

7965
%% tests
@@ -92,19 +78,10 @@ function test_createFilenameMriEyetracker()
9278

9379
function test_createFilenameMriSuffix()
9480

95-
outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
96-
9781
%% set up
9882

99-
cfg.verbose = true;
100-
cfg.subject.subjectGrp = 'ssri';
101-
cfg.subject.subjectNb = 3;
102-
cfg.subject.sessionNb = 4;
103-
cfg.subject.runNb = 5;
104-
cfg.task.name = 'rest';
105-
cfg.dir.output = outputDir;
83+
cfg = setUp();
10684

107-
cfg.eyeTracker.do = false;
10885
cfg.testingDevice = 'mri';
10986

11087
cfg.suffix.recording = 'respi pulse';
@@ -118,18 +95,18 @@ function test_createFilenameMriSuffix()
11895

11996
%% data to test against
12097

121-
funcDir = fullfile(outputDir, 'source', 'sub-ssri003', 'ses-004', 'func');
98+
funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'func');
12299

123-
baseFilename = 'sub-ssri003_ses-004_task-rest';
100+
baseFilename = 'sub-001_ses-001_task-testTask';
124101

125-
eventFilename = ['sub-ssri003_ses-004_task-rest', ...
102+
eventFilename = ['sub-001_ses-001_task-testTask', ...
126103
'_acq-newTYpe_ce-test_dir-yPos_rec-fastRecon', ...
127-
'_run-005_echo-1_events_date-' ...
104+
'_run-001_echo-1_events_date-' ...
128105
cfg.fileName.date '.tsv'];
129-
130-
stimFilename = ['sub-ssri003_ses-004_task-rest', ...
106+
107+
stimFilename = ['sub-001_ses-001_task-testTask', ...
131108
'_acq-newTYpe_ce-test_dir-yPos_rec-fastRecon', ...
132-
'_run-005_echo-1_recording-respiPulse_stim_date-' ...
109+
'_run-001_echo-1_recording-respiPulse_stim_date-' ...
133110
cfg.fileName.date '.tsv'];
134111

135112
%% tests
@@ -145,18 +122,10 @@ function test_createFilenameMriSuffix()
145122

146123
function test_createFilenameBehSuffix()
147124

148-
outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
149-
150125
%% set up
151126

152-
cfg.verbose = true;
153-
cfg.subject.subjectGrp = 'ssri';
154-
cfg.subject.subjectNb = 2;
155-
cfg.subject.runNb = 3;
156-
cfg.task.name = 'rest';
157-
cfg.dir.output = outputDir;
127+
cfg = setUp();
158128

159-
cfg.eyeTracker.do = false;
160129
cfg.testingDevice = 'pc';
161130

162131
cfg.suffix.recording = 'respi pulse';
@@ -170,18 +139,18 @@ function test_createFilenameBehSuffix()
170139

171140
%% data to test against
172141

173-
funcDir = fullfile(outputDir, 'source', 'sub-ssri002', 'ses-001', 'beh');
142+
funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'beh');
174143

175-
baseFilename = 'sub-ssri002_ses-001_task-rest';
144+
baseFilename = 'sub-001_ses-001_task-testTask';
176145

177-
eventFilename = ['sub-ssri002_ses-001_task-rest', ...
146+
eventFilename = ['sub-001_ses-001_task-testTask', ...
178147
'_acq-newTYpe', ...
179-
'_run-003_events_date-' ...
148+
'_run-001_events_date-' ...
180149
cfg.fileName.date '.tsv'];
181-
182-
stimFilename = ['sub-ssri002_ses-001_task-rest', ...
150+
151+
stimFilename = ['sub-001_ses-001_task-testTask', ...
183152
'_acq-newTYpe', ...
184-
'_run-003_recording-respiPulse_stim_date-' ...
153+
'_run-001_recording-respiPulse_stim_date-' ...
185154
cfg.fileName.date '.tsv'];
186155

187156
%% tests
@@ -192,23 +161,15 @@ function test_createFilenameBehSuffix()
192161
assertEqual(cfg.fileName.base, baseFilename);
193162
assertEqual(cfg.fileName.events, eventFilename);
194163
assertEqual(cfg.fileName.stim, stimFilename);
195-
196164

197165
end
198166

199167
function test_createFilenameEegSuffix()
200168

201-
outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
202-
203169
%% set up
204170

205-
cfg.verbose = true;
206-
cfg.subject.subjectNb = 2;
207-
cfg.subject.runNb = 3;
208-
cfg.task.name = 'rest';
209-
cfg.dir.output = outputDir;
171+
cfg = setUp();
210172

211-
cfg.eyeTracker.do = false;
212173
cfg.testingDevice = 'eeg';
213174

214175
cfg.suffix.recording = 'respi pulse';
@@ -222,16 +183,16 @@ function test_createFilenameEegSuffix()
222183

223184
%% data to test against
224185

225-
funcDir = fullfile(outputDir, 'source', 'sub-002', 'ses-001', 'eeg');
186+
funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'eeg');
226187

227-
baseFilename = 'sub-002_ses-001_task-rest';
188+
baseFilename = 'sub-001_ses-001_task-testTask';
228189

229-
eventFilename = ['sub-002_ses-001_task-rest', ...
230-
'_run-003_events_date-' ...
190+
eventFilename = ['sub-001_ses-001_task-testTask', ...
191+
'_run-001_events_date-' ...
231192
cfg.fileName.date '.tsv'];
232-
233-
stimFilename = ['sub-002_ses-001_task-rest', ...
234-
'_run-003_recording-respiPulse_stim_date-' ...
193+
194+
stimFilename = ['sub-001_ses-001_task-testTask', ...
195+
'_run-001_recording-respiPulse_stim_date-' ...
235196
cfg.fileName.date '.tsv'];
236197

237198
%% tests
@@ -242,32 +203,23 @@ function test_createFilenameEegSuffix()
242203
assertEqual(cfg.fileName.base, baseFilename);
243204
assertEqual(cfg.fileName.events, eventFilename);
244205
assertEqual(cfg.fileName.stim, stimFilename);
245-
246206

247207
end
248208

249209
function test_createFilenameEeg()
250210

251-
outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
252-
253211
%% set up
254212

255-
cfg.verbose = true;
256-
cfg.subject.subjectGrp = 'blind';
257-
cfg.subject.subjectNb = 3;
258-
cfg.subject.sessionNb = 1;
259-
cfg.subject.runNb = 1;
260-
cfg.task.name = 'test task';
261-
cfg.dir.output = outputDir;
213+
cfg = setUp();
262214

263215
cfg.testingDevice = 'eeg';
264216

265217
cfg = createFilename(cfg);
266218

267219
%% data to test against
268-
eegDir = fullfile(outputDir, 'source', 'sub-blind003', 'ses-001', 'eeg');
220+
eegDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'eeg');
269221

270-
eventFilename = ['sub-blind003_ses-001_task-testTask_run-001_events_date-'...
222+
eventFilename = ['sub-001_ses-001_task-testTask_run-001_events_date-'...
271223
cfg.fileName.date '.tsv'];
272224

273225
%% test
@@ -281,60 +233,53 @@ function test_createFilenameEeg()
281233

282234
function test_createFilenameIeeg()
283235

284-
outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
285-
286236
%% set up
287237

288-
cfg.verbose = true;
289-
cfg.subject.subjectGrp = 'blind';
290-
cfg.subject.subjectNb = 3;
291-
cfg.subject.sessionNb = 1;
292-
cfg.subject.runNb = 1;
293-
cfg.task.name = 'test task';
294-
cfg.dir.output = outputDir;
238+
cfg = setUp();
295239

296240
cfg.testingDevice = 'ieeg';
297241

298242
cfg = createFilename(cfg);
299243

300244
%% data to test against
301-
ieegDir = fullfile(outputDir, 'source', 'sub-blind003', 'ses-001', 'ieeg');
245+
ieegDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'ieeg');
302246

303247
%% test
304248
% make sure the func dir is created
305249
assertTrue(exist(ieegDir, 'dir') == 7);
306250

307-
eventFilename = ['sub-blind003_ses-001_task-testTask_run-001_events_date-'...
251+
eventFilename = ['sub-001_ses-001_task-testTask_run-001_events_date-'...
308252
cfg.fileName.date '.tsv'];
309253

310254
end
311255

312256
function test_createFilenameMeg()
313257

314-
outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
315-
316258
%% set up
317259

318-
cfg.verbose = true;
319-
cfg.subject.subjectGrp = 'blind';
320-
cfg.subject.subjectNb = 3;
321-
cfg.subject.sessionNb = 1;
322-
cfg.subject.runNb = 1;
323-
cfg.task.name = 'test task';
324-
cfg.dir.output = outputDir;
260+
cfg = setUp();
325261

326262
cfg.testingDevice = 'meg';
327263

328264
cfg = createFilename(cfg);
329265

330266
%% data to test against
331-
megDir = fullfile(outputDir, 'source', 'sub-blind003', 'ses-001', 'meg');
267+
megDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'meg');
332268

333269
%% test
334270
% make sure the func dir is created
335271
assertTrue(exist(megDir, 'dir') == 7);
336272

337-
eventFilename = ['sub-blind003_ses-001_task-testTask_run-001_events_date-'...
273+
eventFilename = ['sub-001_ses-001_task-testTask_run-001_events_date-'...
338274
cfg.fileName.date '.tsv'];
339275

340276
end
277+
278+
function cfg = setUp()
279+
outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
280+
cfg.verbose = true;
281+
cfg.subject.subjectNb = 1;
282+
cfg.subject.runNb = 1;
283+
cfg.task.name = 'test task';
284+
cfg.dir.output = outputDir;
285+
end

0 commit comments

Comments
 (0)