Merge pull request #54 from Remi-Gau/bump_submod

[ENH] bump submod

Author: marcobarilari

.github/workflows/moxunit.yml

@@ -15,13 +15,19 @@ jobs:
       with:
         submodules: true
         fetch-depth: 1
+
     - name: MOxUnit Action
-      uses: joergbrech/moxunit-action@v1.1
+      uses: joergbrech/moxunit-action@v1.2.0
       with:
         tests: tests
         src: subfun
+        # add CPP_PTB to the path but don't include it the coverage
+        ext: lib/CPP_PTB/src
+        # Octave packages needed
+        pkg: statistics
         with_coverage: true
         cover_xml_file: coverage.xml
+
     - name: Code coverage
       uses: codecov/codecov-action@v1
       with:

.gitignore

@@ -6,6 +6,10 @@
 *.tsv
 *.mat
 
+% tests and coverage
+coverage*
+test_report.log
+
 output
 
 ## virtual env

lib/CPP_BIDS

@@ -0,0 +1,38 @@
+function runTests()
+    %
+    % (C) Copyright 2022 CPP visual motion localizer developers
+
+    % Elapsed time is ??? seconds.
+
+    tic;
+
+    initEnv();
+
+    if bids.internal.is_github_ci
+        fprintf(1, '\nThis is github CI\n');
+    else
+        fprintf(1, '\nThis is not github CI\n');
+    end
+
+    fprintf('\nHome is %s\n', getenv('HOME'));
+
+    warning('OFF');
+
+    folderToCover = fullfile(pwd, 'subfun');
+    testFolder = fullfile(pwd, 'tests');
+
+    success = moxunit_runtests(testFolder, ...
+                               '-verbose', '-recursive', '-with_coverage', ...
+                               '-cover', folderToCover, ...
+                               '-cover_xml_file', 'coverage.xml', ...
+                               '-cover_html_dir', fullfile(pwd, 'coverage_html'));
+
+    if success
+        system('echo 0 > test_report.log');
+    else
+        system('echo 1 > test_report.log');
+    end
+
+    toc;
+
+end

lib/CPP_PTB

@@ -10,6 +10,10 @@
     % change that if you want the data to be saved somewhere else
     cfg.dir.output = fullfile(fileparts(mfilename('fullpath')), 'output');
 
+    cfg.subject.subjectGrp = 'pilot';
+    cfg.subject.sessionNb = 1;
+    cfg.subject.askGrpSess = [true true];
+
     %% Debug mode settings
 
     cfg.debug.do = false; % To test the script out of the scanner, skip PTB sync
@@ -22,27 +26,22 @@
     cfg.audio.devIdx = 3; % 5 %11
 
     %% Engine parameters
-
     cfg.testingDevice = 'mri';
     cfg.eyeTracker.do = false;
     cfg.audio.do = true;
 
     cfg = setMonitor(cfg);
 
-    % Keyboards
     cfg = setKeyboards(cfg);
 
-    % MRI settings
-
     cfg = setMRI(cfg);
-    cfg.suffix.acquisition = '0p75mmEv';
 
-    cfg.pacedByTriggers.do = false;
+    cfg.pacedByTriggers.do = true;
 
     %% Experiment Design
 
-    %     cfg.design.motionType = 'translation';
-    %     cfg.design.motionType = 'radial';
+    % cfg.design.motionType = 'translation';
+    % cfg.design.motionType = 'radial';
     cfg.design.motionType = 'translation';
     cfg.design.names = {'static'; 'motion'};
     % 0: L--R--L; 180: R--L--R;
@@ -158,8 +157,8 @@
 
     cfg.mri.repetitionTime = 1.8;
 
-    cfg.bids.MRI.Instructions = ['1 - Detect the RED fixation cross\n' ...
+    cfg.bids.mri.Instructions = ['1 - Detect the RED fixation cross\n' ...
                                  '2 - Detected the shorter repeated sounds'];
-    cfg.bids.MRI.TaskDescription = [];
+    cfg.bids.mri.TaskDescription = [];
 
 end

runTests.m

@@ -8,8 +8,6 @@
 
 function test_exDesignBasic()
 
-    initEnv();
-
     cfg.design.motionType = 'translation';
     cfg.design.motionDirections = [0 0 180 180];
     cfg.design.names = {'static'; 'motion'};
@@ -43,8 +41,6 @@ function test_exDesignBasic()
 
 function test_exDesignBasicOtherSetUp()
 
-    initEnv();
-
     cfg.design.motionType = 'translation';
     cfg.design.motionDirections = [0 90 180 270];
     cfg.design.names = {'static'; 'motion'};