add the most basid test of them all and make sure it passes

Author: Remi-Gau

saveEventsFile.m

@@ -47,7 +47,8 @@
     end
 
     if nargin < 3 || isempty(logFile)
-        logFile = struct();
+        logFile = struct('filename', [], 'extraColumns', cell(1));
+        logFile(1).filename = '';
     end
 
     switch action
@@ -157,7 +158,7 @@
         logFile(1).extraColumns = tmp;
     end
 
-    if isfield(logFile, 'extraColumns')
+    if isfield(logFile, 'extraColumns') && ~isempty(logFile(1).extraColumns)
         namesExtraColumns = fieldnames(logFile(1).extraColumns);
     end
 
@@ -171,7 +172,7 @@
     for iExtraColumn = 1:numel(namesExtraColumns)
 
         nbCol = returnNbColumns(logFile, namesExtraColumns{iExtraColumn});
-        
+
         if ~isfield(logFile(1).extraColumns.(namesExtraColumns{iExtraColumn}), 'length')
             logFile(1).extraColumns.(namesExtraColumns{iExtraColumn}).length = nbCol;
         end
@@ -193,11 +194,11 @@
 end
 
 function nbCol = returnNbColumns(logFile, nameExtraColumn)
-    
+
     thisExtraColumn = logFile(1).extraColumns.(nameExtraColumn);
 
     nbCol = 1;
-    
+
     if isfield(thisExtraColumn, 'length')
         nbCol = thisExtraColumn.length;
     end

tests/test_saveEventsFileOpen.m

@@ -1,6 +1,6 @@
 function test_saveEventsFileOpen()
 
-    %% check header writing with extra columns
+    %% Initialize file
     fprintf('\n\n--------------------------------------------------------------------\n\n');
 
     clear;
@@ -16,15 +16,12 @@ function test_saveEventsFileOpen()
 
     cfg.testingDevice = 'mri';
 
-    % define the extra columns: they will be added to the tsv files in the order the user input them
-    logFile.extraColumns = {'Speed', 'is_Fixation'};
-
     %%% do stuff
 
     [cfg, expParameters] = createFilename(cfg, expParameters);
 
     % create the events file and header
-    logFile = saveEventsFile('open', expParameters, logFile);
+    logFile = saveEventsFile('open', expParameters);
 
     % close the file
     saveEventsFile('close', expParameters, logFile);
@@ -37,9 +34,8 @@ function test_saveEventsFileOpen()
         expParameters.date '.tsv'];
 
     % open the file
-    nbExtraCol = 2;
     FID = fopen(fullfile(funcDir, eventFilename), 'r');
-    C = textscan(FID, repmat('%s', 1, nbExtraCol + 3), 'Delimiter', '\t', 'EndOfLine', '\n');
+    C = textscan(FID, repmat('%s', 1, 3), 'Delimiter', '\t', 'EndOfLine', '\n');
 
     % check that the file has the right path and name
     assert(exist(fullfile(funcDir, eventFilename), 'file') == 2);
@@ -48,6 +44,53 @@ function test_saveEventsFileOpen()
     assert(isequal(C{1}{1}, 'onset'));
     assert(isequal(C{2}{1}, 'trial_type'));
     assert(isequal(C{3}{1}, 'duration'));
+    
+    
+    
+    %% check header writing with extra columns
+    fprintf('\n\n--------------------------------------------------------------------\n\n');
+
+    clear;
+
+    outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
+
+    %%% set up
+
+    expParameters.subjectNb = 1;
+    expParameters.runNb = 1;
+    expParameters.task = 'testtask';
+    expParameters.outputDir = outputDir;
+
+    cfg.testingDevice = 'mri';
+
+    % define the extra columns: they will be added to the tsv files in the order the user input them
+    logFile.extraColumns = {'Speed', 'is_Fixation'};
+
+    %%% do stuff
+
+    [cfg, expParameters] = createFilename(cfg, expParameters);
+
+    % create the events file and header
+    logFile = saveEventsFile('open', expParameters, logFile);
+
+    % close the file
+    saveEventsFile('close', expParameters, logFile);
+
+    %%% test section
+
+    % open the file
+    nbExtraCol = 2;
+    FID = fopen(fullfile( ...
+        expParameters.subjectOutputDir, ...
+        expParameters.modality, ...
+        expParameters.fileName.events), ...
+        'r');
+    C = textscan(FID, repmat('%s', 1, nbExtraCol + 3), 'Delimiter', '\t', 'EndOfLine', '\n');
+
+    % check the extra columns of the header
+    assert(isequal(C{1}{1}, 'onset'));
+    assert(isequal(C{2}{1}, 'trial_type'));
+    assert(isequal(C{3}{1}, 'duration'));
     assert(isequal(C{4}{1}, 'Speed'));
     assert(isequal(C{5}{1}, 'is_Fixation'));