Skip to content

Commit e8a469e

Browse files
CerenBCerenB
committed
tests without expParam
1 parent c2ac97f commit e8a469e

11 files changed

+150
-151
lines changed

‎tests/test_checkCFG.m‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
function test_checkCFG()
22

3-
expParameters.outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
4-
[cfg, expParameters] = checkCFG([], expParameters);
3+
cfg.outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
4+
cfg = checkCFG(cfg);
55

66
expectedStructure = returnExpectedStructure();
7-
expectedStructure.outputDir = expParameters.outputDir;
7+
expectedStructure.outputDir = cfg.outputDir;
8+
expectedStructure.testingDevice = 'pc';
89

9-
assert(isequal(expectedStructure, expParameters));
10+
assert(isequal(expectedStructure, cfg));
1011

1112
%%
1213
fprintf('\n--------------------------------------------------------------------');
@@ -15,20 +16,20 @@ function test_checkCFG()
1516

1617
outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
1718

18-
expParameters.subjectNb = 1;
19-
expParameters.runNb = 1;
20-
expParameters.task = 'testtask';
21-
expParameters.outputDir = outputDir;
19+
cfg.subjectNb = 1;
20+
cfg.runNb = 1;
21+
cfg.task = 'testtask';
22+
cfg.outputDir = outputDir;
2223

23-
expParameters.bids.datasetDescription.Name = 'dummy';
24-
expParameters.bids.datasetDescription.BIDSVersion = '1.0.0';
25-
expParameters.bids.datasetDescription.Authors = {'Jane Doe', 'John Doe'};
24+
cfg.bids.datasetDescription.Name = 'dummy';
25+
cfg.bids.datasetDescription.BIDSVersion = '1.0.0';
26+
cfg.bids.datasetDescription.Authors = {'Jane Doe', 'John Doe'};
2627

27-
expParameters.bids.MRI.RepetitionTime = 1.56;
28+
cfg.bids.MRI.RepetitionTime = 1.56;
2829

2930
cfg.testingDevice = 'mri';
3031

31-
[~, expParameters] = checkCFG(cfg, expParameters);
32+
cfg = checkCFG(cfg);
3233

3334
%%% test
3435

@@ -40,6 +41,7 @@ function test_checkCFG()
4041
expectedStructure.outputDir = outputDir;
4142

4243
expectedStructure.task = 'testtask';
44+
expectedStructure.testingDevice = 'mri'
4345

4446
expectedStructure.bids.MRI.RepetitionTime = 1.56;
4547
expectedStructure.bids.MRI.TaskName = 'testtask';
@@ -50,7 +52,7 @@ function test_checkCFG()
5052

5153
expectedStructure = orderfields(expectedStructure);
5254

53-
assert(isequal(expectedStructure, expParameters));
55+
assert(isequal(expectedStructure, cfg));
5456

5557
fprintf('\n');
5658

@@ -63,7 +65,9 @@ function test_checkCFG()
6365

6466
expectedStructure.verbose = 0;
6567
expectedStructure.askGrpSess = [true true];
66-
68+
69+
expectedStructure.eyeTracker = false;
70+
6771
expectedStructure.MRI.ce = [];
6872
expectedStructure.MRI.dir = [];
6973
expectedStructure.MRI.rec = [];

‎tests/test_createBoldJson.m‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ function test_createBoldJson()
44

55
%%% set up part
66

7-
expParameters.subjectNb = 1;
8-
expParameters.runNb = 1;
9-
expParameters.task = 'testtask';
10-
expParameters.outputDir = outputDir;
7+
cfg.subjectNb = 1;
8+
cfg.runNb = 1;
9+
cfg.task = 'testtask';
10+
cfg.outputDir = outputDir;
1111

12-
cfg = struct();
12+
%cfg = struct();
1313
cfg.testingDevice = 'mri';
1414

15-
[cfg, expParameters] = createFilename(cfg, expParameters); %#ok<*ASGLU>
15+
cfg = createFilename(cfg);
1616

17-
logFile = saveEventsFile('init', expParameters); %#ok<*NASGU>
17+
logFile = saveEventsFile('init', cfg); %#ok<*NASGU>
1818

19-
createBoldJson(expParameters);
19+
createBoldJson(cfg);
2020

2121
%%% test part
2222

2323
% test data
2424
funcDir = fullfile(outputDir, 'source', 'sub-001', 'ses-001', 'func');
2525
eventFilename = ['sub-001_ses-001_task-testtask_run-001_bold_date-' ...
26-
expParameters.date '.json'];
26+
cfg.date '.json'];
2727

2828
% check that the file has the right path and name
2929
assert(exist(fullfile(funcDir, eventFilename), 'file') == 2);

‎tests/test_createDataDictionary.m‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,27 @@ function test_createDataDictionary()
66

77
%%% set up part
88

9-
expParameters.subjectNb = 1;
10-
expParameters.runNb = 1;
11-
expParameters.task = 'testtask';
12-
expParameters.outputDir = outputDir;
9+
cfg.subjectNb = 1;
10+
cfg.runNb = 1;
11+
cfg.task = 'testtask';
12+
cfg.outputDir = outputDir;
1313

14-
cfg = struct();
1514
cfg.testingDevice = 'mri';
1615

17-
[cfg, expParameters] = createFilename(cfg, expParameters); %#ok<ASGLU>
16+
cfg = createFilename(cfg);
1817

1918
logFile.extraColumns.Speed.length = 1;
2019
logFile.extraColumns.LHL24.length = 3;
21-
logFile = saveEventsFile('init', expParameters, logFile);
20+
logFile = saveEventsFile('init', cfg, logFile);
2221

23-
createDataDictionary(expParameters, logFile);
22+
createDataDictionary(cfg, logFile);
2423

2524
%%% test part
2625

2726
% test data
2827
funcDir = fullfile(outputDir, 'source', 'sub-001', 'ses-001', 'func');
2928
jsonFilename = ['sub-001_ses-001_task-testtask_run-001_events_date-' ...
30-
expParameters.date '.json'];
29+
cfg.date '.json'];
3130

3231
% check that the file has the right path and name
3332
assert(exist(fullfile(funcDir, jsonFilename), 'file') == 2);

‎tests/test_createDatasetDescription.m‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@ function test_createDatasetDescription()
44

55
%%% set up part
66

7-
expParameters.outputDir = outputDir;
7+
cfg.outputDir = outputDir;
88

9-
expParameters.bids.datasetDescription.json.Name = 'dummy_dataset';
10-
expParameters.bids.datasetDescription.json.BIDSVersion = '1.0.0';
11-
expParameters.bids.datasetDescription.json.License = 'none';
12-
expParameters.bids.datasetDescription.json.Authors = {'Jane Doe'};
9+
cfg.bids.datasetDescription.json.Name = 'dummy_dataset';
10+
cfg.bids.datasetDescription.json.BIDSVersion = '1.0.0';
11+
cfg.bids.datasetDescription.json.License = 'none';
12+
cfg.bids.datasetDescription.json.Authors = {'Jane Doe'};
1313

14-
cfg = struct();
1514

16-
[cfg, expParameters] = checkCFG(cfg, expParameters); %#ok<*ASGLU>
15+
cfg = checkCFG(cfg);
1716

18-
createDatasetDescription(expParameters);
17+
createDatasetDescription(cfg);
1918

2019
%%% test part
2120

‎tests/test_createFilename.m‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,23 @@ function test_createFilename()
77

88
%%% set up part
99

10-
expParameters.subjectNb = 1;
11-
expParameters.runNb = 1;
12-
expParameters.task = 'testtask';
13-
expParameters.outputDir = outputDir;
14-
15-
cfg = struct();
10+
cfg.subjectNb = 1;
11+
cfg.runNb = 1;
12+
cfg.task = 'testtask';
13+
cfg.outputDir = outputDir;
1614

1715
%%% run part
18-
[cfg, expParameters] = createFilename(cfg, expParameters);
16+
cfg = createFilename(cfg);
1917

2018
%%% test part
2119

2220
% test data
2321
behDir = fullfile(outputDir, 'source', 'sub-001', 'ses-001', 'beh');
2422
eyetrackerDir = fullfile(outputDir, 'source', 'sub-001', 'ses-001', 'eyetracker');
2523
eventFilename = ['sub-001_ses-001_task-testtask_run-001_events_date-'...
26-
expParameters.date '.tsv'];
24+
cfg.date '.tsv'];
2725
stimFilename = ['sub-001_ses-001_task-testtask_run-001_stim_date-'...
28-
expParameters.date '.tsv'];
26+
cfg.date '.tsv'];
2927

3028
% make sure the beh dir is created
3129
assert(exist(behDir, 'dir') == 7);
@@ -34,10 +32,10 @@ function test_createFilename()
3432
assert(exist(eyetrackerDir, 'dir') == 0);
3533

3634
% make sure the events filename is created
37-
assert(strcmp(expParameters.fileName.events, eventFilename));
35+
assert(strcmp(cfg.fileName.events, eventFilename));
3836

3937
% make sure the stim filename is created
40-
assert(strcmp(expParameters.fileName.stim, stimFilename));
38+
assert(strcmp(cfg.fileName.stim, stimFilename));
4139

4240
%% fMRI and eye tracker
4341
fprintf('\n--------------------------------------------------------------------');
@@ -48,17 +46,17 @@ function test_createFilename()
4846

4947
%%% set up part
5048

51-
expParameters.subjectGrp = 'ctrl';
52-
expParameters.subjectNb = 2;
53-
expParameters.sessionNb = 2;
54-
expParameters.runNb = 2;
55-
expParameters.task = 'testtask';
56-
expParameters.outputDir = outputDir;
49+
cfg.subjectGrp = 'ctrl';
50+
cfg.subjectNb = 2;
51+
cfg.sessionNb = 2;
52+
cfg.runNb = 2;
53+
cfg.task = 'testtask';
54+
cfg.outputDir = outputDir;
5755

5856
cfg.eyeTracker = true;
5957
cfg.testingDevice = 'mri';
6058

61-
[cfg, expParameters] = createFilename(cfg, expParameters);
59+
cfg = createFilename(cfg);
6260

6361
%%% test part
6462

@@ -67,9 +65,9 @@ function test_createFilename()
6765
eyetrackerDir = fullfile(outputDir, 'source', 'sub-ctrl002', 'ses-002', 'eyetracker');
6866
baseFilename = 'sub-ctrl002_ses-002_task-testtask';
6967
eventFilename = ['sub-ctrl002_ses-002_task-testtask_run-002_events_date-' ...
70-
expParameters.date '.tsv'];
68+
cfg.date '.tsv'];
7169
eyetrackerFilename = ['sub-ctrl002_ses-002_task-testtask_run-002_eyetrack_date-' ...
72-
expParameters.date '.edf'];
70+
cfg.date '.edf'];
7371

7472
% make sure the func dir is created
7573
assert(exist(funcDir, 'dir') == 7);
@@ -78,9 +76,9 @@ function test_createFilename()
7876
assert(exist(eyetrackerDir, 'dir') == 7);
7977

8078
% make sure the right filenames are created
81-
assert(strcmp(expParameters.fileName.base, baseFilename));
82-
assert(strcmp(expParameters.fileName.events, eventFilename));
83-
assert(strcmp(expParameters.fileName.eyetracker, eyetrackerFilename));
79+
assert(strcmp(cfg.fileName.base, baseFilename));
80+
assert(strcmp(cfg.fileName.events, eventFilename));
81+
assert(strcmp(cfg.fileName.eyetracker, eyetrackerFilename));
8482

8583
%% EEG
8684
fprintf('\n--------------------------------------------------------------------');
@@ -91,16 +89,16 @@ function test_createFilename()
9189

9290
%%% set up part
9391

94-
expParameters.subjectGrp = 'blind';
95-
expParameters.subjectNb = 3;
96-
expParameters.sessionNb = 1;
97-
expParameters.runNb = 1;
98-
expParameters.task = 'testtask';
99-
expParameters.outputDir = outputDir;
92+
cfg.subjectGrp = 'blind';
93+
cfg.subjectNb = 3;
94+
cfg.sessionNb = 1;
95+
cfg.runNb = 1;
96+
cfg.task = 'testtask';
97+
cfg.outputDir = outputDir;
10098

10199
cfg.testingDevice = 'eeg';
102100

103-
[cfg, expParameters] = createFilename(cfg, expParameters); %#ok<ASGLU>
101+
cfg = createFilename(cfg);
104102

105103
%%% test part
106104

‎tests/test_saveEventsFileInit.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ function test_saveEventsFileInit()
2121
clear;
2222

2323
%%% set up
24-
[cfg, expParameters] = checkCFG(); %#ok<ASGLU>
24+
cfg = checkCFG();
2525
logFile.extraColumns = {'Speed'};
2626

2727
%%% do stuff
28-
[logFile] = saveEventsFile('init', expParameters, logFile);
28+
[logFile] = saveEventsFile('init', cfg, logFile);
2929

3030
%%% test section
3131
expectedStrcut(1).extraColumns.Speed.length = 1;
@@ -42,12 +42,12 @@ function test_saveEventsFileInit()
4242
clear;
4343

4444
%%% set up
45-
[cfg, expParameters] = checkCFG(); %#ok<ASGLU>
45+
cfg = checkCFG();
4646
logFile.extraColumns.Speed.length = 1;
4747
logFile.extraColumns.LHL24.length = 3;
4848

4949
%%% do stuff
50-
[logFile] = saveEventsFile('init', expParameters, logFile);
50+
[logFile] = saveEventsFile('init', cfg, logFile);
5151

5252
%%% test section
5353
expectedStrcut(1).extraColumns.Speed.length = 1;

0 commit comments

Comments
 (0)