improve tests for remove date suffix

Author: Remi-Gau

.gitignore

@@ -6,17 +6,17 @@
 *octave-workspace
 
 # exclude content of logfiles folders
-tests/output/*
-manualTests/output/*
-output/*
+*output*
 *.tsv
 *.mat
 
 # exclude temp files from tests and coverage
-tests/coverage*
-tests/test_code_report.txt
-test_code_report.txt
-*/coverage_html/*
+*test_code_report.txt
+*coverage*
+
+tests/*.nii*
+tests/*.json*
+tests/*.tsv*
 
 # exclude report from check_my_code
 check_my_code_report.txt

dummyData/CHANGES renamed to manualTests/dummyData/CHANGES

@@ -86,7 +86,7 @@ function test_makeRawDataset()
     boldFilename = 'sub-001_ses-001_task-testtask_run-001_bold.nii.gz';
 
     copyfile( ...
-        fullfile('..', 'dummyData', 'dummyData.nii.gz'), ...
+        fullfile('dummyData', 'dummyData.nii.gz'), ...
         fullfile(funcDir, boldFilename));
 
     %% MRI bold rest data and fancy suffixes
@@ -121,7 +121,7 @@ function test_makeRawDataset()
         '_run-004_echo-1_bold.nii.gz'];
 
     copyfile( ...
-        fullfile('..', 'dummyData', 'dummyData.nii.gz'), ...
+        fullfile('dummyData', 'dummyData.nii.gz'), ...
         fullfile(funcDir, boldFilename));
 
     %% actually do the conversion of the source data thus created

dummyData/README renamed to manualTests/dummyData/README

@@ -14,10 +14,10 @@ function convertSourceToRaw(cfg)
 
     % add dummy README and CHANGE file
     copyfile(fullfile( ...
-        fileparts(mfilename('fullpath')), '..', 'dummyData', 'README'), ...
+        fileparts(mfilename('fullpath')), '..', 'manualTests', 'dummyData', 'README'), ...
         sourceDir);
     copyfile(fullfile( ...
-        fileparts(mfilename('fullpath')), '..', 'dummyData', 'CHANGES'), ...
+        fileparts(mfilename('fullpath')), '..', 'manualTests', 'dummyData', 'CHANGES'), ...
         sourceDir);
 
     copyfile(sourceDir, rawDir);

dummyData/dummyData.nii.gz renamed to manualTests/dummyData/dummyData.nii.gz

@@ -7,20 +7,12 @@
 end
 
 function test_removeDateSuffixBasic()
-
-    %% set up
-    cfg.dir.output = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
-
-    % clean up
-    if isdir(cfg.dir.output)
-        rmdir(cfg.dir.output, 's');
-    end
-    [~, ~, ~] = mkdir(cfg.dir.output);
-
-    % TODO
-    % make sure we use the default date parameter (to implement?)
-    % cfg = checkCFG(cfg);
-
+    
+    outputDir = pwd;
+    
+    createFiles = 0;
+    testDo = 1;
+    
     %% set up
     boldName = 'test_bold_date-202008050730.nii.gz';
     boldName2 = 'test2_bold.nii.gz';
@@ -29,7 +21,7 @@ function test_removeDateSuffixBasic()
     eventsName = 'test_events_date-202008050730.tsv';
     stimName = 'test_stim_date-202008050730.tsv';
     stimNameZipped = 'test2_stim_date-202008050730.tsv.gz';
-
+    
     filesToProcess = { ...
         boldName ;
         boldName2 ;
@@ -39,18 +31,16 @@ function test_removeDateSuffixBasic()
         stimName ;
         stimNameZipped ;
         };
-
+    
+    % create new files for new tests
     for iFile = 1:numel(filesToProcess)
-        copyfile( ...
-            fullfile('..', 'dummyData', 'dummyData.nii.gz'), ...
-            fullfile(cfg.dir.output, filesToProcess{iFile}));
+        system(sprintf('touch %s', filesToProcess{iFile}));
     end
-
+    
+    
     %% do stuff
-    filenames = file_utils('List', cfg.dir.output, '^test.*$');
-
-    removeDateSuffix(filenames, cfg.dir.output);
-
+    filenames = file_utils('List', outputDir, '^test.*$');
+    
     %% expected data
     expectedBoldName = 'test_bold.nii.gz';
     expectedBoldName2 = 'test2_bold.nii.gz';
@@ -59,14 +49,18 @@ function test_removeDateSuffixBasic()
     expectedEventsName = 'test_events.tsv';
     expectedStimName = 'test_stim.tsv';
     expectedStimNameZipped = 'test2_stim.tsv.gz';
-
+    
+    removeDateSuffix(filenames, outputDir);
+    
     %% test
-    assertEqual(exist(fullfile(cfg.dir.output, expectedBoldName3), 'file'), 2);
-    assertEqual(exist(fullfile(cfg.dir.output, expectedJsonName), 'file'), 2);
-    assertEqual(exist(fullfile(cfg.dir.output, expectedEventsName), 'file'), 2);
-    assertEqual(exist(fullfile(cfg.dir.output, expectedStimName), 'file'), 2);
-    assertEqual(exist(fullfile(cfg.dir.output, expectedStimNameZipped), 'file'), 2);
-    assertEqual(exist(fullfile(cfg.dir.output, expectedBoldName2), 'file'), 2);
-    assertEqual(exist(fullfile(cfg.dir.output, expectedBoldName), 'file'), 2);
-
+    fprintf(1, fullfile(outputDir, expectedBoldName3));
+    assertEqual(exist(fullfile(outputDir, expectedBoldName3), 'file'), 2);
+    assertEqual(exist(fullfile(outputDir, expectedJsonName), 'file'), 2);
+    fprintf(1, fullfile(outputDir, expectedEventsName));
+    assertEqual(exist(fullfile(outputDir, expectedEventsName), 'file'), 2);
+    assertEqual(exist(fullfile(outputDir, expectedStimName), 'file'), 2);
+    assertEqual(exist(fullfile(outputDir, expectedStimNameZipped), 'file'), 2);
+    assertEqual(exist(fullfile(outputDir, expectedBoldName2), 'file'), 2);
+    assertEqual(exist(fullfile(outputDir, expectedBoldName), 'file'), 2);
+    
 end