Merge pull request #86 from Remi-Gau/remi-utils_test

add utils test and version file

Author: Remi-Gau

.travis.yml

@@ -44,7 +44,7 @@ before_script:
 jobs:
   include:
     - name: "BIDS validator: create and check dataset"
-      script: octave $OCTFLAGS --eval "test_makeRawDataset" && bids-validator `pwd`/output/rawdata/ --ignoreNiftiHeaders
+      script: octave $OCTFLAGS --eval "test_makeRawDataset" && bids-validator `pwd`/output/raw/ --ignoreNiftiHeaders
     - name: "miss_hit: checking code quality"
       script: mh_metric . --ci
     - name: "miss_hit: checking code style"

src/convertSourceToRaw.m

@@ -10,7 +10,7 @@ function convertSourceToRaw(cfg)
     % Only covers func folder at the moment
 
     sourceDir = fullfile(cfg.dir.output, 'source');
-    rawDir = fullfile(cfg.dir.output, 'rawdata');
+    rawDir = fullfile(cfg.dir.output, 'raw');
 
     % add dummy README and CHANGE file
     copyfile(fullfile( ...

src/createFilename.m

@@ -105,7 +105,7 @@
         'echo', ...
         'phaseEncodingDirection', ...
         'reconstruction', ...
-        'recording', ...
+        'recording' ...
         };
 
     targetFields = { ...
@@ -114,7 +114,7 @@
         'echo', ...
         'dir', ...
         'rec', ...
-        'recording', ...
+        'recording' ...
         };
 
     for iField = 1:numel(fields2Check)
@@ -146,10 +146,10 @@
     pattern = cfg.fileName.pattern;
 
     runSuffix = cfg.fileName.suffix.run;
-    acqSuffix = cfg.fileName.suffix.acquisition ;
-    ceSuffix = cfg.fileName.suffix.contrastEnhancement ;
-    dirSuffix = cfg.fileName.suffix.phaseEncodingDirection ;
-    recSuffix = cfg.fileName.suffix.reconstruction ;
+    acqSuffix = cfg.fileName.suffix.acquisition;
+    ceSuffix = cfg.fileName.suffix.contrastEnhancement;
+    dirSuffix = cfg.fileName.suffix.phaseEncodingDirection;
+    recSuffix = cfg.fileName.suffix.reconstruction;
     echoSuffix = cfg.fileName.suffix.echo;
     recordingSuffix = cfg.fileName.suffix.recording;
 

src/checkCppBidsDependencies.m renamed to src/subfun/checkCppBidsDependencies.m

@@ -12,7 +12,7 @@ function checkCppBidsDependencies(cfg)
 
     elseif isempty(GITHUB_WORKSPACE)  % local
 
-        pth = fullfile(fileparts(mfilename('fullpath')), '..');
+        pth = fullfile(fileparts(mfilename('fullpath')), '..', '..');
         checkSubmodule(fullfile(pth, 'lib', 'JSONio'));
         checkSubmodule(fullfile(pth, 'lib', 'bids-matlab'));
 

src/printCreditsCppBids.m renamed to src/subfun/printCreditsCppBids.m

@@ -1,14 +1,19 @@
 function printCreditsCppBids(cfg)
 
+    try
+        version = fileread(fullfile(fileparts(mfilename('fullpath')), ...
+            '..', '..', 'version.txt'));
+    catch
+        version = 'v1.0.0';
+    end
+
     verbose = true;
     if ~isempty(cfg) && isfield(cfg, 'verbose') && ~isempty(cfg.verbose)
         verbose = cfg.verbose;
     end
 
     if verbose
 
-        version = '0.0.1';
-
         contributors = { ...
             'Rémi Gau', ...
             'Marco Barilari', ...

tests/test_getIsQuestionToAsk.m

@@ -9,10 +9,10 @@
 function test_isPositiveIntegerBasic()
 
     questions.questionsToAsk = { ...
-        [], 1 ; ...
-        [], 0 ; ...
-        [], 1 ; ...
-        [], 0 ; ...
+        [], 1; ...
+        [], 0; ...
+        [], 1; ...
+        [], 0; ...
         };
 
     responses = { ...
@@ -24,6 +24,6 @@ function test_isPositiveIntegerBasic()
 
     isQuestionToAsk = getIsQuestionToAsk(questions, responses);
 
-    assertEqual(isQuestionToAsk, [false;false;true;false]);
+    assertEqual(isQuestionToAsk, [false; false; true; false]);
 
 end

tests/test_removeDateSuffix.m

@@ -23,13 +23,13 @@ function test_removeDateSuffixBasic()
     stimNameZipped = 'test2_stim_date-202008050730.tsv.gz';
 
     filesToProcess = { ...
-        boldName ;
-        boldName2 ;
-        boldName3 ;
-        jsonName ;
-        eventsName ;
-        stimName ;
-        stimNameZipped ;
+        boldName;
+        boldName2;
+        boldName3;
+        jsonName;
+        eventsName;
+        stimName;
+        stimNameZipped;
         };
 
     % create new files for new tests

tests/test_utils.m

@@ -0,0 +1,17 @@
+function test_suite = test_utils %#ok<*STOUT>
+    try % assignment of 'localfunctions' is necessary in Matlab >= 2016
+        test_functions = localfunctions(); %#ok<*NASGU>
+    catch % no problem; early Matlab versions can use initTestSuite fine
+    end
+    initTestSuite;
+end
+
+function test_utilsBasic()
+
+    cfg.verbose = true;
+
+    printCreditsCppBids(cfg);
+
+    checkCppBidsDependencies(cfg);
+
+end

version.txt

@@ -0,0 +1 @@
+v1.0.0